Changeset: 3f5804226534 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f5804226534
Modified Files:
sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (167 lines):
diff --git a/sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
b/sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
--- a/sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
+++ b/sql/test/BugTracker/Tests/rank_over.SF-1691098.sql
@@ -1,1 +1,9 @@
-select RANK () OVER () as foo from tables;
+create table rankbug (id int);
+insert into rankbug values (42);
+insert into rankbug select * from rankbug;
+insert into rankbug select * from rankbug;
+insert into rankbug select * from rankbug;
+insert into rankbug select * from rankbug;
+insert into rankbug select * from rankbug;
+select RANK () OVER () as foo from rankbug;
+drop table rankbug;
diff --git a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
--- a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
+++ b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
@@ -24,8 +24,21 @@ Ready.
# 16:03:46 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=38533
# 16:03:46 >
-#select RANK () OVER () as foo from tables;
-% .L # table_name
+#create table rankbug (id int);
+#insert into rankbug values (42);
+[ 1 ]
+#insert into rankbug select * from rankbug;
+[ 1 ]
+#insert into rankbug select * from rankbug;
+[ 2 ]
+#insert into rankbug select * from rankbug;
+[ 4 ]
+#insert into rankbug select * from rankbug;
+[ 8 ]
+#insert into rankbug select * from rankbug;
+[ 16 ]
+#select RANK () OVER () as foo from rankbug;
+% sys.L # table_name
% foo # name
% int # type
% 2 # length
@@ -61,14 +74,7 @@ Ready.
[ 30 ]
[ 31 ]
[ 32 ]
-[ 33 ]
-[ 34 ]
-[ 35 ]
-[ 36 ]
-[ 37 ]
-[ 38 ]
-[ 39 ]
-[ 40 ]
+#drop table rankbug;
# 17:29:50 >
# 17:29:50 > "Done."
diff --git a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
--- a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
+++ b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.sql
@@ -1,2 +1,10 @@
-WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
-WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
+create table withonlybug (id int);
+insert into withonlybug values (42);
+insert into withonlybug select * from withonlybug;
+insert into withonlybug select * from withonlybug;
+insert into withonlybug select * from withonlybug;
+insert into withonlybug select * from withonlybug;
+insert into withonlybug select * from withonlybug;
+WITH t AS ( SELECT count(*) FROM withonlybug ) SELECT * FROM t;
+WITH t AS ( SELECT count(*) FROM withonlybug ) SELECT * FROM t;
+drop table withonlybug;
diff --git a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
--- a/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
+++ b/sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
@@ -14,27 +14,63 @@ stdout of test 'with_only_once.SF-172029
# MonetDB/SQL module v2.25.0 loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+# 17:55:39 >
+# 17:55:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30978" "--port=32166"
+# 17:55:39 >
-# 22:41:45 >
-# 22:41:45 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=32869
-# 22:41:45 >
-
-#WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
-% .t # table_name
+#create table withonlybug (id int);
+#insert into withonlybug values (42);
+[ 1 ]
+#insert into withonlybug select * from withonlybug;
+[ 1 ]
+#insert into withonlybug select * from withonlybug;
+[ 2 ]
+#insert into withonlybug select * from withonlybug;
+[ 4 ]
+#insert into withonlybug select * from withonlybug;
+[ 8 ]
+#insert into withonlybug select * from withonlybug;
+[ 16 ]
+#WITH t AS ( SELECT count(*) FROM withonlybug ) SELECT * FROM t;
+% sys.t # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 40 ]
-#WITH t AS ( SELECT count(*) FROM tables ) SELECT * FROM t;
-% .t # table_name
+[ 32 ]
+#WITH t AS ( SELECT count(*) FROM withonlybug ) SELECT * FROM t;
+% sys.t # table_name
% L1 # name
% wrd # type
% 2 # length
-[ 40 ]
+[ 32 ]
+#drop table withonlybug;
# 22:41:45 >
# 22:41:45 > Done.
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3370,8 +3370,8 @@ def main(argv) :
env['DIRSEP'] = os.sep
# most intuitive (?) default settings
- dft['TSTSRCBASE'] = "_configure('@QXSOURCE@')"
- dft['TSTTRGBASE'] = "_configure('@QXprefix@')" # or os.getcwd() ?
+ dft['TSTSRCBASE'] = r"_configure('@QXSOURCE@')"
+ dft['TSTTRGBASE'] = r"_configure('@QXprefix@')" # or os.getcwd() ?
if THISFILE == "Mtest.py":
dft['GDK_DEBUG'] = "TSTDBG"
dft['GDK_NR_THREADS'] = "TSTTHREADS"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
