Changeset: 9dd60c11d6c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9dd60c11d6c8
Modified Files:
monetdb5/extras/jaql/jaqlgencode.c
sql/jdbc/tests/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (92 lines):
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -3201,15 +3201,16 @@ dumpvariabletransformation(jc *j, Client
assert(0);
}
q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any));
- q = pushArgument(mb, q, s);
- q = pushArgument(mb, q, v);
+ p = copyInstruction(q); /* reuse for dbl case below */
+
if (v != -1) {
+ q = pushArgument(mb, q, s);
+ q = pushArgument(mb, q, v);
h = getArg(q, 0);
pushInstruction(mb, q);
} else {
h = -1;
}
- p = copyInstruction(q); /* reuse for dbl case below */
if (h != -1) {
q = newInstruction(mb, ASSIGNsymbol);
@@ -3469,8 +3470,8 @@ dumpvariabletransformation(jc *j, Client
}
q = p;
- getArg(q, 1) = s;
- getArg(q, 2) = v;
+ q = pushArgument(mb, q, s);
+ q = pushArgument(mb, q, v);
s = getArg(q, 0) = newTmpVariable(mb, TYPE_any);
pushInstruction(mb, q);
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -4,7 +4,7 @@ HAVE_JDBCTESTS?Test_Cmanycon
HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
HAVE_JDBCTESTS?Test_Ctransaction
-HAVE_JDBCTESTS?Test_Csendthread
+#HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output
HAVE_JDBCTESTS?Test_Dobjects
HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PSsomeamount
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
@@ -22,6 +22,19 @@ Ready.
Running database upgrade commands:
drop function sys.zorder_slice;
+Running database upgrade commands:
+create aggregate sys.stddev(val TINYINT) returns TINYINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val SMALLINT) returns SMALLINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val INTEGER) returns INTEGER external name
"aggr"."stddev";
+create aggregate sys.stddev(val BIGINT) returns BIGINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val REAL) returns REAL external name
"aggr"."stddev";
+create aggregate sys.stddev(val DOUBLE) returns DOUBLE external name
"aggr"."stddev";
+create aggregate sys.stddev(val DATE) returns DATE external name
"aggr"."stddev";
+create aggregate sys.stddev(val TIME) returns TIME external name
"aggr"."stddev";
+create aggregate sys.stddev(val TIMESTAMP) returns TIMESTAMP external name
"aggr"."stddev";
+insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name = 'stddev' and f.type = 3 and f.schema_id = s.id and s.name =
'sys');
+
+
# 15:17:06 >
# 15:17:06 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
# 15:17:06 >
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
@@ -22,6 +22,19 @@ Ready.
Running database upgrade commands:
drop function sys.zorder_slice;
+Running database upgrade commands:
+create aggregate sys.stddev(val TINYINT) returns TINYINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val SMALLINT) returns SMALLINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val INTEGER) returns INTEGER external name
"aggr"."stddev";
+create aggregate sys.stddev(val BIGINT) returns BIGINT external name
"aggr"."stddev";
+create aggregate sys.stddev(val REAL) returns REAL external name
"aggr"."stddev";
+create aggregate sys.stddev(val DOUBLE) returns DOUBLE external name
"aggr"."stddev";
+create aggregate sys.stddev(val DATE) returns DATE external name
"aggr"."stddev";
+create aggregate sys.stddev(val TIME) returns TIME external name
"aggr"."stddev";
+create aggregate sys.stddev(val TIMESTAMP) returns TIMESTAMP external name
"aggr"."stddev";
+insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name = 'stddev' and f.type = 3 and f.schema_id = s.id and s.name =
'sys');
+
+
# 14:40:54 >
# 14:40:54 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
# 14:40:54 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
