Changeset: 4b329087d853 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b329087d853 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out Branch: default Log Message:
Simplify test and approve diffs (119 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql @@ -1,2 +1,2 @@ -select * from tables where 1; -select * from tables where name; +select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where 1; +select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err @@ -30,8 +30,9 @@ stderr of test 'predicate_select.Bug-309 # 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" # 18:53:13 > -MAPI = (monetdb) /var/tmp/mtest-6269/.s.monetdb.32382 -QUERY = select * from tables where name; +MAPI = (monetdb) /var/tmp/mtest-5096/.s.monetdb.39165 +QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; + # 18:53:13 > diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out @@ -23,49 +23,49 @@ Ready. # 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" # 18:53:13 > -#select * from tables where 1; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, readonly, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type -% 4, 17, 4, 496, 1, 5, 1, 5, 1 # length -[ 2001, "schemas", 2000, NULL, 0, true, 0, false, 0 ] -[ 2006, "types", 2000, NULL, 0, true, 0, false, 0 ] -[ 2015, "functions", 2000, NULL, 0, true, 0, false, 0 ] -[ 2024, "args", 2000, NULL, 0, true, 0, false, 0 ] -[ 2032, "sequences", 2000, NULL, 0, true, 0, false, 0 ] -[ 2042, "dependencies", 2000, NULL, 0, true, 0, false, 0 ] -[ 2046, "connections", 2000, NULL, 0, true, 0, false, 0 ] -[ 2055, "_tables", 2000, NULL, 0, true, 0, false, 0 ] -[ 2064, "_columns", 2000, NULL, 0, true, 0, false, 0 ] -[ 2075, "keys", 2000, NULL, 0, true, 0, false, 0 ] -[ 2082, "idxs", 2000, NULL, 0, true, 0, false, 0 ] -[ 2087, "triggers", 2000, NULL, 0, true, 0, false, 0 ] -[ 2098, "objects", 2000, NULL, 0, true, 0, false, 0 ] -[ 2103, "_tables", 2102, NULL, 0, true, 2, false, 0 ] -[ 2112, "_columns", 2102, NULL, 0, true, 2, false, 0 ] -[ 2123, "keys", 2102, NULL, 0, true, 2, false, 0 ] -[ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] -[ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] -[ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] -[ 5062, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type <> 2;", 1, true, 0, false, 0 ] -[ 5072, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] -[ 5092, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] -[ 5100, "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] -[ 5104, "user_role", 2000, NULL, 0, true, 0, false, 0 ] -[ 5107, "auths", 2000, NULL, 0, true, 0, false, 0 ] -[ 5111, "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ 5288, "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] -[ 5300, "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] -[ 5318, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] -[ 5357, "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] -[ 5595, "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] -[ 5605, "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] -[ 5647, "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] -[ 6168, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] -[ 6180, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 6223, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] -[ 6232, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] -[ 6254, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +#select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where 1; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, readonly, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type +% 17, 4, 496, 1, 5, 1, 5, 1 # length +[ "schemas", 2000, NULL, 0, true, 0, false, 0 ] +[ "types", 2000, NULL, 0, true, 0, false, 0 ] +[ "functions", 2000, NULL, 0, true, 0, false, 0 ] +[ "args", 2000, NULL, 0, true, 0, false, 0 ] +[ "sequences", 2000, NULL, 0, true, 0, false, 0 ] +[ "dependencies", 2000, NULL, 0, true, 0, false, 0 ] +[ "connections", 2000, NULL, 0, true, 0, false, 0 ] +[ "_tables", 2000, NULL, 0, true, 0, false, 0 ] +[ "_columns", 2000, NULL, 0, true, 0, false, 0 ] +[ "keys", 2000, NULL, 0, true, 0, false, 0 ] +[ "idxs", 2000, NULL, 0, true, 0, false, 0 ] +[ "triggers", 2000, NULL, 0, true, 0, false, 0 ] +[ "objects", 2000, NULL, 0, true, 0, false, 0 ] +[ "_tables", 2102, NULL, 0, true, 2, false, 0 ] +[ "_columns", 2102, NULL, 0, true, 2, false, 0 ] +[ "keys", 2102, NULL, 0, true, 2, false, 0 ] +[ "idxs", 2102, NULL, 0, true, 2, false, 0 ] +[ "triggers", 2102, NULL, 0, true, 2, false, 0 ] +[ "objects", 2102, NULL, 0, true, 2, false, 0 ] +[ "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type <> 2;", 1, true, 0, false, 0 ] +[ "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] +[ "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] +[ "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] +[ "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] +[ "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] +[ "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] +[ "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] +[ "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] +[ "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] +[ "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] # 18:53:13 > # 18:53:13 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
