MonetDB: Jun2010 - Merge.

[Sjoerd Mullender]

Changeset: dc19c5e2ef94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc19c5e2ef94
Modified Files:
        
Branch: Jun2010
Log Message:

Merge.


diffs (28 lines):

diff -r 5a05e8e0c50b -r dc19c5e2ef94 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx      Tue Jun 22 13:00:42 2010 +0200
+++ b/sql/src/server/sql_parser.mx      Tue Jun 22 13:04:17 2010 +0200
@@ -2914,11 +2914,20 @@
 
 select_no_parens_orderby:
      select_no_parens opt_order_by_clause opt_limit opt_offset
-       { SelectNode *s = (SelectNode*)$1;
+        { 
          $$ = $1;
-         s -> orderby = $2;
-         s -> limit = $3;
-         s -> offset = $4;
+         if ($2 || $3 != -1 || $4 != -1) {
+               if ($1 != NULL && $1->token == SQL_SELECT) {
+                       SelectNode *s = (SelectNode*)$1;
+       
+                       s -> orderby = $2;
+                       s -> limit = $3;
+                       s -> offset = $4;
+               } else {
+                       yyerror("ORDER BY: missing select operator");
+                       YYABORT;
+               }
+        } 
        }
     ;
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list