improve compatibility with pg_dump

funbringer · funbringer · commit cc7cc9571986 · 2017-10-21T20:41:57.000+03:00
diff --git a/expected/pathman_utility_stmt.out b/expected/pathman_utility_stmt.out
@@ -24,70 +24,6 @@ VACUUM FULL copy_stmt_hooking.test_1;
 VACUUM FULL copy_stmt_hooking.test_2;
 VACUUM FULL copy_stmt_hooking.test_3;
 VACUUM FULL copy_stmt_hooking.test_4;
-/* COPY TO */
-COPY copy_stmt_hooking.test TO stdout;
-1	comment	\N	\N
-2	comment	\N	\N
-3	comment	\N	\N
-4	comment	\N	\N
-5	comment	\N	\N
-6	comment	\N	\N
-7	comment	\N	\N
-8	comment	\N	\N
-9	comment	\N	\N
-10	comment	\N	\N
-11	comment	\N	\N
-12	comment	\N	\N
-13	comment	\N	\N
-14	comment	\N	\N
-15	comment	\N	\N
-16	comment	\N	\N
-17	comment	\N	\N
-18	comment	\N	\N
-19	comment	\N	\N
-20	comment	\N	\N
-\copy copy_stmt_hooking.test to stdout (format csv)
-1,comment,,
-2,comment,,
-3,comment,,
-4,comment,,
-5,comment,,
-6,comment,,
-7,comment,,
-8,comment,,
-9,comment,,
-10,comment,,
-11,comment,,
-12,comment,,
-13,comment,,
-14,comment,,
-15,comment,,
-16,comment,,
-17,comment,,
-18,comment,,
-19,comment,,
-20,comment,,
-\copy copy_stmt_hooking.test(comment) to stdout
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
-comment
 /* DELETE ROWS, COPY FROM */
 DELETE FROM copy_stmt_hooking.test;
 COPY copy_stmt_hooking.test FROM stdin;
@@ -113,32 +49,30 @@ VACUUM FULL copy_stmt_hooking.test_1;
 VACUUM FULL copy_stmt_hooking.test_2;
 VACUUM FULL copy_stmt_hooking.test_3;
 VACUUM FULL copy_stmt_hooking.test_4;
-/* COPY FROM (specified columns) */
-COPY copy_stmt_hooking.test (val) TO stdout;
-1
-6
-7
-11
-16
-COPY copy_stmt_hooking.test (val, comment) TO stdout;
-1	test_1
-6	test_2
-7	test_2
-11	test_3
-16	test_4
-COPY copy_stmt_hooking.test (c3, val, comment) TO stdout;
-0	1	test_1
-0	6	test_2
-0	7	test_2
-0	11	test_3
-0	16	test_4
-COPY copy_stmt_hooking.test (val, comment, c3, c4) TO stdout;
+/* COPY TO */
+COPY copy_stmt_hooking.test TO stdout;			/* not ok */
+WARNING:  COPY TO will only select rows from parent table "test"
+COPY copy_stmt_hooking.test (val) TO stdout;	/* not ok */
+WARNING:  COPY TO will only select rows from parent table "test"
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout;
+1	test_1	0	0
+6	test_2	0	0
+7	test_2	0	0
+11	test_3	0	0
+16	test_4	0	0
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout (FORMAT CSV);
+1,test_1,0,0
+6,test_2,0,0
+7,test_2,0,0
+11,test_3,0,0
+16,test_4,0,0
+\copy (SELECT * FROM copy_stmt_hooking.test) TO stdout
 1	test_1	0	0
 6	test_2	0	0
 7	test_2	0	0
 11	test_3	0	0
 16	test_4	0	0
-/* COPY TO (partition does not exist, NOT allowed to create partitions) */
+/* COPY FROM (partition does not exist, NOT allowed to create partitions) */
 SET pg_pathman.enable_auto_partition = OFF;
 COPY copy_stmt_hooking.test FROM stdin;
 ERROR:  no suitable partition for key '21'
@@ -147,7 +81,7 @@ SELECT * FROM copy_stmt_hooking.test WHERE val > 20;
 -----+---------+----+----
 (0 rows)
 
-/* COPY TO (partition does not exist, allowed to create partitions) */
+/* COPY FROM (partition does not exist, allowed to create partitions) */
 SET pg_pathman.enable_auto_partition = ON;
 COPY copy_stmt_hooking.test FROM stdin;
 SELECT * FROM copy_stmt_hooking.test WHERE val > 20;
@@ -194,18 +128,18 @@ WHERE attnum > 0 AND attrelid = 'copy_stmt_hooking.test_6'::REGCLASS;
      3
 (1 row)
 
-/* COPY FROM (test transformed tuples) */
-COPY copy_stmt_hooking.test (val, c3, c4) TO stdout;
+/* test transformed tuples */
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout;
 1	0	0
 6	0	0
 7	0	0
 11	0	0
 16	0	0
 21	0	0
 26	1	2
-/* COPY TO (insert into table with dropped column) */
+/* COPY FROM (insert into table with dropped column) */
 COPY copy_stmt_hooking.test(val, c3, c4) FROM stdin;
-/* COPY TO (insert into table without dropped column) */
+/* COPY FROM (insert into table without dropped column) */
 COPY copy_stmt_hooking.test(val, c3, c4) FROM stdin;
 /* check tuples from last partition (without dropped column) */
 SELECT *, tableoid::REGCLASS FROM copy_stmt_hooking.test ORDER BY val;
diff --git a/sql/pathman_utility_stmt.sql b/sql/pathman_utility_stmt.sql
@@ -28,11 +28,6 @@ VACUUM FULL copy_stmt_hooking.test_2;
 VACUUM FULL copy_stmt_hooking.test_3;
 VACUUM FULL copy_stmt_hooking.test_4;
 
-/* COPY TO */
-COPY copy_stmt_hooking.test TO stdout;
-\copy copy_stmt_hooking.test to stdout (format csv)
-\copy copy_stmt_hooking.test(comment) to stdout
-
 /* DELETE ROWS, COPY FROM */
 DELETE FROM copy_stmt_hooking.test;
 COPY copy_stmt_hooking.test FROM stdin;
@@ -52,20 +47,21 @@ VACUUM FULL copy_stmt_hooking.test_2;
 VACUUM FULL copy_stmt_hooking.test_3;
 VACUUM FULL copy_stmt_hooking.test_4;
 
-/* COPY FROM (specified columns) */
-COPY copy_stmt_hooking.test (val) TO stdout;
-COPY copy_stmt_hooking.test (val, comment) TO stdout;
-COPY copy_stmt_hooking.test (c3, val, comment) TO stdout;
-COPY copy_stmt_hooking.test (val, comment, c3, c4) TO stdout;
+/* COPY TO */
+COPY copy_stmt_hooking.test TO stdout;			/* not ok */
+COPY copy_stmt_hooking.test (val) TO stdout;	/* not ok */
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout;
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout (FORMAT CSV);
+\copy (SELECT * FROM copy_stmt_hooking.test) TO stdout
 
-/* COPY TO (partition does not exist, NOT allowed to create partitions) */
+/* COPY FROM (partition does not exist, NOT allowed to create partitions) */
 SET pg_pathman.enable_auto_partition = OFF;
 COPY copy_stmt_hooking.test FROM stdin;
 21	test_no_part	0	0
 \.
 SELECT * FROM copy_stmt_hooking.test WHERE val > 20;
 
-/* COPY TO (partition does not exist, allowed to create partitions) */
+/* COPY FROM (partition does not exist, allowed to create partitions) */
 SET pg_pathman.enable_auto_partition = ON;
 COPY copy_stmt_hooking.test FROM stdin;
 21	test_no_part	0	0
@@ -98,16 +94,16 @@ WHERE attnum > 0 AND attrelid = 'copy_stmt_hooking.test'::REGCLASS;
 SELECT count(*) FROM pg_attribute
 WHERE attnum > 0 AND attrelid = 'copy_stmt_hooking.test_6'::REGCLASS;
 
+/* test transformed tuples */
+COPY (SELECT * FROM copy_stmt_hooking.test) TO stdout;
 
-/* COPY FROM (test transformed tuples) */
-COPY copy_stmt_hooking.test (val, c3, c4) TO stdout;
 
-/* COPY TO (insert into table with dropped column) */
+/* COPY FROM (insert into table with dropped column) */
 COPY copy_stmt_hooking.test(val, c3, c4) FROM stdin;
 2	1	2
 \.
 
-/* COPY TO (insert into table without dropped column) */
+/* COPY FROM (insert into table without dropped column) */
 COPY copy_stmt_hooking.test(val, c3, c4) FROM stdin;
 27	1	2
 \.
diff --git a/src/hooks.c b/src/hooks.c
@@ -886,7 +886,7 @@ pathman_process_utility_hook(Node *first_arg,
 						  stmt_location, stmt_len, &processed);
 			if (completionTag)
 				snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
-						 "PATHMAN COPY " UINT64_FORMAT, processed);
+						 "COPY " UINT64_FORMAT, processed);
 
 			return; /* don't call standard_ProcessUtility() or hooks */
 		}
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ pathman_process_utility_hook(Node *first_arg,`
`886`	`886`	`stmt_location, stmt_len, &processed);`
`887`	`887`	`if (completionTag)`
`888`	`888`	`snprintf(completionTag, COMPLETION_TAG_BUFSIZE,`
`889`		`- "PATHMAN COPY " UINT64_FORMAT, processed);`
	`889`	`+ "COPY " UINT64_FORMAT, processed);`
`890`	`890`
`891`	`891`	`return; /* don't call standard_ProcessUtility() or hooks */`
`892`	`892`	`}`