Skip to content

Commit aaaff58

Browse files
committed
reviewed: simplified predicates and column duplicates removal
1 parent b9cd885 commit aaaff58

File tree

4,308 files changed

+7010
-12278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,308 files changed

+7010
-12278
lines changed

Access.Ace.Odbc.LinqService/Tests/Linq/AssociationTests/Tests.Linq.AssociationTests.ComplexQueryWithManyToMany(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ WHERE
1919
INNER JOIN [GrandChild] [a_Child] ON ([a_ManyToMany].[ChildID] = [a_Child].[ChildID]))
2020
LEFT JOIN [Parent] [a_Parent] ON ([a_Child].[ParentID] = [a_Parent].[ParentID])
2121
WHERE
22-
[li].[ParentID] = ? AND [a_Parent].[ParentID] IS NOT NULL AND
23-
[a_Parent].[ParentID] = ?
22+
[li].[ParentID] = ? AND [a_Parent].[ParentID] = ?
2423
)
2524
ORDER BY
2625
[t1].[ChildID]

Access.Ace.Odbc.LinqService/Tests/Linq/ConstantTests/Tests.Linq.ConstantTests.static_readonly_access_readonly_members(Access.Ace.Odbc.LinqService).sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SELECT
99
FROM
1010
[TestConstantsData] [e]
1111
WHERE
12-
[e].[Id] = 1 AND [e].[Id] = 1
12+
[e].[Id] = 1
1313

1414
BeforeExecute
1515
-- Access.Ace.Odbc AccessODBC
@@ -33,7 +33,7 @@ SELECT
3333
FROM
3434
[TestConstantsData] [e]
3535
WHERE
36-
[e].[Id] = 1 AND [e].[Id] = 1
36+
[e].[Id] = 1
3737

3838
BeforeExecute
3939
-- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc.LinqService/Tests/Linq/ContainsTests/Tests.Linq.ContainsTests.Issue2608Test(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ FROM
1515
((([LinqDataTypes] [x]
1616
INNER JOIN [LinqDataTypes] [o] ON ([x].[IntValue] = [o].[IntValue] OR [x].[IntValue] IS NULL AND [o].[IntValue] IS NULL))
1717
INNER JOIN [LinqDataTypes] [u] ON ([o].[IntValue] = [u].[IntValue] OR [o].[IntValue] IS NULL AND [u].[IntValue] IS NULL))
18-
INNER JOIN [LinqDataTypes] [r] ON (([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND ([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND [r].[BoolValue] = False))
18+
INNER JOIN [LinqDataTypes] [r] ON (([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND [r].[BoolValue] = False))
1919
INNER JOIN [LinqDataTypes] [f] ON ([r].[IntValue] = [f].[IntValue] OR [r].[IntValue] IS NULL AND [f].[IntValue] IS NULL)
2020
WHERE
2121
[x].[BoolValue] = False AND

Access.Ace.Odbc.LinqService/Tests/Linq/ConvertExpressionTests/Tests.Linq.ConvertExpressionTests.Issue3791Test(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ SELECT
77
[a_Association].[Id]
88
FROM
99
[Issue3791Table] [t1]
10-
LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = IIF([a_Association].[Id] IS NOT NULL, CStr([a_Association].[Id]), NULL))
10+
LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = CStr([a_Association].[Id]))
1111

Access.Ace.Odbc.LinqService/Tests/Linq/CountTests/Tests.Linq.CountTests.SubQuery1(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ SELECT
99
FROM
1010
[Child] [a_Children]
1111
WHERE
12-
[p].[ParentID] = [a_Children].[ParentID] AND [a_Children].[ParentID] = [p].[ParentID] AND
13-
[a_Children].[ChildID] <> 0
12+
[p].[ParentID] = [a_Children].[ParentID] AND [a_Children].[ChildID] <> 0
1413
)
1514
FROM
1615
[Parent] [p]

Access.Ace.Odbc.LinqService/Tests/Linq/CountTests/Tests.Linq.CountTests.SubQuery2(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SELECT
1515
FROM
1616
[Child] [c_1]
1717
WHERE
18-
[p].[ParentID] = [c_1].[ParentID] AND [c_1].[ParentID] = [p].[ParentID]
18+
[p].[ParentID] = [c_1].[ParentID]
1919
))
2020
FROM
2121
[Parent] [p]

Access.Ace.Odbc.LinqService/Tests/Linq/CountTests/Tests.Linq.CountTests.SubQuery3(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SELECT
1515
FROM
1616
[Child] [c_1]
1717
WHERE
18-
[p].[ParentID] = [c_1].[ParentID] AND [c_1].[ParentID] = [p].[ParentID]
18+
[p].[ParentID] = [c_1].[ParentID]
1919
))
2020
FROM
2121
[Parent] [p]

Access.Ace.Odbc.LinqService/Tests/Linq/GroupByTests/Tests.Linq.GroupByTests.Issue3668Test(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ DECLARE @name NVarChar(4) -- String
88
SET @name = 'test'
99
DECLARE @id Int -- Int32
1010
SET @id = 1
11-
DECLARE @id Int -- Int32
12-
SET @id = 1
13-
DECLARE @name NVarChar(4) -- String
14-
SET @name = 'test'
15-
DECLARE @name NVarChar(4) -- String
16-
SET @name = 'test'
17-
DECLARE @id Int -- Int32
18-
SET @id = 1
1911

2012
SELECT
2113
[m_1].[PersonID],
@@ -27,8 +19,7 @@ SELECT
2719
FROM
2820
[Person] [m_1]
2921
WHERE
30-
([m_1].[PersonID] = ? AND [m_1].[LastName] <> ? OR [m_1].[FirstName] <> ? AND [m_1].[PersonID] - 1 = ?) AND
31-
([m_1].[PersonID] = ? AND [m_1].[LastName] <> ? OR [m_1].[FirstName] <> ? AND [m_1].[PersonID] - 1 = ?)
22+
[m_1].[PersonID] = ? AND [m_1].[LastName] <> ? OR [m_1].[FirstName] <> ? AND [m_1].[PersonID] - 1 = ?
3223

3324
BeforeExecute
3425
-- Access.Ace.Odbc AccessODBC

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SELECT
66
FROM
77
[test_in_1] [t]
88
WHERE
9-
[t].[ID] IS NULL OR [t].[ID] IS NULL OR [t].[ID] NOT IN (
9+
[t].[ID] IS NULL OR [t].[ID] NOT IN (
1010
SELECT
1111
[p].[ID]
1212
FROM

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ SELECT
66
FROM
77
[test_in_1] [t]
88
WHERE
9-
[t].[ID] IS NOT NULL AND ([t].[ID] IS NULL OR [t].[ID] NOT IN (
9+
[t].[ID] IS NOT NULL AND [t].[ID] NOT IN (
1010
SELECT
1111
[p].[ID]
1212
FROM
1313
[test_in_2] [p]
14-
))
14+
)
1515

1616
BeforeExecute
1717
-- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.Issue1455Test1(Access.Ace.Odbc.LinqService).sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ FROM
254254
[al_group].[AlertCode],
255255
[al_group].[CreationDate]
256256
) [al_group_1]
257-
LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = IIF([trade_1].[DealId] IS NOT NULL, CStr([trade_1].[DealId]), NULL)))
258-
LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = IIF([nomin_1].[CargoId] IS NOT NULL, CStr([nomin_1].[CargoId]), NULL))
257+
LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = CStr([trade_1].[DealId])))
258+
LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = CStr([nomin_1].[CargoId]))
259259
WHERE
260260
[nomin_1].[DeliveryCounterParty] LIKE ? OR [trade_1].[CounterParty] LIKE ? OR
261261
[al_group_1].[AlertCode] LIKE ?

Access.Ace.Odbc.LinqService/Tests/Linq/JoinTests/Tests.Linq.JoinTests.Issue1455Test2(Access.Ace.Odbc.LinqService).sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ FROM
254254
[al_group].[AlertCode],
255255
[al_group].[CreationDate]
256256
) [al_group_1]
257-
LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = IIF([trade_1].[DealId] IS NOT NULL, CStr([trade_1].[DealId]), NULL)))
258-
LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = IIF([nomin_1].[CargoId] IS NOT NULL, CStr([nomin_1].[CargoId]), NULL))
257+
LEFT JOIN [Trade] [trade_1] ON ([al_group_1].[AlertKey] = CStr([trade_1].[DealId])))
258+
LEFT JOIN [Nomin] [nomin_1] ON ([al_group_1].[AlertKey] = CStr([nomin_1].[CargoId]))
259259
WHERE
260260
[nomin_1].[DeliveryCounterParty] LIKE ? OR [trade_1].[CounterParty] LIKE ? OR
261261
[al_group_1].[AlertCode] LIKE ?

Access.Ace.Odbc.LinqService/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.Caching(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
-- Access.Ace.Odbc AccessODBC
33
DECLARE @p Int -- Int32
44
SET @p = 1
5-
DECLARE @p Int -- Int32
6-
SET @p = 1
75

86
SELECT
97
[x].[ParentID],
108
[x].[Value1]
119
FROM
1210
[Parent] [x]
1311
WHERE
14-
[x].[ParentID] = ? OR [x].[ParentID] = ?
12+
[x].[ParentID] = ?
1513

1614
BeforeExecute
1715
-- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc.LinqService/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.TestOptimizingParameters(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ DECLARE @id Int -- Int32
44
SET @id = 1
55
DECLARE @id Int -- Int32
66
SET @id = 1
7-
DECLARE @id Int -- Int32
8-
SET @id = 1
97

108
SELECT
119
COUNT(*)
1210
FROM
1311
[Person] [t1]
1412
WHERE
15-
[t1].[PersonID] = ? OR [t1].[PersonID] <= ? OR [t1].[PersonID] = ?
13+
[t1].[PersonID] = ? OR [t1].[PersonID] <= ?
1614

Access.Ace.Odbc.LinqService/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.TestParametersByEquality(Access.Ace.Odbc.LinqService,1).sql

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ DECLARE @personId Int -- Int32
44
SET @personId = 1
55
DECLARE @personId Int -- Int32
66
SET @personId = 1
7-
DECLARE @personId Int -- Int32
8-
SET @personId = 1
97

108
SELECT
119
[p].[FirstName],
@@ -21,15 +19,13 @@ SELECT
2119
FROM
2220
[Person] [p]
2321
WHERE
24-
[p].[PersonID] = ? AND [p].[PersonID] = ? AND [p].[PersonID] = ?
22+
[p].[PersonID] = ? AND [p].[PersonID] = ?
2523

2624
BeforeExecute
2725
-- Access.Ace.Odbc AccessODBC
2826
DECLARE @personId Int -- Int32
2927
SET @personId = 1
3028
DECLARE @personId Int -- Int32
31-
SET @personId = 1
32-
DECLARE @personId Int -- Int32
3329
SET @personId = 2
3430

3531
SELECT
@@ -46,5 +42,5 @@ SELECT
4642
FROM
4743
[Person] [p]
4844
WHERE
49-
[p].[PersonID] = ? AND [p].[PersonID] = ? AND [p].[PersonID] = ?
45+
[p].[PersonID] = ? AND [p].[PersonID] = ?
5046

Access.Ace.Odbc.LinqService/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.TestParametersByEquality(Access.Ace.Odbc.LinqService,2).sql

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ DECLARE @personId Int -- Int32
44
SET @personId = 1
55
DECLARE @personId Int -- Int32
66
SET @personId = 1
7-
DECLARE @personId Int -- Int32
8-
SET @personId = 1
97

108
SELECT
119
[p].[FirstName],
@@ -21,15 +19,13 @@ SELECT
2119
FROM
2220
[Person] [p]
2321
WHERE
24-
[p].[PersonID] = ? AND [p].[PersonID] = ? AND [p].[PersonID] = ?
22+
[p].[PersonID] = ? AND [p].[PersonID] = ?
2523

2624
BeforeExecute
2725
-- Access.Ace.Odbc AccessODBC
2826
DECLARE @personId Int -- Int32
2927
SET @personId = 1
3028
DECLARE @personId Int -- Int32
31-
SET @personId = 1
32-
DECLARE @personId Int -- Int32
3329
SET @personId = 2
3430

3531
SELECT
@@ -46,5 +42,5 @@ SELECT
4642
FROM
4743
[Person] [p]
4844
WHERE
49-
[p].[PersonID] = ? AND [p].[PersonID] = ? AND [p].[PersonID] = ?
45+
[p].[PersonID] = ? AND [p].[PersonID] = ?
5046

Access.Ace.Odbc.LinqService/Tests/Linq/SelectManyTests/Tests.Linq.SelectManyTests.Test31(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ SELECT
1010
FROM
1111
[Person] [p]
1212
WHERE
13-
[p].[PersonID] = 1 AND [p].[PersonID] = 1 AND [p].[PersonID] = 1
13+
[p].[PersonID] = 1
1414

Access.Ace.Odbc.LinqService/Tests/Linq/SelectManyTests/Tests.Linq.SelectManyTests.Test32(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ SELECT
1010
FROM
1111
[Person] [p]
1212
WHERE
13-
[p].[PersonID] = 1 AND [p].[PersonID] = 1 AND [p].[PersonID] = 1
13+
[p].[PersonID] = 1
1414

Access.Ace.Odbc.LinqService/Tests/Linq/SelectScalarTests/Tests.Linq.SelectScalarTests.Scalar22(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ SELECT
1010
FROM
1111
[Person] [p1]
1212
WHERE
13-
[p1].[PersonID] = 1 AND [p1].[PersonID] = 1
13+
[p1].[PersonID] = 1
1414

Access.Ace.Odbc.LinqService/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.SubSub21(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ SELECT
88
FROM
99
[Child] [a_Children]
1010
WHERE
11-
[p1].[ParentID] = [a_Children].[ParentID] AND [a_Children].[ParentID] + 1 < [p1].[ParentID] + 2 AND
12-
[a_Children].[ParentID] + 1 < [p1].[ParentID] + 2
11+
[p1].[ParentID] = [a_Children].[ParentID] AND [a_Children].[ParentID] + 1 < [p1].[ParentID] + 2
1312
)
1413
FROM
1514
[Parent] [p1]

Access.Ace.Odbc.LinqService/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.SubSub211(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ SELECT
99
[Child] [a_Children]
1010
INNER JOIN [GrandChild] [g_1] ON ([a_Children].[ParentID] = [g_1].[ParentID] AND [a_Children].[ChildID] = [g_1].[ChildID])
1111
WHERE
12-
[p1].[ParentID] = [a_Children].[ParentID] AND [g_1].[ParentID] + 1 < [p1].[ParentID] + 2 AND
13-
[g_1].[ParentID] + 1 < [p1].[ParentID] + 2
12+
[p1].[ParentID] = [a_Children].[ParentID] AND [g_1].[ParentID] + 1 < [p1].[ParentID] + 2
1413
)
1514
FROM
1615
[Parent] [p1]

Access.Ace.Odbc.LinqService/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.SubSub212(Access.Ace.Odbc.LinqService).sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SELECT
99
[GrandChild] [a_GrandChildren]
1010
WHERE
1111
[a_Parent].[ParentID] = [a_GrandChildren].[ParentID] AND
12-
[a_GrandChildren].[ParentID] + 1 < [p1].[ParentID] + 2 AND
1312
[a_GrandChildren].[ParentID] + 1 < [p1].[ParentID] + 2
1413
)
1514
FROM

Access.Ace.Odbc.LinqService/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.SubSub22(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ SELECT
88
FROM
99
[Child] [c_1]
1010
WHERE
11-
[p1].[ParentID] = [c_1].[ParentID] AND [c_1].[ParentID] + 1 < [p1].[ParentID] + 2 AND
12-
[c_1].[ParentID] + 1 < [p1].[ParentID] + 2
11+
[p1].[ParentID] = [c_1].[ParentID] AND [c_1].[ParentID] + 1 < [p1].[ParentID] + 2
1312
)
1413
FROM
1514
[Parent] [p1]

Access.Ace.Odbc.LinqService/Tests/Linq/VisualBasicTests/Tests.Linq.VisualBasicTests.Issue2746(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ SELECT
1010
FROM
1111
[GrandChild] [w]
1212
WHERE
13-
[w].[ChildID] IS NOT NULL AND [w].[ChildID] = ?
13+
[w].[ChildID] = ?
1414

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.CheckLeftJoin3(Access.Ace.Odbc.LinqService).sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ FROM
88
[Parent] [p]
99
LEFT JOIN [GrandChild] [ch] ON ([p].[ParentID] = 1 + [ch].[ParentID] AND [ch].[ParentID] > 0)
1010
WHERE
11-
NOT ([ch].[ParentID] IS NOT NULL AND [ch].[ChildID] IS NOT NULL) AND
1211
NOT ([ch].[ParentID] IS NOT NULL AND [ch].[ChildID] IS NOT NULL)
1312

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Conditional8(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ SELECT
1010
FROM
1111
[Person] [p]
1212
WHERE
13-
[p].[PersonID] = 1 AND [p].[MiddleName] IS NULL AND
14-
[p].[MiddleName] IS NULL
13+
[p].[PersonID] = 1 AND [p].[MiddleName] IS NULL
1514

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Conditional9(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ SELECT
1010
FROM
1111
[Person] [p]
1212
WHERE
13-
[p].[PersonID] = 1 AND NOT ([p].[MiddleName] IS NOT NULL OR [p].[PersonID] = 2 OR [p].[MiddleName] IS NOT NULL) AND
13+
[p].[PersonID] = 1 AND NOT ([p].[MiddleName] IS NOT NULL OR [p].[PersonID] = 2) AND
1414
[p].[PersonID] <> 2
1515

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.HavingTest2(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ FROM
88
GROUP BY
99
[c_1].[ParentID]
1010
HAVING
11-
COUNT(*) > 1 AND COUNT(*) > 1
11+
COUNT(*) > 1
1212

Access.Ace.Odbc.LinqService/Tests/Linq/WhereTests/Tests.Linq.WhereTests.Issue2424Nullable(Access.Ace.Odbc.LinqService).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ SELECT
182182
FROM
183183
[Isue2424Table] [i]
184184
WHERE
185-
[i].[StrValueNullable] IS NOT NULL OR [i].[StrValueNullable] IS NOT NULL
185+
[i].[StrValueNullable] IS NOT NULL
186186

187187
BeforeExecute
188188
-- Access.Ace.Odbc AccessODBC

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ WHERE
1919
INNER JOIN [GrandChild] [a_Child] ON ([a_ManyToMany].[ChildID] = [a_Child].[ChildID]))
2020
LEFT JOIN [Parent] [a_Parent] ON ([a_Child].[ParentID] = [a_Parent].[ParentID])
2121
WHERE
22-
[li].[ParentID] = ? AND [a_Parent].[ParentID] IS NOT NULL AND
23-
[a_Parent].[ParentID] = ?
22+
[li].[ParentID] = ? AND [a_Parent].[ParentID] = ?
2423
)
2524
ORDER BY
2625
[t1].[ChildID]

Access.Ace.Odbc/Tests/Linq/ConstantTests/Tests.Linq.ConstantTests.static_readonly_access_readonly_members(Access.Ace.Odbc).sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SELECT
99
FROM
1010
[TestConstantsData] [e]
1111
WHERE
12-
[e].[Id] = 1 AND [e].[Id] = 1
12+
[e].[Id] = 1
1313

1414
BeforeExecute
1515
-- Access.Ace.Odbc AccessODBC
@@ -33,7 +33,7 @@ SELECT
3333
FROM
3434
[TestConstantsData] [e]
3535
WHERE
36-
[e].[Id] = 1 AND [e].[Id] = 1
36+
[e].[Id] = 1
3737

3838
BeforeExecute
3939
-- Access.Ace.Odbc AccessODBC

Access.Ace.Odbc/Tests/Linq/ContainsTests/Tests.Linq.ContainsTests.Issue2608Test(Access.Ace.Odbc).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ FROM
1515
((([LinqDataTypes] [x]
1616
INNER JOIN [LinqDataTypes] [o] ON ([x].[IntValue] = [o].[IntValue] OR [x].[IntValue] IS NULL AND [o].[IntValue] IS NULL))
1717
INNER JOIN [LinqDataTypes] [u] ON ([o].[IntValue] = [u].[IntValue] OR [o].[IntValue] IS NULL AND [u].[IntValue] IS NULL))
18-
INNER JOIN [LinqDataTypes] [r] ON (([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND ([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND [r].[BoolValue] = False))
18+
INNER JOIN [LinqDataTypes] [r] ON (([u].[IntValue] = [r].[IntValue] OR [u].[IntValue] IS NULL AND [r].[IntValue] IS NULL) AND [r].[BoolValue] = False))
1919
INNER JOIN [LinqDataTypes] [f] ON ([r].[IntValue] = [f].[IntValue] OR [r].[IntValue] IS NULL AND [f].[IntValue] IS NULL)
2020
WHERE
2121
[x].[BoolValue] = False AND

Access.Ace.Odbc/Tests/Linq/ConvertExpressionTests/Tests.Linq.ConvertExpressionTests.Issue3791Test(Access.Ace.Odbc).sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ SELECT
77
[a_Association].[Id]
88
FROM
99
[Issue3791Table] [t1]
10-
LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = IIF([a_Association].[Id] IS NOT NULL, CStr([a_Association].[Id]), NULL))
10+
LEFT JOIN [Issue3791GuidTable] [a_Association] ON ([t1].[OtherId] = CStr([a_Association].[Id]))
1111

0 commit comments

Comments
 (0)