Changeset: 614c5863fc83 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=614c5863fc83
Added Files:
sql/backends/monet5/Tests/simpleSQL.malC
sql/backends/monet5/vaults/Tests/vault00.malC
Removed Files:
sql/backends/monet5/Tests/simpleSQL.mal
sql/backends/monet5/vaults/Tests/vault00.mal
sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
Modified Files:
sql/backends/monet5/Tests/prepare.mal
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.out
sql/test/BugTracker-2009/Tests/All
Branch: default
Log Message:
Approve output
diffs (160 lines):
diff --git a/sql/backends/monet5/Tests/prepare.mal
b/sql/backends/monet5/Tests/prepare.mal
--- a/sql/backends/monet5/Tests/prepare.mal
+++ b/sql/backends/monet5/Tests/prepare.mal
@@ -1,4 +1,5 @@
#execute simple SQL queries from MAL
+function foo();
sql.init();
sql.prepare("myqry","select 2;");
@@ -13,3 +14,6 @@ select * from sys.prepared();
sql.deallocate("myqry");
sql.deallocate("myqry2");
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.mal
b/sql/backends/monet5/Tests/simpleSQL.malC
rename from sql/backends/monet5/Tests/simpleSQL.mal
rename to sql/backends/monet5/Tests/simpleSQL.malC
--- a/sql/backends/monet5/Tests/simpleSQL.mal
+++ b/sql/backends/monet5/Tests/simpleSQL.malC
@@ -1,4 +1,5 @@
#execute simple SQL queries from MAL
+function foo();
sql.init();
sql.eval("select 1;",true);
@@ -11,3 +12,6 @@ sql.eval("drop table simpleT;");
#cause an error
sql.eval("select 1;",false);
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.err
b/sql/backends/monet5/Tests/simpleSQL.stable.err
--- a/sql/backends/monet5/Tests/simpleSQL.stable.err
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.err
@@ -24,7 +24,31 @@ stderr of test 'simpleSQL` in directory
# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_backends_monet5
# cmdline opt gdk_debug = 536870922
-# 23:37:35 >
-# 23:37:35 > "Done."
-# 23:37:35 >
+# 13:03:24 >
+# 13:03:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >
+MAPI = (monetdb) /var/tmp/mtest-21282/.s.monetdb.38130
+QUERY = #execute simple SQL queries from MAL
+ function foo();
+ sql.init();
+ sql.eval("select 1;",true);
+
+ sql.eval("create table simpleT(i integer);");
+ sql.eval("insert into simpleT values(123);");
+
+ sql.eval("select * from simpleT;");
+ sql.eval("select * from simpleT;",false);
+ sql.eval("drop table simpleT;");
+
+ #cause an error
+ sql.eval("select 1;",false);
+ end foo;
+ mdb.list("user","foo");
+ user.foo();
+ERROR = !SQLException:sql.exportValue:failed
+
+# 13:03:24 >
+# 13:03:24 > "Done."
+# 13:03:24 >
+
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
@@ -17,8 +17,15 @@ stdout of test 'simpleSQL` in directory
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28801/.s.monetdb.30175
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-function user.main():void;
-#execute simple SQL queries from MAL
+# MonetDB/R module loaded
+
+Ready.
+
+# 13:03:24 >
+# 13:03:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >
+
+function user.foo():void;
sql.init();
sql.eval("select 1;",true);
sql.eval("create table simpleT(i integer);");
@@ -28,28 +35,23 @@ function user.main():void;
sql.eval("drop table simpleT;");
#cause an error
sql.eval("select 1;",false);
-end user.main;
-&1 0 1 1 1
+end user.foo;
% .L # table_name
% single_value # name
% tinyint # type
% 1 # length
[ 1 ]
-&2 1 -1
-&1 0 1 1 1
+[ 1 ]
% sys.simplet # table_name
% i # name
% int # type
% 3 # length
[ 123 ]
-&1 0 1 1 1
% sys.simplet # table_name
% i # name
% int # type
% 3 # length
[ 123 ]
-!SQLException:sql.exportValue:failed
-
# 23:37:35 >
# 23:37:35 > "Done."
diff --git a/sql/backends/monet5/vaults/Tests/vault00.mal
b/sql/backends/monet5/vaults/Tests/vault00.malC
rename from sql/backends/monet5/vaults/Tests/vault00.mal
rename to sql/backends/monet5/vaults/Tests/vault00.malC
--- a/sql/backends/monet5/vaults/Tests/vault00.mal
+++ b/sql/backends/monet5/vaults/Tests/vault00.malC
@@ -1,3 +1,5 @@
-
+function foo();
s:= vault.getdirectory();
io.print(s);
+end foo;
+user.foo();
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -9,7 +9,6 @@ incomplete.SF.2536893
subquery_returns_table_crash.SF-2513620
distinct.SF-2546483
caselessthen
-union_leak.SF-2540169
select_from_history.SF-2556566
COPY_INTO_char_NULL.SF-2560780
LE_vs_GE_in_CASE.SF-2562264
diff --git a/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
b/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
deleted file mode 100644
--- a/sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
+++ /dev/null
@@ -1,8 +0,0 @@
-# old fashioned MAL, ignore until needed again
-#(v1h,v1t):=status.memUsage(1000000:lng);
-#v2:=algebra.like(v1h,"_tot/");
-#v3:=algebra.kdifference(v1t,v2);
-#v4:=bat.reverse(v2);
-#v5:=algebra.join(v4,v3);
-#io.print(v5);
-#v5:= nil:bat;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
