Merge branch 'master' into baselines/pr_5151

Author: MaceWindu

Access.Ace.Odbc/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.Issue1096Test(Access.Ace.Odbc).sql

@@ -1,33 +1,20 @@
 -- Access.Ace.Odbc AccessODBC
+DECLARE @Pk Int -- Int32
+SET     @Pk = 1
 DECLARE @Id Int -- Int32
 SET     @Id = 1
 DECLARE @TargetName NVarChar(12) -- String
 SET     @TargetName = 'bda.Requests'
 
 INSERT INTO [Issue1096Task]
 (
+	[Pk],
 	[Id],
 	[TargetName]
 )
 VALUES
 (
 	?,
-	?
-)
-
--- Access.Ace.Odbc AccessODBC
-DECLARE @Id Int -- Int32
-SET     @Id = 1
-DECLARE @TargetName NVarChar(12) -- String
-SET     @TargetName = 'bda.Requests'
-
-INSERT INTO [Issue1096Task]
-(
-	[Id],
-	[TargetName]
-)
-VALUES
-(
 	?,
 	?
 )
@@ -56,6 +43,7 @@ VALUES
 -- Access.Ace.Odbc AccessODBC
 
 SELECT DISTINCT
+	[t].[Pk],
 	[t].[Id],
 	[t].[TargetName],
 	[a_ActualStage].[Id],

Access.Ace.Odbc/Tests/Linq/CommonTests/Tests.Linq.CommonTests.Issue191Test(Access.Ace.Odbc).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[user_1].[Id],
 	[user_1].[FirstName],
 	[user_1].[Status]
 FROM

Access.Ace.Odbc/Tests/Linq/FSharpTests/Tests.Linq.FSharpTests.Issue1813Test2(Access.Ace.Odbc).sql

@@ -56,13 +56,10 @@ SELECT
 	[d].[Id],
 	[d].[Text]
 FROM
-	(
-		SELECT DISTINCT
-			[Item1].[Id]
-		FROM
-			[Names] [Item1]
-	) [m_1]
+	[Names] [m_1]
 		INNER JOIN [Addresses] [d] ON ([m_1].[Id] = [d].[Id])
+ORDER BY
+	[m_1].[Id]
 
 -- Access.Ace.Odbc AccessODBC
 

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_NotNull_Test(Access.Ace.Odbc,False,False).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -15,13 +16,15 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_2] [t1]

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_NotNull_Test(Access.Ace.Odbc,False,True).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -15,13 +16,15 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_2] [t1]

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_NotNull_Test(Access.Ace.Odbc,True,False).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -17,13 +18,15 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_2] [t1]

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_NotNull_Test(Access.Ace.Odbc,True,True).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -17,13 +18,15 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_2] [t1]

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_Null_Test(Access.Ace.Odbc,False,False).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -15,14 +16,17 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
-	[t1].[ID]
+	[t1].[PK],
+	[t1].[ID],
+	[t1].[GV]
 FROM
 	[test_in_2] [t1]
 

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_Null_Test(Access.Ace.Odbc,False,True).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -15,14 +16,17 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
-	[t1].[ID]
+	[t1].[PK],
+	[t1].[ID],
+	[t1].[GV]
 FROM
 	[test_in_2] [t1]
 

Access.Ace.Odbc/Tests/Linq/InSubqueryTests/Tests.Linq.InSubqueryTests.NotNull_In_Null_Test(Access.Ace.Odbc,True,False).sql

@@ -1,6 +1,7 @@
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t].[PK],
 	[t].[ID]
 FROM
 	[test_in_1] [t]
@@ -17,14 +18,17 @@ WHERE
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
+	[t1].[PK],
 	[t1].[ID]
 FROM
 	[test_in_1] [t1]
 
 -- Access.Ace.Odbc AccessODBC
 
 SELECT
-	[t1].[ID]
+	[t1].[PK],
+	[t1].[ID],
+	[t1].[GV]
 FROM
 	[test_in_2] [t1]