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

Modified Files:
        coalesce.stable.err coalesce.stable.out 
Log Message:
Approve the new out and err output.
The coalesce function is now supported in the where clause.



Index: coalesce.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/coalesce.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- coalesce.stable.out 20 Dec 2007 08:46:55 -0000      1.4
+++ coalesce.stable.out 2 Jan 2008 17:29:26 -0000       1.5
@@ -5,6 +5,24 @@
 # 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 >  
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # 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
@@ -27,25 +45,46 @@
 [ 1    ]
 [ 1    ]
 [ 1    ]
+[ 1    ]
 % sys. # table_name
 % ifthenelse_not_isnull_age # name
 % double # type
 % 22 # length
-[ 28   ]
+[ 30.5 ]
 % sys.test,    sys. # table_name
 % id,  ifthenelse_not_isnull_name # name
 % int, varchar # type
-% 1,   7 # length
+% 1,   12 # length
 [ 1,   "a"     ]
-[ 2,   "unknown"       ]
+[ 2,   "user unknown"  ]
 [ 3,   "c"     ]
+[ 4,   "user unknown"  ]
+% sys.test,    sys. # table_name
+% id,  ifthenelse_not_isnull_age # name
+% int, int # type
+% 1,   2 # length
+[ 1,   20      ]
+[ 2,   26      ]
+[ 3,   -1      ]
+[ 4,   -1      ]
 % . # table_name
 % ifthenelse_not_isnull_NULL # name
 % char # type
 % 0 # length
 [ "x"  ]
+% sys.test,    sys.test,       sys.test # table_name
+% id,  name,   age  # name
+% int, varchar,        int # type
+% 1,   1,      2 # length
+[ 2,   NULL,   26      ]
+[ 4,   NULL,   NULL    ]
+% sys.test,    sys.test,       sys.test # table_name
+% id,  name,   age  # name
+% int, varchar,        int # type
+% 1,   1,      2 # length
+[ 2,   NULL,   26      ]
 
-# 09:32:11 >  
-# 09:32:11 >  Done.
-# 09:32:11 >  
+# 15:56:24 >  
+# 15:56:24 >  Done.
+# 15:56:24 >  
 

Index: coalesce.stable.err
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/coalesce.stable.err,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- coalesce.stable.err 20 Oct 2006 15:42:16 -0000      1.1
+++ coalesce.stable.err 2 Jan 2008 17:29:26 -0000       1.2
@@ -1,72 +1,25 @@
 stderr of test 'coalesce` in directory 'src/test` itself:
 
 
-# 17:28:20 >  
-# 17:28:20 >  Mtimeout -timeout 180 mserver5 
"--config=/export/scratch1/milena/monet/etc/MonetDB5.conf" --debug=10 --set 
"monet_mod_path=/export/scratch1/milena/monet/lib/MonetDB5:/export/scratch1/milena/monet/lib/MonetDB5/lib:/export/scratch1/milena/monet/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/export/scratch1/milena/monet/var/MonetDB5/dbfarm" --set 
"sql_logdir=/export/scratch1/milena/monet/var/MonetDB5/dblogs" --set 
mapi_port=34169 --set monet_prompt= --trace "--dbname=mTests_src_test" 
--dbinit='include sql;' ; echo ; echo Over..
-# 17:28:20 >  
+# 14:13:02 >  
+# 14:13:02 >   mserver5 
"--config=/ufs/goncalve/scratch/MonetDB/MonetDB5/etc/monetdb5.conf" --debug=10 
--set 
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/MonetDB5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/MonetDB5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/MonetDB5/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/MonetDB5/var/MonetDB5/dbfarm" 
--set "sql_logdir=/ufs/goncalve/scratch/MonetDB/MonetDB5/var/MonetDB5/sql_logs" 
 --set mapi_open=true --set xrpc_open=true --set mapi_port=33064 --set 
xrpc_port=42357 --set monet_prompt= --trace "--dbname=mTests_src_test" --set 
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 14:13:02 >  
 
-# builtin opt  config = ${prefix}/etc/MonetDB.conf
-# builtin opt  gdk_arch = 64bitx86_64-redhat-linux-gnu
-# builtin opt  gdk_version = 4.13.1
-# builtin opt  monet_pid = 7401
-# builtin opt  prefix = /export/scratch1/milena/monet
-# builtin opt  exec_prefix = ${prefix}
-# builtin opt  gdk_dbname = tst
-# builtin opt  gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt  gdk_debug = 8
-# builtin opt  gdk_mem_bigsize = 262144
-# builtin opt  gdk_vm_minsize = 137438953472
-# builtin opt  gdk_alloc_map = yes
-# builtin opt  monet_admin = adm
-# builtin opt  monet_prompt = >
-# builtin opt  monet_welcome = yes
-# builtin opt  monet_mod_path = 
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt  monet_daemon = yes
-# builtin opt  host = localhost
-# builtin opt  mapi_port = 50000
-# builtin opt  mapi_noheaders = no
-# builtin opt  mapi_debug = 0
-# builtin opt  mapi_clients = 2
-# builtin opt  sql_debug = 0
-# builtin opt  sql_logdir = ${prefix}/var/MonetDB/log
-# config opt   prefix = /export/scratch1/milena/monet
-# config opt   config = ${prefix}/etc/MonetDB5.conf
-# config opt   prefix = /export/scratch1/milena/monet
-# config opt   exec_prefix = ${prefix}
-# config opt   gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt   gdk_dbname = demo
-# config opt   gdk_version = 4.99.19
-# config opt   monet_welcome = yes
-# config opt   gdk_alloc_map = no
-# config opt   gdk_embedded = no
-# config opt   gdk_debug = 0
-# config opt   monet_mod_path = 
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt   monet_daemon = no
-# config opt   delay = 120
-# config opt   mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt   mal_listing = 7
-# config opt   checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt   mapi_port = 50000
-# config opt   sql_debug = 0
-# config opt   sql_logdir = ${prefix}/var/MonetDB5/dblogs
-# config opt   pf_httpd_port = 8080
-# config opt   xquery_output = dm
-# config opt   xquery_cacheMB = 100
-# cmdline opt  config = /export/scratch1/milena/monet/etc/MonetDB5.conf
-# cmdline opt  gdk_debug = 10
-# cmdline opt  monet_mod_path = 
/export/scratch1/milena/monet/lib/MonetDB5:/export/scratch1/milena/monet/lib/MonetDB5/lib:/export/scratch1/milena/monet/lib/MonetDB5/bin
-# cmdline opt  gdk_dbfarm = /export/scratch1/milena/monet/var/MonetDB5/dbfarm
-# cmdline opt  sql_logdir = /export/scratch1/milena/monet/var/MonetDB5/dblogs
-# cmdline opt  mapi_port = 34169
-# cmdline opt  monet_prompt = 
-# cmdline opt  gdk_dbname = mTests_src_test
+#warning: please don't forget to set your vault key!
+#(see /ufs/goncalve/scratch/MonetDB/MonetDB5/etc/monetdb5.conf)
 
-# 17:28:20 >  
-# 17:28:20 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=34169  < coalesce.sql
-# 17:28:20 >  
+# 14:16:39 >  
+# 14:16:39 >  mclient -lsql -umonetdb -Pmonetdb --host=amelia --port=36320 
+# 14:16:39 >  
 
+MAPI  = [EMAIL PROTECTED]:30191
+QUERY = select id, coalesce(age,'age unknown') from test;
+ERROR = !SQLException:int:conversion of string 'age unknown' failed
+MAPI  = [EMAIL PROTECTED]:30191
+QUERY = select id, coalesce(name, age, 'unknown') from test;
+ERROR = !SQLException:int:conversion of string 'a' failed
 
-# 17:28:21 >  
-# 17:28:21 >  Done.
-# 17:28:21 >  
+# 16:39:45 >  
+# 16:39:45 >  Done.
+# 16:39:45 >  
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to