MonetDB: default - merged with Jun2010

[Stefan Manegold]

Changeset: 748c3b387bf0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=748c3b387bf0
Modified Files:
        sql/src/server/sql_parser.mx
        sql/src/test/BugTracker/Tests/union_order.stable.err
Branch: default
Log Message:

merged with Jun2010


diffs (44 lines):

diff -r 56abe34dffc5 -r 748c3b387bf0 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx      Sun Jul 11 11:34:13 2010 +0200
+++ b/sql/src/server/sql_parser.mx      Sun Jul 11 20:07:11 2010 +0200
@@ -2921,7 +2921,7 @@
         { 
          $$ = $1;
          if ($2 || $3 || $4) {
-               if ($1 != NULL && $1->token == SQL_SELECT) {
+               if ($1 != NULL && ($1->token == SQL_SELECT || $1->token == 
SQL_UNION)) {
                        SelectNode *s = (SelectNode*)$1;
        
                        s -> orderby = $2;
diff -r 56abe34dffc5 -r 748c3b387bf0 
sql/src/test/BugTracker/Tests/union_order.stable.err
--- a/sql/src/test/BugTracker/Tests/union_order.stable.err      Sun Jul 11 
11:34:13 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/union_order.stable.err      Sun Jul 11 
20:07:11 2010 +0200
@@ -10,13 +10,6 @@
 # 15:51:29 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=36178 
 # 15:51:29 >  
 
-MAPI  = mone...@alf:31841
-QUERY = select data from tmp_one
-ERROR = !ORDER BY: missing select operator in: "select data from tmp_one
-        !union
-        !select data from tmp_two
-        !order by data
-        !;"
 
 # 15:51:29 >  
 # 15:51:29 >  Done.
diff -r 56abe34dffc5 -r 748c3b387bf0 
sql/src/test/BugTracker/Tests/union_order.stable.out
--- a/sql/src/test/BugTracker/Tests/union_order.stable.out      Sun Jul 11 
11:34:13 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/union_order.stable.out      Sun Jul 11 
20:07:11 2010 +0200
@@ -28,7 +28,10 @@
 % data # name
 % decimal # type
 % 6 # length
-#select *
+% .tmp_one # table_name
+% data # name
+% decimal # type
+% 6 # length
 % .foo # table_name
 % data # name
 % decimal # type
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list