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

Modified Files:
      Tag: SQL_2-24
        distinct_count.stable.out 
        insert_delete-bug-sf-904025.stable.out 
        profile_bug-SF.1314649.stable.out 
        select_constant_from_where_1=1-bug-sf-1019529.stable.out 
        union-bug-sf-978045.stable.out 
Log Message:
Approve the new output due the following fix:

Log Message:
The table name was missing on the query output:
% sky. # table_name

Now it is like this:
% sky.rc3 # table_name

Solution is to look into the base column...
/* there are no table aliases, ie look into the base column */



U insert_delete-bug-sf-904025.stable.out
Index: insert_delete-bug-sf-904025.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out,v
retrieving revision 1.13
retrieving revision 1.13.12.1
diff -u -d -r1.13 -r1.13.12.1
--- insert_delete-bug-sf-904025.stable.out      17 Jan 2007 13:41:08 -0000      
1.13
+++ insert_delete-bug-sf-904025.stable.out      1 Jul 2008 10:55:54 -0000       
1.13.12.1
@@ -20,25 +20,25 @@
 # 18:18:00 >  
 
 [ 25   ]
-% sys. # table_name
+% sys.tmp # table_name
 % count_ # name
 % int # type
 % 2 # length
 [ 25   ]
 [ 25   ]
-% sys. # table_name
+% sys.tmp # table_name
 % count_ # name
 % int # type
 % 1 # length
 [ 0    ]
 [ 25   ]
-% sys. # table_name
+% sys.tmp # table_name
 % count_ # name
 % int # type
 % 2 # length
 [ 25   ]
 [ 25   ]
-% sys. # table_name
+% sys.tmp # table_name
 % count_ # name
 % int # type
 % 1 # length

U distinct_count.stable.out
Index: distinct_count.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/bugs/Tests/distinct_count.stable.out,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- distinct_count.stable.out   2 Jun 2008 17:08:59 -0000       1.1.2.1
+++ distinct_count.stable.out   1 Jul 2008 10:55:54 -0000       1.1.2.2
@@ -27,7 +27,7 @@
 [ 1    ]
 [ 1    ]
 [ 1    ]
-% sys. # table_name
+% sys.tabool # table_name
 % count_ # name
 % int # type
 % 1 # length

U profile_bug-SF.1314649.stable.out
Index: profile_bug-SF.1314649.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/profile_bug-SF.1314649.stable.out,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- profile_bug-SF.1314649.stable.out   1 Apr 2008 17:05:15 -0000       1.9
+++ profile_bug-SF.1314649.stable.out   1 Jul 2008 10:55:55 -0000       1.9.2.1
@@ -35,7 +35,7 @@
 % varchar,     varchar # type
 % 9,   7 # length
 [ "select 1;", "monetdb"       ]
-% sys. # table_name
+% sys.t1314649 # table_name
 % count_ # name
 % int # type
 % 1 # length

U select_constant_from_where_1=1-bug-sf-1019529.stable.out
Index: select_constant_from_where_1=1-bug-sf-1019529.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/select_constant_from_where_1=1-bug-sf-1019529.stable.out,v
retrieving revision 1.13
retrieving revision 1.13.8.1
diff -u -d -r1.13 -r1.13.8.1
--- select_constant_from_where_1=1-bug-sf-1019529.stable.out    29 Jun 2007 
11:29:35 -0000      1.13
+++ select_constant_from_where_1=1-bug-sf-1019529.stable.out    1 Jul 2008 
10:55:55 -0000       1.13.8.1
@@ -1,19 +1,22 @@
 stdout of test 'select_constant_from_where_1=1-bug-sf-1019529` in directory 
'src/test/bugs` itself:
 
 
-# 11:55:41 >  
-# 11:55:41 >  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=35185 --set monet_prompt= --trace 
"--dbname=mTests_src_test_bugs" --dbinit="module(sql_server); 
sql_server_start();" ; echo ; echo Over..
-# 11:55:41 >  
-
-# 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.
+# 11:58:07 >  
+# 11:58:07 >   mserver5 
"--config=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf"
 --debug=10 --set 
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/dbfarm"
 --set 
"sql_logdir=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/sql_logs"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=30364 --set 
xrpc_port=49769 --set monet_prompt= --trace  "--dbname=mTests_src_test_bugs" 
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 11:58:07 >  
 
-printf("\nReady.\n");
+# MonetDB server v5.6.1, based on kernel v1.24.1
+# Serving database 'mTests_src_test_bugs'
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-2008 CWI, all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://alviss.ins.cwi.nl:30364/
+# MonetDB/SQL module v2.24.1 loaded
 
 Ready.
-quit();
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 Over..
 
@@ -57,7 +60,7 @@
 % tinyint # type
 % 1 # length
 [ 1    ]
-% .,   sys. # table_name
+% .,   sys.t1019529 # table_name
 % single_value,        count_ # name
 % tinyint,     int # type
 % 1,   1 # length

U union-bug-sf-978045.stable.out
Index: union-bug-sf-978045.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/bugs/Tests/union-bug-sf-978045.stable.out,v
retrieving revision 1.11
retrieving revision 1.11.14.1
diff -u -d -r1.11 -r1.11.14.1
--- union-bug-sf-978045.stable.out      24 Oct 2006 16:03:16 -0000      1.11
+++ union-bug-sf-978045.stable.out      1 Jul 2008 10:55:55 -0000       
1.11.14.1
@@ -1,19 +1,22 @@
 stdout of test 'union-bug-sf-978045` in directory 'src/test/bugs` itself:
 
 
-# 12:51:43 >  
-# 12:51:43 >  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/bin"
 --set 
"gdk_dbfarm=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/dbfarm"
 --set 
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/log" 
--set mapi_port=38933 --set sql_port=45579 --set xquery_port=52530 --set 
monet_prompt= --trace "--dbname=mTests_src_test_bugs" 
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 12:51:43 >  
-
-# Monet Database Server V4.9.3
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically 
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
+# 11:58:05 >  
+# 11:58:05 >   mserver5 
"--config=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf"
 --debug=10 --set 
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/dbfarm"
 --set 
"sql_logdir=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5//var/MonetDB5/sql_logs"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=30364 --set 
xrpc_port=49769 --set monet_prompt= --trace  "--dbname=mTests_src_test_bugs" 
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 11:58:05 >  
 
-printf("\nReady.\n");
+# MonetDB server v5.6.1, based on kernel v1.24.1
+# Serving database 'mTests_src_test_bugs'
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-2008 CWI, all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://alviss.ins.cwi.nl:30364/
+# MonetDB/SQL module v2.24.1 loaded
 
 Ready.
-quit();
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 Over..
 
@@ -22,14 +25,14 @@
 # 12:51:49 >  
 
 [ 3    ]
-% sys. # table_name
+% sys.t978045 # table_name
 % name # name
 % varchar # type
 % 6 # length
 [ "niels"      ]
 [ "fabian"     ]
 [ "martin"     ]
-% sys. # table_name
+% sys.t978045 # table_name
 % name # name
 % varchar # type
 % 6 # length


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to