@@ -2008,7 +2008,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2008
2008
ROLLBACK;
2009
2009
-- try updating the partition key column
2010
2010
BEGIN;
2011
- @@ -1732,64 +1690,102 @@
2011
+ @@ -1732,64 +1690,100 @@
2012
2012
UPDATE SET tid = tid + 1, balance = balance + delta, val = val || ' updated by merge'
2013
2013
WHEN NOT MATCHED THEN
2014
2014
INSERT VALUES (sid, delta, 'inserted by merge');
@@ -2045,9 +2045,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2045
2045
ALTER TABLE pa_target FORCE ROW LEVEL SECURITY;
2046
2046
+ERROR: relation "pa_target" does not exist
2047
2047
CREATE POLICY pa_target_pol ON pa_target USING (tid != 0);
2048
- +ERROR: unimplemented: row-level security is not yet implemented
2049
- +HINT: You have attempted to use a feature that is not yet implemented.
2050
- +See: https://go.crdb.dev/issue-v/73596/_version_
2048
+ +ERROR: relation "pa_target" does not exist
2051
2049
MERGE INTO pa_target t
2052
2050
USING pa_source s
2053
2051
ON t.tid = s.sid AND t.tid IN (1,2,3,4)
@@ -2130,7 +2128,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2130
2128
-- try simple MERGE
2131
2129
BEGIN;
2132
2130
MERGE INTO pa_target t
2133
- @@ -1799,91 +1795 ,78 @@
2131
+ @@ -1799,91 +1793 ,78 @@
2134
2132
UPDATE SET balance = balance + delta, val = val || ' updated by merge'
2135
2133
WHEN NOT MATCHED THEN
2136
2134
INSERT VALUES (slogts::timestamp, sid, delta, 'inserted by merge');
@@ -2262,7 +2260,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2262
2260
INSERT INTO cj_source1 VALUES (1, 10, 100);
2263
2261
INSERT INTO cj_source1 VALUES (1, 20, 200);
2264
2262
INSERT INTO cj_source1 VALUES (2, 20, 300);
2265
- @@ -1898,6 +1881 ,10 @@
2263
+ @@ -1898,6 +1879 ,10 @@
2266
2264
ON t.tid = sid1
2267
2265
WHEN NOT MATCHED THEN
2268
2266
INSERT VALUES (sid1, delta, sval);
@@ -2273,7 +2271,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2273
2271
-- try accessing columns from either side of the source join
2274
2272
MERGE INTO cj_target t
2275
2273
USING cj_source2 s2
2276
- @@ -1907,6 +1894 ,10 @@
2274
+ @@ -1907,6 +1892 ,10 @@
2277
2275
INSERT VALUES (sid2, delta, sval)
2278
2276
WHEN MATCHED THEN
2279
2277
DELETE;
@@ -2284,7 +2282,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2284
2282
-- some simple expressions in INSERT targetlist
2285
2283
MERGE INTO cj_target t
2286
2284
USING cj_source2 s2
2287
- @@ -1916,20 +1907 ,24 @@
2285
+ @@ -1916,20 +1905 ,24 @@
2288
2286
INSERT VALUES (sid2, delta + scat, sval)
2289
2287
WHEN MATCHED THEN
2290
2288
UPDATE SET val = val || ' updated by merge';
@@ -2316,7 +2314,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2316
2314
2317
2315
-- try it with an outer join and PlaceHolderVar
2318
2316
MERGE INTO cj_target t
2319
- @@ -1938,19 +1933 ,14 @@
2317
+ @@ -1938,19 +1931 ,14 @@
2320
2318
ON t.tid = fj.scat
2321
2319
WHEN NOT MATCHED THEN
2322
2320
INSERT (tid, balance, val) VALUES (fj.scat, fj.delta, fj.phv);
@@ -2343,7 +2341,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2343
2341
2344
2342
ALTER TABLE cj_source1 RENAME COLUMN sid1 TO sid;
2345
2343
ALTER TABLE cj_source2 RENAME COLUMN sid2 TO sid;
2346
- @@ -1961,10 +1951 ,15 @@
2344
+ @@ -1961,10 +1949 ,15 @@
2347
2345
ON t.tid = s1.sid
2348
2346
WHEN NOT MATCHED THEN
2349
2347
INSERT VALUES (s2.sid, delta, sval);
@@ -2359,7 +2357,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2359
2357
MERGE INTO fs_target t
2360
2358
USING generate_series(1,100,1) AS id
2361
2359
ON t.a = id
2362
- @@ -1972,6 +1967 ,10 @@
2360
+ @@ -1972,6 +1965 ,10 @@
2363
2361
UPDATE SET b = b + id
2364
2362
WHEN NOT MATCHED THEN
2365
2363
INSERT VALUES (id, -1);
@@ -2370,7 +2368,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2370
2368
MERGE INTO fs_target t
2371
2369
USING generate_series(1,100,2) AS id
2372
2370
ON t.a = id
2373
- @@ -1979,10 +1978 ,14 @@
2371
+ @@ -1979,10 +1976 ,14 @@
2374
2372
UPDATE SET b = b + id, c = 'updated '|| id.*::text
2375
2373
WHEN NOT MATCHED THEN
2376
2374
INSERT VALUES (id, -1, 'inserted ' || id.*::text);
@@ -2386,7 +2384,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2386
2384
(1 row)
2387
2385
2388
2386
DROP TABLE fs_target;
2389
- @@ -1995,12 +1998 ,29 @@
2387
+ @@ -1995,12 +1996 ,29 @@
2390
2388
peaktemp int,
2391
2389
unitsales int
2392
2390
) WITH (autovacuum_enabled=off);
@@ -2416,7 +2414,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2416
2414
CREATE TABLE measurement_y2007m01 (
2417
2415
filler text,
2418
2416
peaktemp int,
2419
- @@ -2009,8 +2029 ,14 @@
2417
+ @@ -2009,8 +2027 ,14 @@
2420
2418
unitsales int
2421
2419
CHECK ( logdate >= DATE '2007-01-01' AND logdate < DATE '2007-02-01')
2422
2420
) WITH (autovacuum_enabled=off);
@@ -2431,15 +2429,15 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2431
2429
INSERT INTO measurement VALUES (0, '2005-07-21', 5, 15);
2432
2430
CREATE OR REPLACE FUNCTION measurement_insert_trigger()
2433
2431
RETURNS TRIGGER AS $$
2434
- @@ -2034,6 +2060 ,7 @@
2432
+ @@ -2034,6 +2058 ,7 @@
2435
2433
CREATE TRIGGER insert_measurement_trigger
2436
2434
BEFORE INSERT ON measurement
2437
2435
FOR EACH ROW EXECUTE PROCEDURE measurement_insert_trigger();
2438
2436
+ERROR: relation "measurement_y2006m02" does not exist
2439
2437
INSERT INTO measurement VALUES (1, '2006-02-10', 35, 10);
2440
2438
INSERT INTO measurement VALUES (1, '2006-02-16', 45, 20);
2441
2439
INSERT INTO measurement VALUES (1, '2006-03-17', 25, 10);
2442
- @@ -2041,18 +2068 ,19 @@
2440
+ @@ -2041,18 +2066 ,19 @@
2443
2441
INSERT INTO measurement VALUES (1, '2007-01-15', 10, 10);
2444
2442
INSERT INTO measurement VALUES (1, '2007-01-17', 10, 10);
2445
2443
SELECT tableoid::regclass, * FROM measurement ORDER BY city_id, logdate;
@@ -2468,7 +2466,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2468
2466
INSERT INTO new_measurement VALUES (0, '2005-07-21', 25, 20);
2469
2467
INSERT INTO new_measurement VALUES (1, '2006-03-01', 20, 10);
2470
2468
INSERT INTO new_measurement VALUES (1, '2006-02-16', 50, 10);
2471
- @@ -2072,25 +2100 ,12 @@
2469
+ @@ -2072,25 +2098 ,12 @@
2472
2470
WHEN NOT MATCHED THEN INSERT
2473
2471
(city_id, logdate, peaktemp, unitsales)
2474
2472
VALUES (city_id, logdate, peaktemp, unitsales);
@@ -2499,7 +2497,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/merge.out --label
2499
2497
ROLLBACK;
2500
2498
MERGE into measurement m
2501
2499
USING new_measurement nm ON
2502
- @@ -2102,56 +2117 ,64 @@
2500
+ @@ -2102,56 +2115 ,64 @@
2503
2501
WHEN NOT MATCHED THEN INSERT
2504
2502
(city_id, logdate, peaktemp, unitsales)
2505
2503
VALUES (city_id, logdate, peaktemp, unitsales);
0 commit comments