1.1.73

fsprojects · Nov 11, 2019 · 2bd3829 · 2bd3829
1 parent 4685dac
commit 2bd3829
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,9 @@
+### 1.1.73 - 11.11.2019
+* Better filter support to group-by join over 2 or 3 tables
+
 ### 1.1.72 - 01.11.2019
 * Possibility to join 2 or 3 tables to group-by PR #650
-* Better let and into -keyword handlings PR #648
+* Better let and into -keyword handling PR #648
 
 ### 1.1.71 - 01.11.2019
 * Fixed where-before-join -query

diff --git a/src/SQLProvider/AssemblyInfo.fs b/src/SQLProvider/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("SQLProvider")>]
 [<assembly: AssemblyProductAttribute("SQLProvider")>]
 [<assembly: AssemblyDescriptionAttribute("Type providers for SQL database access.")>]
-[<assembly: AssemblyVersionAttribute("1.1.72")>]
-[<assembly: AssemblyFileVersionAttribute("1.1.72")>]
+[<assembly: AssemblyVersionAttribute("1.1.73")>]
+[<assembly: AssemblyFileVersionAttribute("1.1.73")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SQLProvider"
     let [<Literal>] AssemblyProduct = "SQLProvider"
     let [<Literal>] AssemblyDescription = "Type providers for SQL database access."
-    let [<Literal>] AssemblyVersion = "1.1.72"
-    let [<Literal>] AssemblyFileVersion = "1.1.72"
+    let [<Literal>] AssemblyVersion = "1.1.73"
+    let [<Literal>] AssemblyFileVersion = "1.1.73"
diff --git a/src/SQLProvider/SqlRuntime.Linq.fs b/src/SQLProvider/SqlRuntime.Linq.fs
@@ -544,7 +544,7 @@ module internal QueryImplementation =
                     | FilterClause(_, BaseTable(alias,sourceEntity)) ->
                         sourceAlias, sourceEntity
                     | FilterClause(_, SelectMany(a1, a2,CrossJoin(_,_),sqlExp))
-                    | FilterClause(_, SelectMany(a1, a2,LinkQuery(_,_),sqlExp))
+                    | FilterClause(_, SelectMany(a1, a2,LinkQuery(_),sqlExp))
                     | SelectMany(a1, a2,CrossJoin(_,_),sqlExp)
                     | SelectMany(a1, a2,LinkQuery(_),sqlExp)  ->
                         //let sourceAlias = if sourceTi <> "" then Utilities.resolveTuplePropertyName sourceTi source.TupleIndex else sourceAlias
@@ -555,8 +555,8 @@ module internal QueryImplementation =
                         | FilterClause(_, BaseTable(alias,sourceEntity)) when alias = a1 -> a1, sourceEntity
                         | BaseTable(alias,sourceEntity)
                         | FilterClause(_, BaseTable(alias,sourceEntity)) when alias = a2 -> a2, sourceEntity
-                        | FilterClause(_, SelectMany(a3, a4,CrossJoin(_,_)),sqlExp2)
-                        | FilterClause(_, SelectMany(a3, a4,LinkQuery(_)),sqlExp2) 
+                        | FilterClause(_, SelectMany(a3, a4,CrossJoin(_,_),sqlExp2))
+                        | FilterClause(_, SelectMany(a3, a4,LinkQuery(_),sqlExp2))
                         | SelectMany(a3, a4,CrossJoin(_,_),sqlExp2)
                         | SelectMany(a3, a4,LinkQuery(_),sqlExp2)  ->
                             match sqlExp2 with

diff --git a/tests/SqlProvider.Tests/QueryTests.fs b/tests/SqlProvider.Tests/QueryTests.fs
@@ -1118,6 +1118,7 @@ let ``simple select query with join and then groupBy``() =
         query {
                 for cust in dc.Main.Customers do
                 join order in dc.Main.Orders on (cust.CustomerId = order.CustomerId)
+                where(cust.Address <> "Road" && order.ShipName <> "mcboatface")
                 groupBy (cust.City, order.ShipCity) into g
                 select (g.Key, g.Max(fun (c,o) -> c.PostalCode))
             }