Changeset: a9cd088f96b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9cd088f96b5
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/emptydb/Tests/load.stable.out
Branch: Dec2016
Log Message:
Approvals.
diffs (truncated from 1056 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -57,7 +57,7 @@ Ready.
# 14:39:22 >
#select * from sys.malfunctions() order by module, "function", address,
signature, comment;
-% ., ., ., ., . # table_name
+% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
% 11, 28, 346, 44, 874 # length
@@ -7443,9 +7443,9 @@ Ready.
[ "clients", "setListing", "pattern clients.setListing(flag:int):int ",
"CLTsetListing;", "Turn on/off echo of MAL instructions:\n\t1 - echo
input,\n\t2 - show mal instruction,\n\t4 - show details of type resolutoin,
\n\t8 - show binding information." ]
[ "clients", "setPassword", "pattern
clients.setPassword(user:str,pass:str):void ", "CLTsetPassword;", "Set the
password for the given user" ]
[ "clients", "setScenario", "pattern clients.setScenario(msg:str):str ",
"CLTsetScenario;", "Switch to other scenario handler, return previous
one." ]
-[ "clients", "setTimeout", "pattern clients.setTimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "setsession", "pattern clients.setsession(n:lng):void ",
"CLTsetSessionTimeout;", "Abort a session after n seconds." ]
[ "clients", "settimeout", "pattern clients.settimeout(n:lng):void ",
"CLTsetTimeout;", "Abort a query after n seconds." ]
+[ "clients", "settimeout", "pattern clients.settimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "sha1sum", "command clients.sha1sum(pw:str):str ",
"CLTsha1sum;", "Return hex string representation of the SHA-1 hash of the
given string" ]
[ "clients", "sha2sum", "command clients.sha2sum(pw:str,bits:int):str
", "CLTsha2sum;", "Return hex string representation of the SHA-2 hash
with bits of the given string" ]
[ "clients", "shutdown", "pattern clients.shutdown(delay:int):str ",
"CLTshutdown;", "" ]
@@ -8466,8 +8466,6 @@ Ready.
[ "sql", "row_number", "pattern
sql.row_number(b:any_1,p:bit,o:bit):int ", "SQLrow_number;", "return
the row_numer-ed groups" ]
[ "sql", "sessions", "pattern sql.sessions()
(user:bat[:str],start:bat[:timestamp],stimeout:bat[:lng],lastcmd:bat[:timestamp],qtimeout:bat[:lng],idle:bat[:bit])
", "sql_sessions_wrap;", "SQL export table of active sessions, their
timeouts and idle status" ]
[ "sql", "setVariable", "pattern
sql.setVariable(mvc:int,varname:str,value:any_1):int ", "setVariable;",
"Set the value of a session variable" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng):void ",
"CLTsetTimeout;", "Abort query after s seconds" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng,t:lng):void ",
"CLTsetTimeout;", "Abort query after s and session after t seconds"
]
[ "sql", "shrink", "pattern sql.shrink(sch:str,tbl:str):void ",
"SQLshrink;", "Consolidate the deletion table over all columns using
shrinking" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte,force:bit):str
", "SQLshutdown_wrap;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -61,7 +61,7 @@ Ready.
# 12:57:39 >
#select * from sys.malfunctions() order by module, "function", address,
signature, comment;
-% ., ., ., ., . # table_name
+% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
% 11, 28, 346, 44, 874 # length
@@ -9794,9 +9794,9 @@ Ready.
[ "clients", "setListing", "pattern clients.setListing(flag:int):int ",
"CLTsetListing;", "Turn on/off echo of MAL instructions:\n\t1 - echo
input,\n\t2 - show mal instruction,\n\t4 - show details of type resolutoin,
\n\t8 - show binding information." ]
[ "clients", "setPassword", "pattern
clients.setPassword(user:str,pass:str):void ", "CLTsetPassword;", "Set the
password for the given user" ]
[ "clients", "setScenario", "pattern clients.setScenario(msg:str):str ",
"CLTsetScenario;", "Switch to other scenario handler, return previous
one." ]
-[ "clients", "setTimeout", "pattern clients.setTimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "setsession", "pattern clients.setsession(n:lng):void ",
"CLTsetSessionTimeout;", "Abort a session after n seconds." ]
[ "clients", "settimeout", "pattern clients.settimeout(n:lng):void ",
"CLTsetTimeout;", "Abort a query after n seconds." ]
+[ "clients", "settimeout", "pattern clients.settimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "sha1sum", "command clients.sha1sum(pw:str):str ",
"CLTsha1sum;", "Return hex string representation of the SHA-1 hash of the
given string" ]
[ "clients", "sha2sum", "command clients.sha2sum(pw:str,bits:int):str
", "CLTsha2sum;", "Return hex string representation of the SHA-2 hash
with bits of the given string" ]
[ "clients", "shutdown", "pattern clients.shutdown(delay:int):str ",
"CLTshutdown;", "" ]
@@ -10835,8 +10835,6 @@ Ready.
[ "sql", "row_number", "pattern
sql.row_number(b:any_1,p:bit,o:bit):int ", "SQLrow_number;", "return
the row_numer-ed groups" ]
[ "sql", "sessions", "pattern sql.sessions()
(user:bat[:str],start:bat[:timestamp],stimeout:bat[:lng],lastcmd:bat[:timestamp],qtimeout:bat[:lng],idle:bat[:bit])
", "sql_sessions_wrap;", "SQL export table of active sessions, their
timeouts and idle status" ]
[ "sql", "setVariable", "pattern
sql.setVariable(mvc:int,varname:str,value:any_1):int ", "setVariable;",
"Set the value of a session variable" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng):void ",
"CLTsetTimeout;", "Abort query after s seconds" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng,t:lng):void ",
"CLTsetTimeout;", "Abort query after s and session after t seconds"
]
[ "sql", "shrink", "pattern sql.shrink(sch:str,tbl:str):void ",
"SQLshrink;", "Consolidate the deletion table over all columns using
shrinking" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte,force:bit):str
", "SQLshutdown_wrap;", "" ]
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1012,9 +1012,9 @@ create function "right_shift"(i1 inet, i
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet external name
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
create procedure shpload(fid integer) external name shp.load;
create procedure shpload(fid integer, filter geometry) external name
shp.import;
@@ -1288,7 +1288,7 @@ drop function pcre_replace(string, strin
[ "sys", 2, 3, true ]
[ "tmp", 2, 3, true ]
#select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s, .t, .L1, .t, .t, .t, .t # table_name
+% .s, .t, .L4, .t, .t, .t, .t # table_name
% name, name, query, type, system, commit_action, access # name
% varchar, varchar, varchar, smallint, boolean,
smallint, smallint # type
% 3, 17, 597, 1, 5, 1, 1 # length
@@ -1737,7 +1737,7 @@ drop function pcre_replace(string, strin
[ "users", "fullname", "varchar", 2024, 0, NULL, true,
1, NULL ]
[ "users", "default_schema", "int", 9, 0, NULL, true,
2, NULL ]
#select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name,
query;
-% .s, .f, .L1, .f, .f, .f, .f, .f, .f # table_name
+% .s, .f, .L4, .f, .f, .f, .f, .f, .f # table_name
% name, name, query, mod, language, type, side_effect,
varres, vararg # name
% varchar, varchar, varchar, varchar, int, int,
boolean, boolean, boolean # type
% 8, 35, 831, 9, 1, 1, 5, 5, 5 # length
@@ -2803,9 +2803,9 @@ drop function pcre_replace(string, strin
[ "sys", "second", "sql_seconds", "mtime", 0, 1,
false, false, false ]
[ "sys", "sessions", "create function sys.sessions() returns
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint,
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external
name sql.sessions;", "sql", 1, 5, false, false, false ]
[ "sys", "setmasklen", "create function \"setmasklen\" (p inet, mask
int) returns inet external name inet.\"setmasklen\";", "inet", 1, 1,
false, false, false ]
-[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name clients.setsession;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
1, 2, true, false, false ]
[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
@@ -4837,8 +4837,8 @@ drop function pcre_replace(string, strin
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L1, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L1, password,
language # name
+% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
+% server, port, db, db_alias, L6, password,
language # name
% char, int, char, char, varchar, char, char # type
% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
@@ -5645,14 +5645,14 @@ drop function pcre_replace(string, strin
% varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean
# type
% 0, 0, 1, 1, 1, 1, 1, 5 # length
#select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
#select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1014,9 +1014,9 @@ create function "right_shift"(i1 inet, i
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet external name
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
create procedure shpload(fid integer) external name shp.load;
create procedure shpload(fid integer, filter geometry) external name
shp.import;
@@ -1294,7 +1294,7 @@ drop function pcre_replace(string, strin
[ "sys", 2, 3, true ]
[ "tmp", 2, 3, true ]
#select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s, .t, .L1, .t, .t, .t, .t # table_name
+% .s, .t, .L4, .t, .t, .t, .t # table_name
% name, name, query, type, system, commit_action, access # name
% varchar, varchar, varchar, smallint, boolean,
smallint, smallint # type
% 3, 17, 597, 1, 5, 1, 1 # length
@@ -1743,7 +1743,7 @@ drop function pcre_replace(string, strin
[ "users", "fullname", "varchar", 2024, 0, NULL, true,
1, NULL ]
[ "users", "default_schema", "int", 9, 0, NULL, true,
2, NULL ]
#select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name,
query;
-% .s, .f, .L1, .f, .f, .f, .f, .f, .f # table_name
+% .s, .f, .L4, .f, .f, .f, .f, .f, .f # table_name
% name, name, query, mod, language, type, side_effect,
varres, vararg # name
% varchar, varchar, varchar, varchar, int, int,
boolean, boolean, boolean # type
% 8, 35, 831, 9, 1, 1, 5, 5, 5 # length
@@ -2932,9 +2932,9 @@ drop function pcre_replace(string, strin
[ "sys", "second", "sql_seconds", "mtime", 0, 1,
false, false, false ]
[ "sys", "sessions", "create function sys.sessions() returns
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint,
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external
name sql.sessions;", "sql", 1, 5, false, false, false ]
[ "sys", "setmasklen", "create function \"setmasklen\" (p inet, mask
int) returns inet external name inet.\"setmasklen\";", "inet", 1, 1,
false, false, false ]
-[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name clients.setsession;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
1, 2, true, false, false ]
[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
@@ -5205,8 +5205,8 @@ drop function pcre_replace(string, strin
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L1, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L1, password,
language # name
+% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
+% server, port, db, db_alias, L6, password,
language # name
% char, int, char, char, varchar, char, char # type
% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
@@ -6022,14 +6022,14 @@ drop function pcre_replace(string, strin
% varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean
# type
% 0, 0, 1, 1, 1, 1, 1, 5 # length
#select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
#select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -987,9 +987,9 @@ create function "right_shift"(i1 inet, i
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet external name
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
create procedure shpload(fid integer) external name shp.load;
create procedure shpload(fid integer, filter geometry) external name
shp.import;
@@ -1267,7 +1267,7 @@ drop function pcre_replace(string, strin
[ "sys", 2, 3, true ]
[ "tmp", 2, 3, true ]
#select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s, .t, .L1, .t, .t, .t, .t # table_name
+% .s, .t, .L4, .t, .t, .t, .t # table_name
% name, name, query, type, system, commit_action, access # name
% varchar, varchar, varchar, smallint, boolean,
smallint, smallint # type
% 3, 17, 597, 1, 5, 1, 1 # length
@@ -1716,7 +1716,7 @@ drop function pcre_replace(string, strin
[ "users", "fullname", "varchar", 2024, 0, NULL, true,
1, NULL ]
[ "users", "default_schema", "int", 9, 0, NULL, true,
2, NULL ]
#select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name,
query;
-% .s, .f, .L1, .f, .f, .f, .f, .f, .f # table_name
+% .s, .f, .L4, .f, .f, .f, .f, .f, .f # table_name
% name, name, query, mod, language, type, side_effect,
varres, vararg # name
% varchar, varchar, varchar, varchar, int, int,
boolean, boolean, boolean # type
% 8, 35, 831, 9, 1, 1, 5, 5, 5 # length
@@ -2905,9 +2905,9 @@ drop function pcre_replace(string, strin
[ "sys", "second", "sql_seconds", "mtime", 0, 1,
false, false, false ]
[ "sys", "sessions", "create function sys.sessions() returns
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint,
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external
name sql.sessions;", "sql", 1, 5, false, false, false ]
[ "sys", "setmasklen", "create function \"setmasklen\" (p inet, mask
int) returns inet external name inet.\"setmasklen\";", "inet", 1, 1,
false, false, false ]
-[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name clients.setsession;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
1, 2, true, false, false ]
[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
@@ -5177,9 +5177,9 @@ drop function pcre_replace(string, strin
[ "public", 0 ]
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
-#select server, port, db, db_alias, user, password, language from connections
order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L1, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L1, password,
language # name
+#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
+% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
+% server, port, db, db_alias, L6, password,
language # name
% char, int, char, char, varchar, char, char # type
% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from db_user_info u left outer join schemas
s on u.default_schema = s.id order by u.name;
@@ -5995,14 +5995,14 @@ drop function pcre_replace(string, strin
% varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean
# type
% 0, 0, 1, 1, 1, 1, 1, 5 # length
#select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
#select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
