mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-17 02:12:56 +00:00
renew patches
This commit is contained in:
Alexey Masterov
105
patches/i1.patch
105
patches/i1.patch
@@ -76,6 +76,101 @@ index e6f6602d953..d839678e6c7 100644
|
||||
ERROR: new row for relation "copy_tbl" violates check constraint "copy_con"
|
||||
DETAIL: Failing row contains (7, check failed, 6).
|
||||
CONTEXT: COPY copy_tbl, line 2: "7 check failed 6"
|
||||
diff --git a/src/test/regress/expected/copy.out b/src/test/regress/expected/copy.out
|
||||
index b48365ec981..13bee7a5ee4 100644
|
||||
--- a/src/test/regress/expected/copy.out
|
||||
+++ b/src/test/regress/expected/copy.out
|
||||
@@ -15,9 +15,11 @@ insert into copytest values('Unix',E'abc\ndef',2);
|
||||
insert into copytest values('Mac',E'abc\rdef',3);
|
||||
insert into copytest values(E'esc\\ape',E'a\\r\\\r\\\n\\nb',4);
|
||||
\set filename :abs_builddir '/results/copytest.csv'
|
||||
-copy copytest to :'filename' csv;
|
||||
+\set command '\\copy copytest to ' :'filename' csv;
|
||||
+:command
|
||||
create temp table copytest2 (like copytest);
|
||||
-copy copytest2 from :'filename' csv;
|
||||
+\set command '\\copy copytest2 from ' :'filename' csv;
|
||||
+:command
|
||||
select * from copytest except select * from copytest2;
|
||||
style | test | filler
|
||||
-------+------+--------
|
||||
@@ -25,8 +27,10 @@ select * from copytest except select * from copytest2;
|
||||
|
||||
truncate copytest2;
|
||||
--- same test but with an escape char different from quote char
|
||||
-copy copytest to :'filename' csv quote '''' escape E'\\';
|
||||
-copy copytest2 from :'filename' csv quote '''' escape E'\\';
|
||||
+\set command '\\copy copytest to ' :'filename' ' csv quote ' '\'\'\'\'' ' escape ' 'E\'' '\\\\\'';
|
||||
+:command
|
||||
+\set command '\\copy copytest2 from ' :'filename' ' csv quote ' '\'\'\'\'' ' escape ' 'E\'' '\\\\\'';
|
||||
+:command
|
||||
select * from copytest except select * from copytest2;
|
||||
style | test | filler
|
||||
-------+------+--------
|
||||
@@ -66,13 +70,16 @@ insert into parted_copytest select x,1,'One' from generate_series(1,1000) x;
|
||||
insert into parted_copytest select x,2,'Two' from generate_series(1001,1010) x;
|
||||
insert into parted_copytest select x,1,'One' from generate_series(1011,1020) x;
|
||||
\set filename :abs_builddir '/results/parted_copytest.csv'
|
||||
-copy (select * from parted_copytest order by a) to :'filename';
|
||||
+\set command '\\copy (select * from parted_copytest order by a) to ' :'filename';
|
||||
+:command
|
||||
truncate parted_copytest;
|
||||
-copy parted_copytest from :'filename';
|
||||
+\set command '\\copy parted_copytest from ' :'filename';
|
||||
+:command
|
||||
-- Ensure COPY FREEZE errors for partitioned tables.
|
||||
begin;
|
||||
truncate parted_copytest;
|
||||
-copy parted_copytest from :'filename' (freeze);
|
||||
+\set command '\\copy parted_copytest from ' :'filename' (freeze);
|
||||
+:command
|
||||
ERROR: cannot perform COPY FREEZE on a partitioned table
|
||||
rollback;
|
||||
select tableoid::regclass,count(*),sum(a) from parted_copytest
|
||||
@@ -94,7 +101,8 @@ create trigger part_ins_trig
|
||||
before insert on parted_copytest_a2
|
||||
for each row
|
||||
execute procedure part_ins_func();
|
||||
-copy parted_copytest from :'filename';
|
||||
+\set command '\\copy parted_copytest from ' :'filename';
|
||||
+:command
|
||||
select tableoid::regclass,count(*),sum(a) from parted_copytest
|
||||
group by tableoid order by tableoid::regclass::name;
|
||||
tableoid | count | sum
|
||||
@@ -106,7 +114,8 @@ group by tableoid order by tableoid::regclass::name;
|
||||
truncate table parted_copytest;
|
||||
create index on parted_copytest (b);
|
||||
drop trigger part_ins_trig on parted_copytest_a2;
|
||||
-copy parted_copytest from stdin;
|
||||
+\set command '\\copy parted_copytest from ' stdin;
|
||||
+:command
|
||||
-- Ensure index entries were properly added during the copy.
|
||||
select * from parted_copytest where b = 1;
|
||||
a | b | c
|
||||
@@ -170,9 +179,10 @@ INFO: progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progre
|
||||
-- Generate COPY FROM report with FILE, with some excluded tuples.
|
||||
truncate tab_progress_reporting;
|
||||
\set filename :abs_srcdir '/data/emp.data'
|
||||
-copy tab_progress_reporting from :'filename'
|
||||
- where (salary < 2000);
|
||||
-INFO: progress: {"type": "FILE", "command": "COPY FROM", "relname": "tab_progress_reporting", "has_bytes_total": true, "tuples_excluded": 1, "tuples_processed": 2, "has_bytes_processed": true}
|
||||
+\set command '\\copy tab_progress_reporting from ' :'filename' 'where (salary < 2000)';
|
||||
+:command
|
||||
+INFO: progress: {"type": "PIPE", "command": "COPY FROM", "relname": "tab_progress_reporting", "has_bytes_total": false, "tuples_excluded": 1, "tuples_processed": 2, "has_bytes_processed": true}
|
||||
+
|
||||
drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
|
||||
drop function notice_after_tab_progress_reporting();
|
||||
drop table tab_progress_reporting;
|
||||
@@ -281,7 +291,8 @@ CREATE TABLE parted_si_p_odd PARTITION OF parted_si FOR VALUES IN (1);
|
||||
-- https://postgr.es/m/18130-7a86a7356a75209d%40postgresql.org
|
||||
-- https://postgr.es/m/257696.1695670946%40sss.pgh.pa.us
|
||||
\set filename :abs_srcdir '/data/desc.data'
|
||||
-COPY parted_si(id, data) FROM :'filename';
|
||||
+\set command '\\COPY parted_si(id, data) FROM ' :'filename';
|
||||
+:command
|
||||
-- An earlier bug (see commit b1ecb9b3fcf) could end up using a buffer from
|
||||
-- the wrong partition. This test is *not* guaranteed to trigger that bug, but
|
||||
-- does so when shared_buffers is small enough. To test if we encountered the
|
||||
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
|
||||
index acfd9d1f4f7..7a230026ad7 100644
|
||||
--- a/src/test/regress/expected/create_index.out
|
||||
@@ -364,7 +459,7 @@ index 5ffcd4ffc7b..913c7ad80d1 100644
|
||||
SELECT * FROM COPY_TBL;
|
||||
|
||||
diff --git a/src/test/regress/sql/copy.sql b/src/test/regress/sql/copy.sql
|
||||
index 43d2e906dd9..0f40c136da0 100644
|
||||
index 43d2e906dd9..dba19a970ab 100644
|
||||
--- a/src/test/regress/sql/copy.sql
|
||||
+++ b/src/test/regress/sql/copy.sql
|
||||
@@ -20,11 +20,13 @@ insert into copytest values('Mac',E'abc\rdef',3);
|
||||
@@ -440,16 +535,18 @@ index 43d2e906dd9..0f40c136da0 100644
|
||||
1 1 str1
|
||||
2 2 str2
|
||||
\.
|
||||
@@ -191,7 +200,8 @@ bill 20 (11,10) 1000 sharon
|
||||
@@ -191,8 +200,9 @@ bill 20 (11,10) 1000 sharon
|
||||
-- Generate COPY FROM report with FILE, with some excluded tuples.
|
||||
truncate tab_progress_reporting;
|
||||
\set filename :abs_srcdir '/data/emp.data'
|
||||
-copy tab_progress_reporting from :'filename'
|
||||
+\set command '\\copy tab_progress_reporting from ' :'filename'
|
||||
- where (salary < 2000);
|
||||
+\set command '\\copy tab_progress_reporting from ' :'filename' 'where (salary < 2000)';
|
||||
+:command
|
||||
where (salary < 2000);
|
||||
+
|
||||
|
||||
drop trigger check_after_tab_progress_reporting on tab_progress_reporting;
|
||||
drop function notice_after_tab_progress_reporting();
|
||||
@@ -311,7 +321,8 @@ CREATE TABLE parted_si_p_odd PARTITION OF parted_si FOR VALUES IN (1);
|
||||
-- https://postgr.es/m/18130-7a86a7356a75209d%40postgresql.org
|
||||
-- https://postgr.es/m/257696.1695670946%40sss.pgh.pa.us
|
||||
|
||||
Reference in New Issue
Block a user