Changeset: 57e15e1dc864 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57e15e1dc864
Modified Files:
clients/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/All
sql/test/emptydb-upgrade-chain/Tests/All
sql/test/emptydb-upgrade-hge/Tests/All
sql/test/emptydb-upgrade/Tests/All
sql/test/emptydb/Tests/All
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
Branch: Jul2015
Log Message:
merged
diffs (147 lines):
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
exports
-HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
-HAVE_NETCDF&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32&!BITS64OID32?SQL-dump
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_NETCDF&HAVE_PCRE&HAVE_SAMTOOLS&!BITS32&!BITS64OID32?SQL-dump
MERCURIAL?malcheck
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/All
b/sql/test/emptydb-upgrade-chain-hge/Tests/All
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/All
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/All
@@ -2,4 +2,4 @@ HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?
HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?upgrade
HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY&RELEASERUN?package
HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?dump
-HAVE_HGE&HAVE_GEOM&PREVHGECHAINRELEMPTY?check
+HAVE_HGE&HAVE_GEOM&HAVE_PCRE&PREVHGECHAINRELEMPTY?check
diff --git a/sql/test/emptydb-upgrade-chain/Tests/All
b/sql/test/emptydb-upgrade-chain/Tests/All
--- a/sql/test/emptydb-upgrade-chain/Tests/All
+++ b/sql/test/emptydb-upgrade-chain/Tests/All
@@ -2,4 +2,4 @@ HAVE_GEOM&PREVCHAINRELEMPTY?unpackage
HAVE_GEOM&PREVCHAINRELEMPTY?upgrade
!HAVE_HGE&HAVE_GEOM&PREVCHAINRELEMPTY&RELEASERUN?package
HAVE_GEOM&PREVCHAINRELEMPTY?dump
-HAVE_GEOM&PREVCHAINRELEMPTY?check
+HAVE_GEOM&HAVE_PCRE&PREVCHAINRELEMPTY?check
diff --git a/sql/test/emptydb-upgrade-hge/Tests/All
b/sql/test/emptydb-upgrade-hge/Tests/All
--- a/sql/test/emptydb-upgrade-hge/Tests/All
+++ b/sql/test/emptydb-upgrade-hge/Tests/All
@@ -1,4 +1,4 @@
HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?unpackage
HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?upgrade
HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?dump
-HAVE_HGE&HAVE_GEOM&PREVHGERELEMPTY?check
+HAVE_HGE&HAVE_GEOM&HAVE_PCRE&PREVHGERELEMPTY?check
diff --git a/sql/test/emptydb-upgrade/Tests/All
b/sql/test/emptydb-upgrade/Tests/All
--- a/sql/test/emptydb-upgrade/Tests/All
+++ b/sql/test/emptydb-upgrade/Tests/All
@@ -1,4 +1,4 @@
HAVE_GEOM&PREVRELEMPTY?unpackage
HAVE_GEOM&PREVRELEMPTY?upgrade
HAVE_GEOM&PREVRELEMPTY?dump
-HAVE_GEOM&PREVRELEMPTY?check
+HAVE_GEOM&HAVE_PCRE&PREVRELEMPTY?check
diff --git a/sql/test/emptydb/Tests/All b/sql/test/emptydb/Tests/All
--- a/sql/test/emptydb/Tests/All
+++ b/sql/test/emptydb/Tests/All
@@ -2,4 +2,4 @@ HAVE_GEOM?load
RELEASERUN&!HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?package
RELEASERUN&HAVE_HGE&!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?package-hge
HAVE_GEOM?dump
-!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?check
+!HAVE_NETCDF&!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&HAVE_PCRE&!HAVE_SAMTOOLS&!BITS32&!BITS64OID32?check
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -110,7 +110,7 @@ Ready.
[ "oid", "int", 55 ]
[ "oid", "int", 236 ]
[ "oid", "int", 236 ]
-[ "oid", "int", 245 ]
+[ "oid", "int", 248 ]
[ "oid", "int", 363 ]
[ "oid", "int", 363 ]
[ "oid", "int", 363 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -110,7 +110,7 @@ Ready.
[ "oid", "int", 56 ]
[ "oid", "int", 236 ]
[ "oid", "int", 236 ]
-[ "oid", "int", 245 ]
+[ "oid", "int", 251 ]
[ "oid", "int", 365 ]
[ "oid", "int", 365 ]
[ "oid", "int", 365 ]
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -110,7 +110,7 @@ Ready.
[ "oid", "int", 56 ]
[ "oid", "int", 236 ]
[ "oid", "int", 236 ]
-[ "oid", "int", 245 ]
+[ "oid", "int", 251 ]
[ "oid", "int", 365 ]
[ "oid", "int", 365 ]
[ "oid", "int", 365 ]
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
@@ -22,12 +22,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/R module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "testschema";
# 15:45:53 >
# 15:45:53 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
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
@@ -19,12 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "testschema";
# 14:30:34 >
# 14:30:34 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -59,18 +59,11 @@ from sys.storagemodel() group by "schema
insert into sys.systemfunctions (select id from sys.functions where name in
('fuse', 'generate_series', 'stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'quantile', 'corr') and schema_id = (select id from sys.schemas where
name = 'sys') and id not in (select function_id from sys.systemfunctions));
insert into sys.systemfunctions (select id from sys.functions where name =
'filter' and schema_id = (select id from sys.schemas where name = 'json') and
id not in (select function_id from sys.systemfunctions));
update sys._tables set system = true where name = 'tablestoragemodel' and
schema_id = (select id from sys.schemas where name = 'sys');
-insert into sys.types values(7608, 'hge', 'hugeint', 128, 1, 2, 6, 0);
-insert into sys.types values(7609, 'hge', 'decimal', 39, 1, 10, 8, 0);
+insert into sys.types values(7616, 'hge', 'hugeint', 128, 1, 2, 6, 0);
+insert into sys.types values(7617, 'hge', 'decimal', 39, 1, 10, 8, 0);
update sys.types set digits = 18 where systemname = 'lng' and sqlname =
'decimal';
set schema "testschema";
-Running database upgrade commands:
-set schema "sys";
-create function sys."epoch"(sec INT) returns TIMESTAMP external name
timestamp."epoch";
-create function sys."epoch"(ts TIMESTAMP) returns INT external name
timestamp."epoch";
-insert into sys.systemfunctions (select id from sys.functions where name =
'epoch' and schema_id = (select id from sys.schemas where name = 'sys') and id
not in (select function_id from sys.systemfunctions));
-set schema "testschema";
-
# 12:48:11 >
# 12:48:11 > "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
