Skip to content

Commit af72ec9

Browse files
MaceWinduMaceWindu
authored
Merge branch 'master' into baselines/pr_4875-base
2 parents 543bb19 + 77965be commit af72ec9

File tree

11,899 files changed

+128880
-127190
lines changed

Some content is hidden

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

11,899 files changed

+128880
-127190
lines changed

‎DB2.LinqService/Tests/Linq/QueryGenerationTests/Tests.Linq.QueryGenerationTests.ToSqlQuery_IMergeable(DB2.LinqService).sql

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,29 +224,29 @@ BeforeExecute
224224
MERGE INTO "TestMerge1" "Target"
225225
USING (
226226
SELECT
227-
"t1"."Id" as "source_Id",
228-
"t1"."Field1" as "source_Field1",
229-
"t1"."Field2" as "source_Field2",
230-
"t1"."Field3" as "source_Field3",
231-
"t1"."Field4" as "source_Field4"
227+
"t1"."Id",
228+
"t1"."Field1",
229+
"t1"."Field2",
230+
"t1"."Field3",
231+
"t1"."Field4"
232232
FROM
233233
"TestMerge2" "t1"
234234
) "Source"
235235
(
236-
"source_Id",
237-
"source_Field1",
238-
"source_Field2",
239-
"source_Field3",
240-
"source_Field4"
236+
"Id",
237+
"Field1",
238+
"Field2",
239+
"Field3",
240+
"Field4"
241241
)
242-
ON ("Target"."Id" = "Source"."source_Id")
242+
ON ("Target"."Id" = "Source"."Id")
243243

244244
WHEN MATCHED THEN
245245
UPDATE
246246
SET
247-
"Field1" = "Source"."source_Field1",
248-
"Field2" = "Source"."source_Field2",
249-
"Field3" = "Source"."source_Field3"
247+
"Field1" = "Source"."Field1",
248+
"Field2" = "Source"."Field2",
249+
"Field3" = "Source"."Field3"
250250

251251
WHEN NOT MATCHED THEN
252252
INSERT
@@ -258,9 +258,9 @@ INSERT
258258
)
259259
VALUES
260260
(
261-
"Source"."source_Id",
262-
"Source"."source_Field1",
263-
"Source"."source_Field2",
264-
"Source"."source_Field4"
261+
"Source"."Id",
262+
"Source"."Field1",
263+
"Source"."Field2",
264+
"Source"."Field4"
265265
)
266266

‎DB2.LinqService/Tests/Linq/TagTests/Tests.Linq.TagTests.Test_SqlMergeStatement(DB2.LinqService).sql

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
MERGE INTO "TestMerge1" "Target"
66
USING (
77
SELECT
8-
"t1"."Id" as "source_Id",
9-
"t1"."Field1" as "source_Field1",
10-
"t1"."Field2" as "source_Field2",
11-
"t1"."Field4" as "source_Field4"
8+
"t1"."Id",
9+
"t1"."Field1",
10+
"t1"."Field2",
11+
"t1"."Field4"
1212
FROM
1313
"TestMerge2" "t1"
1414
) "Source"
1515
(
16-
"source_Id",
17-
"source_Field1",
18-
"source_Field2",
19-
"source_Field4"
16+
"Id",
17+
"Field1",
18+
"Field2",
19+
"Field4"
2020
)
21-
ON ("Target"."Id" = "Source"."source_Id")
21+
ON ("Target"."Id" = "Source"."Id")
2222

2323
WHEN NOT MATCHED THEN
2424
INSERT
@@ -30,9 +30,9 @@ INSERT
3030
)
3131
VALUES
3232
(
33-
"Source"."source_Id",
34-
"Source"."source_Field1",
35-
"Source"."source_Field2",
36-
"Source"."source_Field4"
33+
"Source"."Id",
34+
"Source"."Field1",
35+
"Source"."Field2",
36+
"Source"."Field4"
3737
)
3838

‎DB2.LinqService/Tests/Mapping/ConversionTypeTests/Tests.Mapping.ConversionTypeTests.MergeTest(DB2.LinqService,False).sql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ USING (VALUES
66
(1,'***OOO***'), (2,'***SSS***')
77
) "Source"
88
(
9-
"source_ID",
10-
"source_Data"
9+
ID,
10+
"Data_1"
1111
)
12-
ON ("Target".ID = "Source"."source_ID")
12+
ON ("Target".ID = "Source".ID)
1313

1414
WHEN MATCHED THEN
1515
UPDATE
1616
SET
17-
"Data" = "Source"."source_Data"
17+
"Data" = "Source"."Data_1"
1818

1919
WHEN NOT MATCHED THEN
2020
INSERT
@@ -24,8 +24,8 @@ INSERT
2424
)
2525
VALUES
2626
(
27-
"Source"."source_ID",
28-
"Source"."source_Data"
27+
"Source".ID,
28+
"Source"."Data_1"
2929
)
3030

3131
BeforeExecute
@@ -36,15 +36,15 @@ USING (VALUES
3636
(3,'***III***')
3737
) "Source"
3838
(
39-
"source_ID",
40-
"source_Data"
39+
ID,
40+
"Data_1"
4141
)
42-
ON ("Target".ID = "Source"."source_ID")
42+
ON ("Target".ID = "Source".ID)
4343

4444
WHEN MATCHED THEN
4545
UPDATE
4646
SET
47-
"Data" = "Source"."source_Data"
47+
"Data" = "Source"."Data_1"
4848

4949
WHEN NOT MATCHED THEN
5050
INSERT
@@ -54,8 +54,8 @@ INSERT
5454
)
5555
VALUES
5656
(
57-
"Source"."source_ID",
58-
"Source"."source_Data"
57+
"Source".ID,
58+
"Source"."Data_1"
5959
)
6060

6161
BeforeExecute

‎DB2.LinqService/Tests/Mapping/ConversionTypeTests/Tests.Mapping.ConversionTypeTests.MergeTest(DB2.LinqService,True).sql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ USING (VALUES
66
(1,'***OOO***'), (2,'***SSS***')
77
) "Source"
88
(
9-
"source_ID",
10-
"source_Data"
9+
ID,
10+
"Data_1"
1111
)
12-
ON ("Target".ID = "Source"."source_ID")
12+
ON ("Target".ID = "Source".ID)
1313

1414
WHEN MATCHED THEN
1515
UPDATE
1616
SET
17-
"Data" = "Source"."source_Data"
17+
"Data" = "Source"."Data_1"
1818

1919
WHEN NOT MATCHED THEN
2020
INSERT
@@ -24,8 +24,8 @@ INSERT
2424
)
2525
VALUES
2626
(
27-
"Source"."source_ID",
28-
"Source"."source_Data"
27+
"Source".ID,
28+
"Source"."Data_1"
2929
)
3030

3131
BeforeExecute
@@ -36,15 +36,15 @@ USING (VALUES
3636
(3,'***III***')
3737
) "Source"
3838
(
39-
"source_ID",
40-
"source_Data"
39+
ID,
40+
"Data_1"
4141
)
42-
ON ("Target".ID = "Source"."source_ID")
42+
ON ("Target".ID = "Source".ID)
4343

4444
WHEN MATCHED THEN
4545
UPDATE
4646
SET
47-
"Data" = "Source"."source_Data"
47+
"Data" = "Source"."Data_1"
4848

4949
WHEN NOT MATCHED THEN
5050
INSERT
@@ -54,8 +54,8 @@ INSERT
5454
)
5555
VALUES
5656
(
57-
"Source"."source_ID",
58-
"Source"."source_Data"
57+
"Source".ID,
58+
"Source"."Data_1"
5959
)
6060

6161
BeforeExecute

‎DB2.LinqService/Tests/Mapping/FluentMappingBuildTests/Tests.Mapping.FluentMappingBuildTests.MergeTestAsync(DB2.LinqService).sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ USING (VALUES
4848
(1,'John II')
4949
) "Source"
5050
(
51-
"source_ID",
52-
"source_Name"
51+
ID,
52+
"Name"
5353
)
54-
ON ("Target".ID = "Source"."source_ID")
54+
ON ("Target".ID = "Source".ID)
5555

5656
WHEN MATCHED THEN
5757
UPDATE
5858
SET
59-
"Name" = "Source"."source_Name"
59+
"Name" = "Source"."Name"
6060

6161
WHEN NOT MATCHED THEN
6262
INSERT
@@ -66,8 +66,8 @@ INSERT
6666
)
6767
VALUES
6868
(
69-
"Source"."source_ID",
70-
"Source"."source_Name"
69+
"Source".ID,
70+
"Source"."Name"
7171
)
7272

7373
BeforeExecute

‎DB2.LinqService/Tests/Mapping/MappingAmbiguityTests/Tests.Mapping.MappingAmbiguityTests.TestDefaultInsertUpdateMerge(DB2.LinqService).sql

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
MERGE INTO "TestTable" "Target"
55
USING (
66
SELECT
7-
"Target_1".ID as "source_ID",
8-
"Target_1"."Field1" as "source_Field1",
9-
"Target_1"."Field2" as "source_Field2",
10-
"Target_1"."Field3" as "source_Field3",
11-
"Target_1"."Field4" as "source_Field4",
12-
"Target_1"."field11" as "source_field1_1",
13-
"Target_1"."Field5" as "source_Field5"
7+
"Target_1".ID,
8+
"Target_1"."Field1",
9+
"Target_1"."Field2",
10+
"Target_1"."Field3",
11+
"Target_1"."Field4",
12+
"Target_1"."field11" as "field1_1",
13+
"Target_1"."Field5"
1414
FROM
1515
"TestTable" "Target_1"
1616
) "Source"
1717
(
18-
"source_ID",
19-
"source_Field1",
20-
"source_Field2",
21-
"source_Field3",
22-
"source_Field4",
23-
"source_field1_1",
24-
"source_Field5"
18+
ID,
19+
"Field1",
20+
"Field2",
21+
"Field3",
22+
"Field4",
23+
"field1_1",
24+
"Field5"
2525
)
26-
ON ("Target".ID = "Source"."source_ID")
26+
ON ("Target".ID = "Source".ID)
2727

2828
WHEN NOT MATCHED THEN
2929
INSERT
@@ -38,22 +38,22 @@ INSERT
3838
)
3939
VALUES
4040
(
41-
"Source"."source_ID",
42-
"Source"."source_Field1",
43-
"Source"."source_Field2",
44-
"Source"."source_Field3",
45-
"Source"."source_Field4",
46-
"Source"."source_field1_1",
47-
"Source"."source_Field5"
41+
"Source".ID,
42+
"Source"."Field1",
43+
"Source"."Field2",
44+
"Source"."Field3",
45+
"Source"."Field4",
46+
"Source"."field1_1",
47+
"Source"."Field5"
4848
)
4949

5050
WHEN MATCHED THEN
5151
UPDATE
5252
SET
53-
"Field1" = "Source"."source_Field1",
54-
"Field2" = "Source"."source_Field2",
55-
"Field3" = "Source"."source_Field3",
56-
"Field4" = "Source"."source_Field4",
57-
"field11" = "Source"."source_field1_1",
58-
"Field5" = "Source"."source_Field5"
53+
"Field1" = "Source"."Field1",
54+
"Field2" = "Source"."Field2",
55+
"Field3" = "Source"."Field3",
56+
"Field4" = "Source"."Field4",
57+
"field11" = "Source"."field1_1",
58+
"Field5" = "Source"."Field5"
5959

‎DB2.LinqService/Tests/xUpdate/MergeTests/Tests.xUpdate.MergeTests.AnonymousListSourceDeleteWithPredicate(DB2.LinqService).sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ USING (VALUES
239239
(3), (4), (5), (6)
240240
) "Source"
241241
(
242-
"source_Key"
242+
"Key_1"
243243
)
244-
ON ("Source"."source_Key" = "Target"."Id")
245-
WHEN MATCHED AND "Source"."source_Key" = 4 THEN DELETE
244+
ON ("Source"."Key_1" = "Target"."Id")
245+
WHEN MATCHED AND "Source"."Key_1" = 4 THEN DELETE
246246

247247
BeforeExecute
248248
-- DB2 DB2.LUW DB2LUW

‎DB2.LinqService/Tests/xUpdate/MergeTests/Tests.xUpdate.MergeTests.AnonymousListSourceInsertWithPredicate(DB2.LinqService).sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -243,16 +243,16 @@ USING (VALUES
243243
(6,NULL,NULL,NULL,216,NULL)
244244
) "Source"
245245
(
246-
"source_Key",
247-
"source_Field01",
248-
"source_Field02",
249-
"source_Field03",
250-
"source_Field04",
251-
"source_Field05"
246+
"Key_1",
247+
"Field01",
248+
"Field02",
249+
"Field03",
250+
"Field04",
251+
"Field05"
252252
)
253-
ON ("Target"."Id" = "Source"."source_Key")
253+
ON ("Target"."Id" = "Source"."Key_1")
254254

255-
WHEN NOT MATCHED AND "Source"."source_Field04" = 216 THEN
255+
WHEN NOT MATCHED AND "Source"."Field04" = 216 THEN
256256
INSERT
257257
(
258258
"Id",
@@ -264,12 +264,12 @@ INSERT
264264
)
265265
VALUES
266266
(
267-
"Source"."source_Key",
268-
"Source"."source_Field01",
269-
"Source"."source_Field02",
270-
"Source"."source_Field03",
271-
"Source"."source_Field04",
272-
"Source"."source_Field05"
267+
"Source"."Key_1",
268+
"Source"."Field01",
269+
"Source"."Field02",
270+
"Source"."Field03",
271+
"Source"."Field04",
272+
"Source"."Field05"
273273
)
274274

275275
BeforeExecute

0 commit comments

Comments
 (0)