Changeset: 9c0b0c3f223c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c0b0c3f223c
Removed Files:
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
sql/test/mapi/Tests/php_monetdb_nogeom.SQL.bat
sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
sql/test/mapi/Tests/php_monetdb_nogeom.stable.err
sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
Modified Files:
clients/examples/php/sqlsample.php
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker-2012/Tests/All
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
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/mapi/Tests/All
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: Feb2013
Log Message:
remove tables.id column from test output to get rid of some "_nogeom" test
variants
basically replacing "SELECT * FROM tables" by
"SELECT name, schema_id, query, type, system, commit_action, readonly,
temporary FROM tables"
diffs (truncated from 745 to 300 lines):
diff --git a/clients/examples/php/sqlsample.php
b/clients/examples/php/sqlsample.php
--- a/clients/examples/php/sqlsample.php
+++ b/clients/examples/php/sqlsample.php
@@ -8,7 +8,7 @@ require 'monetdb/php_monetdb.php';
for ($i = 0; $line = @monetdb_fetch_assoc($tables); $i++) {
print($line['name']."\n");
}
-$result = monetdb_query('SELECT * FROM tables');
+$result = monetdb_query('SELECT name, schema_id, query, type, system,
commit_action, readonly, temporary FROM tables');
$cols = monetdb_num_fields($result);
for ($i = 0; $i < $cols; $i++) {
print(monetdb_field_name($result, $i)."\t");
diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
@@ -5,5 +5,5 @@ exec ** (1);
drop table rr;
-prepare select * from tables limit 42;
+prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
exec ** ();
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
@@ -38,13 +38,12 @@ Ready.
% 1 # length
[ 1 ]
#drop table rr;
-#prepare select * from tables limit 42;
-#prepare select * from tables limit 42;
+#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
+#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 8, 4, 1, 0, 6, 13 # length
-[ "int", 32, 0, "", "tables", "id" ]
[ "varchar", 1024, 0, "", "tables", "name" ]
[ "int", 32, 0, "", "tables", "schema_id" ]
[ "varchar", 2048, 0, "", "tables", "query" ]
@@ -54,42 +53,42 @@ Ready.
[ "boolean", 1, 0, "", "tables", "readonly" ]
[ "tinyint", 8, 0, "", "tables", "temporary" ]
#exec 2 ();
-% .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 ]
-[ 5075, "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 ]
-[ 5085, "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 ]
-[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5113, "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 ]
-[ 5117, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5120, "auths", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5124, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5291, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
-[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6115, "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 ]
-[ 6137, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+% .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
]
+[ "queryhistory", 2000, NULL, 0, true, 0, false, 0
]
+[ "callhistory", 2000, NULL, 0, true, 0, false, 0
]
+[ "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1,
true, 0, false, 0 ]
+[ "storagemodelinput", 2000, NULL, 0, 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
]
# 11:49:44 >
# 11:49:44 > "Done."
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
@@ -38,13 +38,12 @@ Ready.
% 1 # length
[ 1 ]
#drop table rr;
-#prepare select * from tables limit 42;
-#prepare select * from tables limit 42;
+#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
+#prepare select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables limit 42;
% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 8, 4, 1, 0, 6, 13 # length
-[ "int", 32, 0, "", "tables", "id" ]
[ "varchar", 1024, 0, "", "tables", "name" ]
[ "int", 32, 0, "", "tables", "schema_id" ]
[ "varchar", 2048, 0, "", "tables", "query" ]
@@ -54,42 +53,42 @@ Ready.
[ "boolean", 1, 0, "", "tables", "readonly" ]
[ "tinyint", 8, 0, "", "tables", "temporary" ]
#exec 2 ();
-% .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 ]
-[ 5075, "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 ]
-[ 5085, "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 ]
-[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5113, "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 ]
-[ 5117, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5120, "auths", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5124, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5291, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
-[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6115, "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 ]
-[ 6137, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+% .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
]
+[ "queryhistory", 2000, NULL, 0, true, 0, false, 0
]
+[ "callhistory", 2000, NULL, 0, true, 0, false, 0
]
+[ "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1,
true, 0, false, 0 ]
+[ "storagemodelinput", 2000, NULL, 0, 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
]
# 11:49:44 >
# 11:49:44 > "Done."
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -40,8 +40,7 @@ bug_large-insert-Bug.2960
any_null.Bug-2594
float-mod.Bug-3086
aggregate_vs_positional_column_crash.Bug-3085
-HAVE_GEOM?predicate_select.Bug-3090
-!HAVE_GEOM?predicate_select.Bug-3090_nogeom
+predicate_select.Bug-3090
hash_join_crash.Bug-3089
row-number-nyi.Bug-3087
insert_serial_with_unique_key.Bug-3091
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
@@ -31,7 +31,7 @@ stderr of test 'predicate_select.Bug-309
# 18:53:13 >
MAPI = (monetdb) /var/tmp/mtest-4932/.s.monetdb.34449
-QUERY = select * from tables where name;
+QUERY = select name, schema_id, query, type, system, commit_action, readonly,
temporary from tables where name;
ERROR = !conversion of string 'storagemodelinput' to type bit failed.
# 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
@@ -24,42 +24,42 @@ Ready.
# 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 ]
-[ 5075, "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 ]
-[ 5085, "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 ]
-[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5113, "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 ]
-[ 5117, "user_role", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5120, "auths", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5124, "privileges", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5291, "callhistory", 2000, NULL, 0, true, 0, false,
0 ]
-[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*,
ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples,
ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id =
ql.id;", 1, true, 0, false, 0 ]
-[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0,
false, 0 ]
-[ 6115, "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 ]
-[ 6137, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+% .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 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
