Update of /cvsroot/monetdb/sql/src/test/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19983/Tests

Modified Files:
        coalesce.stable.out load_with_offset.sql 
Log Message:
approved tests after recent changes (coalesce parsing problem and copy into with
offset fixes)


Index: load_with_offset.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/load_with_offset.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- load_with_offset.sql        13 Dec 2007 16:08:18 -0000      1.1
+++ load_with_offset.sql        20 Dec 2007 08:46:55 -0000      1.2
@@ -6,7 +6,7 @@
   col5  VARCHAR(1)
 ) ;
 
-COPY 4 OFFSET 5 RECORDS INTO my_test FROM stdin USING DELIMITERS '|','\n' ;
+COPY 5 OFFSET 5 RECORDS INTO my_test FROM stdin USING DELIMITERS '|','\n' ;
 123|1.01||aaa|bbb
 553|.02||aaa|bbb
 223|2.03||aaa|bbb

Index: coalesce.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/coalesce.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- coalesce.stable.out 6 Nov 2007 15:45:19 -0000       1.3
+++ coalesce.stable.out 20 Dec 2007 08:46:55 -0000      1.4
@@ -1,19 +1,22 @@
 stdout of test 'coalesce` in directory 'src/test` itself:
 
 
-# 11:50:13 >  
-# 11:50:13 >  Mtimeout -timeout 180 Mserver 
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/MonetDB.conf" 
--debug=10 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB/bin"
 --set 
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-monetdb-pegasus.ins.cwi.nl/sql/dbfarm"
 --set 
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-monetdb-pegasus.ins.cwi.nl/sql/log"
 --set 
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/xquery_logs"
 --set mapi_port=35781 --set monet_prompt= --trace "--dbname=mTests_src_test" 
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 11:50:13 >  
-
-# Monet Database Server V4.13.1
-# Copyright (c) 1993-2006, CWI. All rights reserved.
-# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs; dynamically linked.
-# Visit http://monetdb.cwi.nl/ for further information.
+# 09:32:10 >  
+# 09:32:10 >   mserver5 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"  
--set mapi_open=true --set xrpc_open=true --set mapi_port=37610 --set 
xrpc_port=44307 --set monet_prompt= --trace "--dbname=mTests_src_test" --set 
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 09:32:10 >  
 
-printf("\nReady.\n");
+# MonetDB server v5.3.0, based on kernel v1.21.0
+# Serving database 'mTests_src_test'
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-2007 CWI, all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:37610/
+# MonetDB/SQL module v2.21.0 loaded
 
 Ready.
-quit();
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 Over..
 
@@ -36,8 +39,13 @@
 [ 1,   "a"     ]
 [ 2,   "unknown"       ]
 [ 3,   "c"     ]
+% . # table_name
+% ifthenelse_not_isnull_NULL # name
+% char # type
+% 0 # length
+[ "x"  ]
 
-# 17:28:21 >  
-# 17:28:21 >  Done.
-# 17:28:21 >  
+# 09:32:11 >  
+# 09:32:11 >  Done.
+# 09:32:11 >  
 


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to