Changeset: 790f0ba8547e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=790f0ba8547e
Modified Files:
sql/src/server/sql_parser.mx
sql/src/server/sql_scan.mx
Branch: Jun2010
Log Message:
The symbol GROUP is used in some Windows header files, so use our own name.
diffs (33 lines):
diff -r 02a5904c5751 -r 790f0ba8547e sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Fri Jul 23 14:48:01 2010 +0200
+++ b/sql/src/server/sql_parser.mx Fri Jul 23 14:49:50 2010 +0200
@@ -660,7 +660,7 @@
%token <sval> ASYMMETRIC SYMMETRIC ORDER BY
%token <sval> LIKE ILIKE BETWEEN
-%token <operation> sqlIN EXISTS ESCAPE HAVING GROUP sqlNULL
+%token <operation> sqlIN EXISTS ESCAPE HAVING sqlGROUP sqlNULL
%token <operation> FROM FOR MATCH
%token <operation> EXTRACT
@@ -3101,7 +3101,7 @@
opt_group_by_clause:
/* empty */ { $$ = NULL; }
- | GROUP BY column_ref_commalist { $$ = _symbol_create_list( SQL_GROUPBY, $3
);}
+ | sqlGROUP BY column_ref_commalist { $$ = _symbol_create_list( SQL_GROUPBY,
$3 );}
;
column_ref_commalist:
diff -r 02a5904c5751 -r 790f0ba8547e sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx Fri Jul 23 14:48:01 2010 +0200
+++ b/sql/src/server/sql_scan.mx Fri Jul 23 14:49:50 2010 +0200
@@ -174,7 +174,7 @@
keywords_insert("CASCADE", CASCADE);
keywords_insert("RESTRICT", RESTRICT);
keywords_insert("GLOBAL", GLOBAL);
- keywords_insert("GROUP", GROUP);
+ keywords_insert("GROUP", sqlGROUP);
keywords_insert("HAVING", HAVING);
keywords_insert("ILIKE", ILIKE);
keywords_insert("IN", sqlIN);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
