Revert "Handle multi-command SQL strings correctly even when there are 'null' sql"

This reverts commit df13f58003d119162d9a1450ced06048e5992b67. This commit uses
the facilities created by 455ff923454e78d80b77639a381db9b05c776577, which
itself has been now reverted.

diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source
index 9be4a6161883c7d7ff077e81df6436dd6a8dee93..c46223bedfaefb2dd977f3f6fbd46456b269d34f 100644 (file)
--- a/src/test/regress/input/misc.source
+++ b/src/test/regress/input/misc.source
@@ -276,14 +276,3 @@ drop table oldstyle_test;
 --
 -- rewrite rules
 --
-
---
--- multi-statement cases
---
-create table testtab_multi (a int, b int); create index testtab_multi_indx on testtab_multi(a); drop table testtab_multi;
-;create table testtab_multi (a int, b int); create index testtab_multi_indx on testtab_multi(a); drop table testtab_multi;
-;;select 1;;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;; drop table testtab_multi;
-create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi order by a;drop table testtab_multi;
-;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi_nonexist order by a;drop table testtab_multi;
-;;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi_nonexist order by a;drop table testtab_multi;
-

diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source
index 7366fd88b32acd370f6578671f991befea2b8af2..da98fa561d499adb5287accf4bf49b6b7ec2be93 100644 (file)
--- a/src/test/regress/output/misc.source
+++ b/src/test/regress/output/misc.source
@@ -564,29 +564,3 @@ drop table oldstyle_test;
 --
 -- rewrite rules
 --
---
--- multi-statement cases
---
-create table testtab_multi (a int, b int); create index testtab_multi_indx on testtab_multi(a); drop table testtab_multi;
-;create table testtab_multi (a int, b int); create index testtab_multi_indx on testtab_multi(a); drop table testtab_multi;
-;;select 1;;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;; drop table testtab_multi;
- ?column? 
-----------
-        1
-(1 row)
-
-create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi order by a;drop table testtab_multi;
- a | b 
----+---
- 1 | 2
- 3 | 4
-(2 rows)
-
-;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi_nonexist order by a;drop table testtab_multi;
-ERROR:  relation "testtab_multi_nonexist" does not exist
-LINE 1: select * from testtab_multi_nonexist order by a;
-                      ^
-;;create table testtab_multi (a int, b int);;;;; create index testtab_multi_indx on testtab_multi(a);;insert into testtab_multi values (1, 2), (3,4); select * from testtab_multi_nonexist order by a;drop table testtab_multi;
-ERROR:  relation "testtab_multi_nonexist" does not exist
-LINE 1: select * from testtab_multi_nonexist order by a;
-                      ^