Fix tests again

laurenz · Dec 30, 2022 · d19047d · d19047d
1 parent f81c10d
commit d19047d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/expected/oracle_fdw.out b/expected/oracle_fdw.out
@@ -532,8 +532,6 @@ DELETE FROM qtest WHERE id = 5;
  */
 BEGIN;
 COPY typetest1 FROM STDIN;
-ERROR:  invalid input syntax for type uuid: "\x01020304"
-CONTEXT:  COPY typetest1, line 1, column u: "\x01020304"
 ROLLBACK;
 /*
  * Test foreign table as a partition.
@@ -543,13 +541,19 @@ CREATE TABLE defpart PARTITION OF party DEFAULT;
 ALTER TABLE party ATTACH PARTITION typetest1 FOR VALUES FROM (1) TO (MAXVALUE);
 BEGIN;
 COPY party FROM STDIN;
-ERROR:  invalid input syntax for type uuid: "\x01020304"
-CONTEXT:  COPY party, line 1, column u: "\x01020304"
 INSERT INTO party (id, lc, lr, lb)
    VALUES (12, 'very long character', '\x0001020304', '\xFFFEFDFC');
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
 SELECT id, lr, lb, c FROM typetest1 ORDER BY id;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
+ id  |             lr             |             lb             |          c           
+-----+----------------------------+----------------------------+----------------------
+   1 | \xdeadbeef00               | \xdeadbeef00               | fixed chau
+   3 | \xdeadf00ddeadf00ddeadf00d | \xdeadf00ddeadf00ddeadf00d | a\x1B\x07\r\x7Fb    
+   4 | \xdeadf00d                 | \xdeadf00d                 | short     
+  12 | \x0001020304               | \xfffefdfc                 | 
+ 666 | \xffff                     | \x01020304                 | cöpy      
+ 777 | \x00                       | \x00                       | fdjkl     
+(6 rows)
+
 ROLLBACK;
 BEGIN;
 CREATE TABLE shortpart (

diff --git a/sql/oracle_fdw.sql b/sql/oracle_fdw.sql
@@ -382,8 +382,8 @@ DELETE FROM qtest WHERE id = 5;
 
 BEGIN;
 COPY typetest1 FROM STDIN;
-666	cöpy	variation	dynamo	ünicode	Not very long	DEADF00D	9a0cf1eb-02e2-4b1f-bbe0-449fa4a99969	\\x01020304	\\xFFFF	\N	0.11111	0.43211	0.01010	2100-01-29	2050-04-01 19:30:00	12 hours	0 years
-777	fdjkl	r89809rew	^ß[]#~	\N	Das also ist des Pudels Kern.	00	fe288446-05f6-4074-9e9e-6ee41af7b377	\\x00	\\x00	FALSE	10	1002	1003	2019-05-01	2019-05-01 0:00:00	0 seconds	1 year
+666	cöpy	variation	dynamo	ünicode	Not very long	n'Clobber	DEADF00D	9a0cf1eb-02e2-4b1f-bbe0-449fa4a99969	\\x01020304	\\xFFFF	\N	0.11111	0.43211	0.01010	2100-01-29	2050-04-01 19:30:00	12 hours	0 years
+777	fdjkl	r89809rew	^ß[]#~	\N	Das also ist des Pudels Kern.	Foo	00	fe288446-05f6-4074-9e9e-6ee41af7b377	\\x00	\\x00	FALSE	10	1002	1003	2019-05-01	2019-05-01 0:00:00	0 seconds	1 year
 \.
 ROLLBACK;
 
@@ -396,8 +396,8 @@ CREATE TABLE defpart PARTITION OF party DEFAULT;
 ALTER TABLE party ATTACH PARTITION typetest1 FOR VALUES FROM (1) TO (MAXVALUE);
 BEGIN;
 COPY party FROM STDIN;
-666	cöpy	variation	dynamo	ünicode	Not very long	DEADF00D	9a0cf1eb-02e2-4b1f-bbe0-449fa4a99969	\\x01020304	\\xFFFF	\N	0.11111	0.43211	0.01010	2100-01-29	2050-04-01 19:30:00	12 hours	0 years
-777	fdjkl	r89809rew	^ß[]#~	\N	Das also ist des Pudels Kern.	00	fe288446-05f6-4074-9e9e-6ee41af7b377	\\x00	\\x00	FALSE	10	1002	1003	2019-05-01	2019-05-01 0:00:00	0 seconds	1 year
+666	cöpy	variation	dynamo	ünicode	Not very long	n'Clobber	DEADF00D	9a0cf1eb-02e2-4b1f-bbe0-449fa4a99969	\\x01020304	\\xFFFF	\N	0.11111	0.43211	0.01010	2100-01-29	2050-04-01 19:30:00	12 hours	0 years
+777	fdjkl	r89809rew	^ß[]#~	\N	Das also ist des Pudels Kern.	Foo	00	fe288446-05f6-4074-9e9e-6ee41af7b377	\\x00	\\x00	FALSE	10	1002	1003	2019-05-01	2019-05-01 0:00:00	0 seconds	1 year
 \.
 INSERT INTO party (id, lc, lr, lb)
    VALUES (12, 'very long character', '\x0001020304', '\xFFFEFDFC');