Skip to content

Simple implementation of left join with non-foreign keys #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 23, 2018
Merged

Simple implementation of left join with non-foreign keys #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de14e3e
Simple implementation of left join with non-foreign keys
Thorium Dec 22, 2018
daeb5f9
fix for unit test
Thorium Dec 22, 2018
e0f1515
unit test fix part 2
Thorium Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/SQLProvider/Operators.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ module Operators =
/// Not Like
let (<>%) (a:'a) (b:string) = false
/// Left join
let (!!) (a:IQueryable<_>) = a
let private leftJoin (a:'a) = a
let (!!) (a:IQueryable<'a>) = query { for x in a do select (leftJoin x) }

/// Standard Deviation
let StdDev (a:'a) = 1m
Expand Down
33 changes: 18 additions & 15 deletions src/SQLProvider/SqlRuntime.Linq.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ module internal QueryImplementation =
let (|SourceWithQueryData|_|) = function Constant ((:? IWithSqlService as org), _) -> Some org | _ -> None
let (|RelDirection|_|) = function Constant ((:? RelationshipDirection as s),_) -> Some s | _ -> None

let (|OptionalOuterJoin|) e =
match e with
| MethodCall(None, (!!), [inner]) -> (true,inner)
| MethodCall(None,MethodWithName("op_BangBang"), [inner]) -> (true,inner)
| _ -> (false,e)

let parseQueryResults (projector:Delegate) (results:SqlEntity[]) =
let args = projector.GetType().GenericTypeArguments
seq {
Expand Down Expand Up @@ -435,10 +441,6 @@ module internal QueryImplementation =

// multiple SelectMany calls in sequence are represented in the same expression tree which must be parsed recursively (and joins too!)
let rec processSelectManys (toAlias:string) (inExp:Expression) (outExp:SqlExp) (projectionParams : ParameterExpression list) (source:IWithSqlService) =
let (|OptionalOuterJoin|) e =
match e with
| MethodCall(None, (!!), [inner]) -> (true,inner)
| _ -> (false,e)
match inExp with
| MethodCall(None, (MethodWithName "SelectMany"), [ createRelated ; OptionalQuote (Lambda([_], inner)); OptionalQuote (Lambda(projectionParams,_)) ]) ->
let outExp = processSelectManys projectionParams.[0].Name createRelated outExp projectionParams source
Expand Down Expand Up @@ -466,7 +468,6 @@ module internal QueryImplementation =
let outExp = processSelectManys projectionParams.[0].Name createRelated outExp projectionParams source
let ty, data, sourceEntityName = parseGroupBy meth source sourceAlias destEntity [lambda] exp ""
SelectMany(sourceEntityName,destEntity,GroupQuery(data), outExp)

| MethodCall(None, (MethodWithName "Join"),
[createRelated
ConvertOrTypeAs(MethodCall(Some(Lambda(_,MethodCall(_,MethodWithName "CreateEntities",[String destEntity]))),(MethodWithName "Invoke"),_))
Expand Down Expand Up @@ -537,8 +538,8 @@ module internal QueryImplementation =
ForeignTable = {Schema="";Name="";Type=""};
OuterJoin = false; RelDirection = RelationshipDirection.Parents }
SelectMany(sourceAlias,destAlias,LinkQuery(data),outExp)
| OptionalConvertOrTypeAs(MethodCall(Some(Lambda([_],MethodCall(_,MethodWithName "CreateEntities",[String destEntity]))),(MethodWithName "Invoke"),_))
| OptionalConvertOrTypeAs(MethodCall(_, MethodWithName "CreateEntities",[String destEntity])) ->
| OptionalOuterJoin(isOuter, OptionalConvertOrTypeAs(MethodCall(Some(Lambda([_],MethodCall(_,MethodWithName "CreateEntities",[String destEntity]))),(MethodWithName "Invoke"),_)))
| OptionalOuterJoin(isOuter, OptionalConvertOrTypeAs(MethodCall(_, MethodWithName "CreateEntities",[String destEntity]))) ->
let sourceAlias =
if source.TupleIndex.Contains projectionParams.[0].Name then projectionParams.[0].Name
else
Expand Down Expand Up @@ -644,15 +645,16 @@ module internal QueryImplementation =
OptionalQuote (Lambda([ParamName sourceAlias],SqlColumnGet(sourceTi,sourceKey,_)))
OptionalQuote (Lambda([ParamName destAlias],SqlColumnGet(_,destKey,_)))
OptionalQuote projection ]) ->
let destEntity =
let destEntity, isOuter =
match dest.SqlExpression with
| BaseTable(_,destEntity) -> destEntity
| BaseTable(_,destEntity) -> destEntity, false
| Projection(MethodCall(None, MethodWithName("Select"), [_ ; OptionalQuote (Lambda(_,MethodCall(None, (MethodWithName "leftJoin"),_)))]),BaseTable(_,destEntity)) -> destEntity, true
| _ -> failwithf "Unexpected join destination entity expression (%A)." dest.SqlExpression
let sqlExpression =
match source.SqlExpression with
| BaseTable(alias,entity) when alias = "" ->
// special case here as above - this is the first call so replace the top of the tree here with the current base table alias and the select many
let data = { PrimaryKey = [destKey]; PrimaryTable = destEntity; ForeignKey = [sourceKey]; ForeignTable = entity; OuterJoin = false; RelDirection = RelationshipDirection.Parents}
let data = { PrimaryKey = [destKey]; PrimaryTable = destEntity; ForeignKey = [sourceKey]; ForeignTable = entity; OuterJoin = isOuter; RelDirection = RelationshipDirection.Parents}
if source.TupleIndex.Any(fun v -> v = sourceAlias) |> not then source.TupleIndex.Add(sourceAlias)
if source.TupleIndex.Any(fun v -> v = destAlias) |> not then source.TupleIndex.Add(destAlias)
SelectMany(sourceAlias,destAlias, LinkQuery(data),BaseTable(sourceAlias,entity))
Expand All @@ -664,7 +666,7 @@ module internal QueryImplementation =
// it's ok though because it can always be resolved later after the whole expression tree has been evaluated
let data = { PrimaryKey = [destKey]; PrimaryTable = destEntity; ForeignKey = [sourceKey];
ForeignTable = {Schema="";Name="";Type=""};
OuterJoin = false; RelDirection = RelationshipDirection.Parents }
OuterJoin = isOuter; RelDirection = RelationshipDirection.Parents }
SelectMany(sourceAlias,destAlias,LinkQuery(data),source.SqlExpression)

let ty =
Expand All @@ -678,17 +680,18 @@ module internal QueryImplementation =
OptionalQuote (Lambda([ParamName sourceAlias],TupleSqlColumnsGet(multisource)))
OptionalQuote (Lambda([ParamName destAlias],TupleSqlColumnsGet(multidest)))
OptionalQuote projection ]) ->
let destEntity =
let destEntity, isOuter =
match dest.SqlExpression with
| BaseTable(_,destEntity) -> destEntity
| BaseTable(_,destEntity) -> destEntity, false
| Projection(MethodCall(None, MethodWithName("Select"), [_ ;OptionalQuote (Lambda(_,MethodCall(None, (MethodWithName "leftJoin"),_)))]),BaseTable(_,destEntity)) -> destEntity, true
| _ -> failwithf "Unexpected join destination entity expression (%A)." dest.SqlExpression
let destKeys = multidest |> List.map(fun(_,dest,_)->dest)
let sourceKeys = multisource |> List.map(fun(_,source,_)->source)
let sqlExpression =
match source.SqlExpression with
| BaseTable(alias,entity) when alias = "" ->
// special case here as above - this is the first call so replace the top of the tree here with the current base table alias and the select many
let data = { PrimaryKey = destKeys; PrimaryTable = destEntity; ForeignKey = sourceKeys; ForeignTable = entity; OuterJoin = false; RelDirection = RelationshipDirection.Parents}
let data = { PrimaryKey = destKeys; PrimaryTable = destEntity; ForeignKey = sourceKeys; ForeignTable = entity; OuterJoin = isOuter; RelDirection = RelationshipDirection.Parents}
if source.TupleIndex.Any(fun v -> v = sourceAlias) |> not then source.TupleIndex.Add(sourceAlias)
if source.TupleIndex.Any(fun v -> v = destAlias) |> not then source.TupleIndex.Add(destAlias)
SelectMany(sourceAlias,destAlias, LinkQuery(data),BaseTable(sourceAlias,entity))
Expand All @@ -701,7 +704,7 @@ module internal QueryImplementation =
// it's ok though because it can always be resolved later after the whole expression tree has been evaluated
let data = { PrimaryKey = destKeys; PrimaryTable = destEntity; ForeignKey = sourceKeys;
ForeignTable = {Schema="";Name="";Type=""};
OuterJoin = false; RelDirection = RelationshipDirection.Parents }
OuterJoin = isOuter; RelDirection = RelationshipDirection.Parents }
SelectMany(sourceAlias,destAlias,LinkQuery(data),source.SqlExpression)

let ty =
Expand Down
12 changes: 12 additions & 0 deletions tests/SqlProvider.Tests/QueryTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,6 +1560,18 @@ let ``simple async sum with option operations``() =
} |> Seq.sumAsync |> Async.RunSynchronously
Assert.That(qry, Is.EqualTo(603221955M).Within(10M))

[<Test >]
let ``simple select query with left join``() =
let dc = sqlOption.GetDataContext()
let qry =
query {
for cust in dc.Main.Customers do
join order in (!!) dc.Main.Orders on (cust.CustomerId = order.OrderId.ToString())
select (cust.CustomerId, order.OrderDate)
} |> Seq.toArray

CollectionAssert.IsNotEmpty qry
Assert.AreEqual(91, qry.Length)

[<Test>]
let ``simple math operations query``() =
Expand Down