Changeset: 5e050ef2e154 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e050ef2e154
Modified Files:
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (44 lines):
diff -r 5f6efb3f6e2e -r 5e050ef2e154 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Wed Jul 07 13:40:48 2010 +0200
+++ b/sql/src/server/sql_parser.mx Wed Jul 07 14:13:43 2010 +0200
@@ -642,7 +642,7 @@
IDENT aTYPE ALIAS AGGR RANK sqlINT HEXADECIMAL INTNUM APPROXNUM
USING
ALL ANY SOME GLOBAL CAST CONVERT
- CHARACTER VARYING LARGE OBJECT VARCHAR CLOB TEXT BINARY sqlBLOB
+ CHARACTER VARYING LARGE OBJECT VARCHAR CLOB sqlTEXT BINARY sqlBLOB
sqlDECIMAL sqlFLOAT
TINYINT SMALLINT BIGINT sqlINTEGER
sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT
@@ -4542,7 +4542,7 @@
clob:
CLOB { $$ = $1; }
- | TEXT { $$ = $1; }
+ | sqlTEXT { $$ = $1; }
| CHARACTER LARGE OBJECT { $$ = $1; }
;
blob:
@@ -4606,7 +4606,7 @@
| SQL_EXPLAIN { $$ = sa_strdup(SA, "explain"); }
| SQL_DEBUG { $$ = sa_strdup(SA, "debug"); }
| SQL_TRACE { $$ = sa_strdup(SA, "trace"); }
-| TEXT { $$ = sa_strdup(SA, "text"); }
+| sqlTEXT { $$ = sa_strdup(SA, "text"); }
| AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); }
/* SQL/XML non reserved words */
| STRIP { $$ = sa_strdup(SA, "strip"); }
diff -r 5f6efb3f6e2e -r 5e050ef2e154 sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx Wed Jul 07 13:40:48 2010 +0200
+++ b/sql/src/server/sql_scan.mx Wed Jul 07 14:13:43 2010 +0200
@@ -119,8 +119,8 @@
keywords_insert("OBJECT", OBJECT);
keywords_insert("CLOB", CLOB);
keywords_insert("BLOB", sqlBLOB);
- keywords_insert("TEXT", TEXT);
- keywords_insert("TINYTEXT", TEXT);
+ keywords_insert("TEXT", sqlTEXT);
+ keywords_insert("TINYTEXT", sqlTEXT);
keywords_insert("STRING", CLOB); /* ? */
keywords_insert("CHECK", CHECK);
keywords_insert("CONSTRAINT", CONSTRAINT);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
