Changeset: 6af351f2b2f2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6af351f2b2f2 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message:
Approve upgrade (missed part of merge). diffs (172 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 15:55:37 > diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 21:10:45 > diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -15,6 +15,39 @@ stdout of test 'upgrade` in directory 's # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36250/ # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 15:56:11 > diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out b/sql/test/testdb-upgrade/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:34708/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-11915/.s.monetdb.34708 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 15:56:11 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
