Skip to content

Commit 61223ff

Browse files
MaceWinduMaceWindu
committed
other valid changes
1 parent dead22a commit 61223ff

File tree

1,166 files changed

+3872
-8802
lines changed

Some content is hidden

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

1,166 files changed

+3872
-8802
lines changed

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

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ SELECT
77
[d].[Usage],
88
[d].[FirstTableId]
99
FROM
10-
(
11-
SELECT DISTINCT
12-
[t1].[Id]
13-
FROM
14-
[Table404One] [t1]
15-
) [m_1]
10+
[Table404One] [m_1]
1611
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
1712

1813
BeforeExecute
@@ -34,12 +29,7 @@ SELECT
3429
[d].[Usage],
3530
[d].[FirstTableId]
3631
FROM
37-
(
38-
SELECT DISTINCT
39-
[t1].[Id]
40-
FROM
41-
[Table404One] [t1]
42-
) [m_1]
32+
[Table404One] [m_1]
4333
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
4434
WHERE
4535
[d].[Usage] = ?
@@ -63,12 +53,7 @@ SELECT
6353
[d].[Usage],
6454
[d].[FirstTableId]
6555
FROM
66-
(
67-
SELECT DISTINCT
68-
[t1].[Id]
69-
FROM
70-
[Table404One] [t1]
71-
) [m_1]
56+
[Table404One] [m_1]
7257
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
7358
WHERE
7459
[d].[Usage] = ?
@@ -90,12 +75,7 @@ SELECT
9075
[d].[Usage],
9176
[d].[FirstTableId]
9277
FROM
93-
(
94-
SELECT DISTINCT
95-
[t1].[Id]
96-
FROM
97-
[Table404One] [t1]
98-
) [m_1]
78+
[Table404One] [m_1]
9979
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
10080

10181
BeforeExecute
@@ -117,12 +97,7 @@ SELECT
11797
[d].[Usage],
11898
[d].[FirstTableId]
11999
FROM
120-
(
121-
SELECT DISTINCT
122-
[t1].[Id]
123-
FROM
124-
[Table404One] [t1]
125-
) [m_1]
100+
[Table404One] [m_1]
126101
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
127102
WHERE
128103
[d].[Usage] = ?
@@ -146,12 +121,7 @@ SELECT
146121
[d].[Usage],
147122
[d].[FirstTableId]
148123
FROM
149-
(
150-
SELECT DISTINCT
151-
[t1].[Id]
152-
FROM
153-
[Table404One] [t1]
154-
) [m_1]
124+
[Table404One] [m_1]
155125
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
156126
WHERE
157127
[d].[Usage] = ?

‎Access.Ace.Odbc.LinqService/Tests/UserTests/Issue4800Tests/Tests.UserTests.Issue4800Tests.JoinUsingAggregateResult(Access.Ace.Odbc.LinqService).sql‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ FROM
1313
[elements].[Token] as [Key_1],
1414
[elements].[TesteeId]
1515
FROM
16-
(((([Coverage] [elements]
16+
((([Coverage] [elements]
1717
INNER JOIN [Test] [test_1] ON ([elements].[TestId] = [test_1].[Id]))
1818
LEFT JOIN [Executant] [executant_1] ON ([test_1].[Id] = [executant_1].[TestId]))
1919
LEFT JOIN [Testee] [testee_1] ON ([elements].[TesteeId] = [testee_1].[Id]))
20-
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId]))
21-
LEFT JOIN [Account] [account_1] ON ([outfit_1].[AccountId] = [account_1].[Id])
20+
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId])
2221
WHERE
2322
[elements].[Status] = 14650
2423
GROUP BY
@@ -33,5 +32,4 @@ FROM
3332
GROUP BY
3433
[elements_1].[Key_1]
3534
) [t1]
36-
LEFT JOIN [Testee] [t] ON ([t1].[TesteeId] = [t].[Id])
3735

‎Access.Ace.Odbc/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.Issue404Test(Access.Ace.Odbc).sql‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ SELECT
99
[d].[Usage],
1010
[d].[FirstTableId]
1111
FROM
12-
(
13-
SELECT DISTINCT
14-
[t1].[Id]
15-
FROM
16-
[Table404One] [t1]
17-
) [m_1]
12+
[Table404One] [m_1]
1813
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
1914

2015
BeforeExecute
@@ -40,12 +35,7 @@ SELECT
4035
[d].[Usage],
4136
[d].[FirstTableId]
4237
FROM
43-
(
44-
SELECT DISTINCT
45-
[t1].[Id]
46-
FROM
47-
[Table404One] [t1]
48-
) [m_1]
38+
[Table404One] [m_1]
4939
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
5040
WHERE
5141
[d].[Usage] = ?
@@ -73,12 +63,7 @@ SELECT
7363
[d].[Usage],
7464
[d].[FirstTableId]
7565
FROM
76-
(
77-
SELECT DISTINCT
78-
[t1].[Id]
79-
FROM
80-
[Table404One] [t1]
81-
) [m_1]
66+
[Table404One] [m_1]
8267
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
8368
WHERE
8469
[d].[Usage] = ?
@@ -104,12 +89,7 @@ SELECT
10489
[d].[Usage],
10590
[d].[FirstTableId]
10691
FROM
107-
(
108-
SELECT DISTINCT
109-
[t1].[Id]
110-
FROM
111-
[Table404One] [t1]
112-
) [m_1]
92+
[Table404One] [m_1]
11393
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
11494

11595
BeforeExecute
@@ -135,12 +115,7 @@ SELECT
135115
[d].[Usage],
136116
[d].[FirstTableId]
137117
FROM
138-
(
139-
SELECT DISTINCT
140-
[t1].[Id]
141-
FROM
142-
[Table404One] [t1]
143-
) [m_1]
118+
[Table404One] [m_1]
144119
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
145120
WHERE
146121
[d].[Usage] = ?
@@ -168,12 +143,7 @@ SELECT
168143
[d].[Usage],
169144
[d].[FirstTableId]
170145
FROM
171-
(
172-
SELECT DISTINCT
173-
[t1].[Id]
174-
FROM
175-
[Table404One] [t1]
176-
) [m_1]
146+
[Table404One] [m_1]
177147
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
178148
WHERE
179149
[d].[Usage] = ?

‎Access.Ace.Odbc/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.Issue383Test1(Access.Ace.Odbc).sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ FROM
2626
[d].[Type_Code] = 'RE' AND
2727
[dcp].[Distributor_Type_Code] = 'RE'
2828
) [m_1]
29-
INNER JOIN [Cities] [d_1] ON ([d_1].[City_Code] = [m_1].[City_Code] OR [d_1].[City_Code] IS NULL AND [m_1].[City_Code] IS NULL)
29+
INNER JOIN [Cities] [d_1] ON ([d_1].[City_Code] = [m_1].[City_Code])
3030

3131
BeforeExecute
3232
DisposeTransaction

‎Access.Ace.Odbc/Tests/Linq/SubQueryTests/Tests.Linq.SubQueryTests.Issue383Test2(Access.Ace.Odbc).sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SELECT
1313
FROM
1414
[Cities] [c_1]
1515
WHERE
16-
[c_1].[City_Code] = [cp].[City_Code] OR [c_1].[City_Code] IS NULL AND [cp].[City_Code] IS NULL
16+
[c_1].[City_Code] = [cp].[City_Code]
1717
),
1818
[cp].[State],
1919
[cp].[Zip_Code],

‎Access.Ace.Odbc/Tests/UserTests/Issue4800Tests/Tests.UserTests.Issue4800Tests.JoinUsingAggregateResult(Access.Ace.Odbc).sql‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ FROM
1313
[elements].[Token] as [Key_1],
1414
[elements].[TesteeId]
1515
FROM
16-
(((([Coverage] [elements]
16+
((([Coverage] [elements]
1717
INNER JOIN [Test] [test_1] ON ([elements].[TestId] = [test_1].[Id]))
1818
LEFT JOIN [Executant] [executant_1] ON ([test_1].[Id] = [executant_1].[TestId]))
1919
LEFT JOIN [Testee] [testee_1] ON ([elements].[TesteeId] = [testee_1].[Id]))
20-
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId]))
21-
LEFT JOIN [Account] [account_1] ON ([outfit_1].[AccountId] = [account_1].[Id])
20+
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId])
2221
WHERE
2322
[elements].[Status] = 14650
2423
GROUP BY
@@ -33,5 +32,4 @@ FROM
3332
GROUP BY
3433
[elements_1].[Key_1]
3534
) [t1]
36-
LEFT JOIN [Testee] [t] ON ([t1].[TesteeId] = [t].[Id])
3735

‎Access.Ace.OleDb.LinqService/Tests/Linq/ParameterTests/Tests.Linq.ParameterTests.Issue404Test(Access.Ace.OleDb.LinqService).sql‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ SELECT
77
[d].[Usage],
88
[d].[FirstTableId]
99
FROM
10-
(
11-
SELECT DISTINCT
12-
[t1].[Id]
13-
FROM
14-
[Table404One] [t1]
15-
) [m_1]
10+
[Table404One] [m_1]
1611
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
1712

1813
BeforeExecute
@@ -34,12 +29,7 @@ SELECT
3429
[d].[Usage],
3530
[d].[FirstTableId]
3631
FROM
37-
(
38-
SELECT DISTINCT
39-
[t1].[Id]
40-
FROM
41-
[Table404One] [t1]
42-
) [m_1]
32+
[Table404One] [m_1]
4333
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
4434
WHERE
4535
[d].[Usage] = @cond
@@ -63,12 +53,7 @@ SELECT
6353
[d].[Usage],
6454
[d].[FirstTableId]
6555
FROM
66-
(
67-
SELECT DISTINCT
68-
[t1].[Id]
69-
FROM
70-
[Table404One] [t1]
71-
) [m_1]
56+
[Table404One] [m_1]
7257
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
7358
WHERE
7459
[d].[Usage] = @cond
@@ -90,12 +75,7 @@ SELECT
9075
[d].[Usage],
9176
[d].[FirstTableId]
9277
FROM
93-
(
94-
SELECT DISTINCT
95-
[t1].[Id]
96-
FROM
97-
[Table404One] [t1]
98-
) [m_1]
78+
[Table404One] [m_1]
9979
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
10080

10181
BeforeExecute
@@ -117,12 +97,7 @@ SELECT
11797
[d].[Usage],
11898
[d].[FirstTableId]
11999
FROM
120-
(
121-
SELECT DISTINCT
122-
[t1].[Id]
123-
FROM
124-
[Table404One] [t1]
125-
) [m_1]
100+
[Table404One] [m_1]
126101
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
127102
WHERE
128103
[d].[Usage] = @cond
@@ -146,12 +121,7 @@ SELECT
146121
[d].[Usage],
147122
[d].[FirstTableId]
148123
FROM
149-
(
150-
SELECT DISTINCT
151-
[t1].[Id]
152-
FROM
153-
[Table404One] [t1]
154-
) [m_1]
124+
[Table404One] [m_1]
155125
INNER JOIN [Table404Two] [d] ON ([m_1].[Id] = [d].[FirstTableId])
156126
WHERE
157127
[d].[Usage] = @cond

‎Access.Ace.OleDb.LinqService/Tests/UserTests/Issue4800Tests/Tests.UserTests.Issue4800Tests.JoinUsingAggregateResult(Access.Ace.OleDb.LinqService).sql‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ FROM
1313
[elements].[Token] as [Key_1],
1414
[elements].[TesteeId]
1515
FROM
16-
(((([Coverage] [elements]
16+
((([Coverage] [elements]
1717
INNER JOIN [Test] [test_1] ON ([elements].[TestId] = [test_1].[Id]))
1818
LEFT JOIN [Executant] [executant_1] ON ([test_1].[Id] = [executant_1].[TestId]))
1919
LEFT JOIN [Testee] [testee_1] ON ([elements].[TesteeId] = [testee_1].[Id]))
20-
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId]))
21-
LEFT JOIN [Account] [account_1] ON ([outfit_1].[AccountId] = [account_1].[Id])
20+
LEFT JOIN [Outfit] [outfit_1] ON ([testee_1].[WorkblankId] = [outfit_1].[WorkblankId])
2221
WHERE
2322
[elements].[Status] = 14650
2423
GROUP BY
@@ -33,5 +32,4 @@ FROM
3332
GROUP BY
3433
[elements_1].[Key_1]
3534
) [t1]
36-
LEFT JOIN [Testee] [t] ON ([t1].[TesteeId] = [t].[Id])
3735

0 commit comments

Comments
 (0)