Changeset: 1440c15d791c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1440c15d791c Modified Files: sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/drop.sql sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/postgresql2sql99.sh Branch: default Log Message:
Disabled test for create_operator.sql as CREATE OPERATOR (and DROP OPERATOR) are not supported in MonetDB. Excluded DROP OPERATOR comaands in drop.sql diffs (263 lines): diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All --- a/sql/test/pg_regress/Tests/All +++ b/sql/test/pg_regress/Tests/All @@ -56,7 +56,7 @@ insert loadwisconsin #[MK] copied from benchmarks create_table create_misc -create_operator +# create_operator # CREATE OPERATOR (and DROP OPERATOR) syntax not supported by MonetDB # create_index # pg specific index syntax (USING btree() or rtree() or hash() and functional or partial indexes) are not supported in MonetDB. skipping this test create_view select_views diff --git a/sql/test/pg_regress/Tests/drop.sql b/sql/test/pg_regress/Tests/drop.sql --- a/sql/test/pg_regress/Tests/drop.sql +++ b/sql/test/pg_regress/Tests/drop.sql @@ -9,7 +9,7 @@ -- directions and run this as "postgres", though... -- UPDATE pg_user - SET usesuper = 't'::bool + SET usesuper = cast('true' as boolean) WHERE usename = 'postgres'; @@ -43,6 +43,7 @@ DROP FUNCTION oldstyle_length(integer, t -- -- OPERATOR REMOVAL -- +/* MonetDB does not support DROP OPERATOR (or CREATE OPERATOR) commands, so skip these DROP OPERATOR ## (string, string); DROP OPERATOR <% (string, widget); @@ -55,6 +56,7 @@ DROP OPERATOR #@# (integer, none); -- right unary DROP OPERATOR #%# (integer, none); +*/ -- diff --git a/sql/test/pg_regress/Tests/drop.stable.err b/sql/test/pg_regress/Tests/drop.stable.err --- a/sql/test/pg_regress/Tests/drop.stable.err +++ b/sql/test/pg_regress/Tests/drop.stable.err @@ -30,152 +30,135 @@ stderr of test 'drop` in directory 'sql/ # 16:35:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6420" "--port=36808" # 16:35:18 > -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = UPDATE pg_user - SET usesuper = 't'::bool + SET usesuper = cast('true' as boolean) WHERE usename = 'postgres'; -ERROR = !unexpected symbol (:) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +ERROR = !UPDATE: no such table 'pg_user' +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION hobbies(person); ERROR = !type (person) unknown in: "drop function hobbies(person)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION hobby_construct(text,text); ERROR = !DROP FUNCTION: no such function 'hobby_construct' (clob, clob) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION equipment(hobbies_r); ERROR = !type (hobbies_r) unknown in: "drop function equipment(hobbies_r)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION user_relns(); ERROR = !DROP FUNCTION: no such function 'user_relns' () -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION widget_in(cstring); ERROR = !type (cstring) unknown in: "drop function widget_in(cstring)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION widget_out(widget); ERROR = !type (widget) unknown in: "drop function widget_out(widget)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION pt_in_widget(string,widget); ERROR = !type (widget) unknown in: "drop function pt_in_widget(string,widget)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION overpaid(emp); ERROR = !type (emp) unknown in: "drop function overpaid(emp)" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION boxarea(string); ERROR = !DROP FUNCTION: no such function 'boxarea' (clob) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION interpt_pp(string,string); ERROR = !DROP FUNCTION: no such function 'interpt_pp' (clob, clob) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION reverse_name(name); ERROR = !syntax error, unexpected sqlNAME in: "drop function reverse_name(name" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP FUNCTION oldstyle_length(integer, text); ERROR = !DROP FUNCTION: no such function 'oldstyle_length' (int(32), clob) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 -QUERY = DROP OPERATOR ## (string, string); - - DROP OPERATOR <% (string, widget); -ERROR = !syntax error, unexpected IDENT in: "drop operator" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 -QUERY = DROP OPERATOR @#@ (none, integer); - - -- right unary - DROP OPERATOR #@# (integer, none); - - -- right unary - DROP OPERATOR #%# (integer, none); - - - -- - -- ABSTRACT DATA TYPE REMOVAL - -- - DROP TYPE decimal(7,2); -ERROR = !syntax error, unexpected IDENT in: "drop operator" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 +QUERY = DROP TYPE decimal(7,2); +ERROR = !syntax error, unexpected TYPE in: "drop type" +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP TYPE widget; ERROR = !syntax error, unexpected TYPE in: "drop type" -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP AGGREGATE newavg (integer); ERROR = !DROP AGGREGATE: no such aggregate 'newavg' (int(32)) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP AGGREGATE newsum (integer); ERROR = !DROP AGGREGATE: no such aggregate 'newsum' (int(32)) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP AGGREGATE newcnt (integer); ERROR = !DROP AGGREGATE: no such aggregate 'newcnt' (int(32)) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX onek_unique1; ERROR = !DROP INDEX: no such index 'onek_unique1' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX onek_unique2; ERROR = !DROP INDEX: no such index 'onek_unique2' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX onek_hundred; ERROR = !DROP INDEX: no such index 'onek_hundred' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX onek_stringu1; ERROR = !DROP INDEX: no such index 'onek_stringu1' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk1_unique1; ERROR = !DROP INDEX: no such index 'tenk1_unique1' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk1_unique2; ERROR = !DROP INDEX: no such index 'tenk1_unique2' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk1_hundred; ERROR = !DROP INDEX: no such index 'tenk1_hundred' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk2_unique1; ERROR = !DROP INDEX: no such index 'tenk2_unique1' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk2_unique2; ERROR = !DROP INDEX: no such index 'tenk2_unique2' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX tenk2_hundred; ERROR = !DROP INDEX: no such index 'tenk2_hundred' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX rect2ind; ERROR = !DROP INDEX: no such index 'rect2ind' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX rix; ERROR = !DROP INDEX: no such index 'rix' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX iix; ERROR = !DROP INDEX: no such index 'iix' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX six; ERROR = !DROP INDEX: no such index 'six' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX hash_i4_index; ERROR = !DROP INDEX: no such index 'hash_i4_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX hash_name_index; ERROR = !DROP INDEX: no such index 'hash_name_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX hash_txt_index; ERROR = !DROP INDEX: no such index 'hash_txt_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX hash_f8_index; ERROR = !DROP INDEX: no such index 'hash_f8_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX bt_i4_index; ERROR = !DROP INDEX: no such index 'bt_i4_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX bt_name_index; ERROR = !DROP INDEX: no such index 'bt_name_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX bt_txt_index; ERROR = !DROP INDEX: no such index 'bt_txt_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP INDEX bt_f8_index; ERROR = !DROP INDEX: no such index 'bt_f8_index' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP TABLE tenk1; ERROR = !DROP TABLE: unable to drop table tenk1 (there are database objects which depend on it) -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP TABLE xacttest; ERROR = !DROP TABLE: no such table 'xacttest' -MAPI = (monetdb) /var/tmp/mtest-11947/.s.monetdb.35880 +MAPI = (monetdb) /var/tmp/mtest-15511/.s.monetdb.37623 QUERY = DROP TABLE arrtest; ERROR = !DROP TABLE: no such table 'arrtest' diff --git a/sql/test/pg_regress/postgresql2sql99.sh b/sql/test/pg_regress/postgresql2sql99.sh --- a/sql/test/pg_regress/postgresql2sql99.sh +++ b/sql/test/pg_regress/postgresql2sql99.sh @@ -34,6 +34,8 @@ sed -r \ -e 's/\bIS FALSE/= FALSE/Ig' \ -e 's/\bIS NOT TRUE/= NOT TRUE/Ig' \ -e 's/\bIS NOT FALSE/= NOT FALSE/Ig' \ + -e 's/\b'f'::bool\b/cast('false' as boolean)/Ig' \ + -e 's/\b't'::bool\b/cast('true' as boolean)/Ig' \ -e 's/\bbool 'f'\b/cast('false' as boolean)/Ig' \ -e 's/\bbool 't'\b/cast('true' as boolean)/Ig' \ -e 's/\bbool ''*''\b/cast('\1' as boolean)/Ig' \ @@ -124,6 +126,7 @@ sed -r \ -e 's/RESET geqo;/\/* RESET geqo; *\//Ig' \ -e 's/ WITH OIDS;/\/* WITH OIDS; *\//Ig' \ -e 's/ WITHOUT OIDS;/\/* WITHOUT OIDS; *\//Ig' \ + -e 's/\s+([^\s]+)::bool\b/ cast(\1 as boolean)/Ig' \ -e 's/\s+([^\s]+)::cidr\b/ cast(\1 as inet)/Ig' \ -e 's/\s+([^\s]+)::float[248]\b/ cast(\1 as double)/Ig' \ -e 's/\s+([^\s]+)::int2\b/ cast(\1 as smallint)/Ig' \ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list