Changeset: a40581d0ac73 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a40581d0ac73 Modified Files: sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out Branch: Oct2014 Log Message:
Make test independent of contents of system tables. diffs (truncated from 2085 to 300 lines): diff --git a/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql b/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql --- a/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql +++ b/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql @@ -1,44 +1,24 @@ -SELECT tbl.action FROM sys.keys tbl; -SELECT tbl.action FROM tmp.keys tbl; +create table keywords ( + "action" integer, + "default" integer, + "schema" integer, + "start" integer, + "statement" integer, + "user" integer +); +insert into keywords values (1, 2, 3, 4, 5, 6); -SELECT tbl.default FROM sys._columns tbl; -SELECT tbl.default FROM sys.columns tbl; -SELECT tbl.default FROM tmp._columns tbl; +SELECT tbl.action FROM sys.keywords tbl; +SELECT tbl.default FROM sys.keywords tbl; +SELECT tbl.schema FROM sys.keywords tbl; +SELECT tbl.start FROM sys.keywords tbl; +SELECT tbl.statement FROM sys.keywords tbl; +SELECT tbl.user FROM sys.keywords tbl; -SELECT tbl.schema FROM sys.statistics tbl; -SELECT tbl.schema FROM sys.storage tbl; -SELECT tbl.schema FROM sys.storagemodel tbl; -SELECT tbl.schema FROM sys.storagemodelinput tbl; -SELECT tbl.schema FROM sys.tablestoragemodel tbl; +SELECT action FROM sys.keywords; +SELECT default FROM sys.keywords; +SELECT schema FROM sys.keywords; +SELECT start FROM sys.keywords; +SELECT statement FROM sys.keywords; -SELECT tbl.start FROM sys.querylog_calls tbl; -SELECT tbl.start FROM sys.querylog_history tbl; -SELECT tbl.start FROM sys.sequences tbl; - -SELECT tbl.statement FROM sys.triggers tbl; -SELECT tbl.statement FROM tmp.triggers tbl; - -SELECT tbl.user FROM sys.connections tbl; -SELECT tbl.user FROM sys.queue tbl; -SELECT tbl.user FROM sys.sessions tbl; -SELECT tbl.user FROM sys.tracelog tbl; - -SELECT action FROM sys.keys; -SELECT action FROM tmp.keys; - -SELECT default FROM sys._columns; -SELECT default FROM sys.columns; -SELECT default FROM tmp._columns; - -SELECT schema FROM sys.statistics; -SELECT schema FROM sys.storage; -SELECT schema FROM sys.storagemodel; -SELECT schema FROM sys.storagemodelinput; -SELECT schema FROM sys.tablestoragemodel; - -SELECT start FROM sys.querylog_calls; -SELECT start FROM sys.querylog_history; -SELECT start FROM sys.sequences; - -SELECT statement FROM sys.triggers; -SELECT statement FROM tmp.triggers; +drop table keywords; diff --git a/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out b/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out --- a/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out +++ b/sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out @@ -29,1949 +29,83 @@ Ready. # 18:58:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21543" "--port=39106" # 18:58:09 > -#SELECT tbl.action FROM sys.keys tbl; +#create table keywords ( +# "action" integer, +# "default" integer, +# "schema" integer, +# "start" integer, +# "statement" integer, +# "user" integer +#); +#insert into keywords values (1, 2, 3, 4, 5, 6); +[ 1 ] +#SELECT tbl.action FROM sys.keywords tbl; % sys.tbl # table_name % action # name % int # type -% 3 # length -[ -1 ] -[ -1 ] -[ 514 ] -[ -1 ] -[ 514 ] -[ -1 ] -[ 514 ] -#SELECT tbl.action FROM tmp.keys tbl; -% tmp.tbl # table_name +% 1 # length +[ 1 ] +#SELECT tbl.default FROM sys.keywords tbl; +% sys.tbl # table_name +% default # name +% int # type +% 1 # length +[ 2 ] +#SELECT tbl.schema FROM sys.keywords tbl; +% sys.tbl # table_name +% schema # name +% int # type +% 1 # length +[ 3 ] +#SELECT tbl.start FROM sys.keywords tbl; +% sys.tbl # table_name +% start # name +% int # type +% 1 # length +[ 4 ] +#SELECT tbl.statement FROM sys.keywords tbl; +% sys.tbl # table_name +% statement # name +% int # type +% 1 # length +[ 5 ] +#SELECT tbl.user FROM sys.keywords tbl; +% sys.tbl # table_name +% user # name +% int # type +% 1 # length +[ 6 ] +#SELECT action FROM sys.keywords; +% sys.keywords # table_name % action # name % int # type % 1 # length -#SELECT tbl.default FROM sys._columns tbl; -% sys.tbl # table_name +[ 1 ] +#SELECT default FROM sys.keywords; +% sys.keywords # table_name % default # name -% varchar # type -% 0 # length -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
