Changeset: b001d361bf69 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b001d361bf69 Modified Files: clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out.int128 sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/Tests/simpleSQL.stable.out Branch: default Log Message:
Approved. diffs (123 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -44521,7 +44521,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52441,7 +52441,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -44447,7 +44447,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52336,7 +52336,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -44447,7 +44447,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52312,7 +52312,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -44441,7 +44441,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52124,7 +52124,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/sql/backends/monet5/Tests/limithack.stable.out b/sql/backends/monet5/Tests/limithack.stable.out --- a/sql/backends/monet5/Tests/limithack.stable.out +++ b/sql/backends/monet5/Tests/limithack.stable.out @@ -67,7 +67,7 @@ Ready. % id, name, schema_id, query, type, system, commit_action, readonly, temporary # name % int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type % 4, 15, 4, 0, 1, 5, 1, 5, 1 # length -[ 7092, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 7201, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] # 17:27:34 > # 17:27:34 > "Done." diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.out b/sql/backends/monet5/Tests/simpleSQL.stable.out --- a/sql/backends/monet5/Tests/simpleSQL.stable.out +++ b/sql/backends/monet5/Tests/simpleSQL.stable.out @@ -48,6 +48,7 @@ end main; % int # type % 3 # length [ 123 ] +!SQLException:sql.exportValue:failed # 23:37:35 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list