Changeset: 15698abe8e2c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=15698abe8e2c Modified Files: sql/ChangeLog.Jun2010 sql/src/server/sql_parser.mx sql/src/server/sql_scan.mx Branch: Jun2010 Log Message:
relax the usage of TEXT a bit for SkyTec's hibernate TEXT seems not to be a reserved keyword, and others seem to accept it as column names as well, so I splitted TEXT from CLOB (the scanner just aliased TEXT to CLOB) and allowed TEXT to appear as non-keyword, such as a column name. diffs (55 lines): diff -r a5c01de6d739 -r 15698abe8e2c sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Wed Jul 07 12:44:53 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Wed Jul 07 11:21:10 2010 +0200 @@ -1,6 +1,9 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Wed Jul 7 2010 Fabian Groffen <[email protected]> +- Make TEXT a separate keyword, separating it from CLOB, such that we can sloppily allow TEXT to appear as a column name, since it seems not to be in the standard as reserved keyword. + * Wed Jul 7 2010 Niels Nes <[email protected]> - Fixed bug 2581. Completed the implementation of handling boolean types in prepare statements. - Fix bug 2582. Statements with 'constant in ( )' are now handled properly. diff -r a5c01de6d739 -r 15698abe8e2c sql/src/server/sql_parser.mx --- a/sql/src/server/sql_parser.mx Wed Jul 07 12:44:53 2010 +0200 +++ b/sql/src/server/sql_parser.mx Wed Jul 07 11:21:10 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 BINARY sqlBLOB + CHARACTER VARYING LARGE OBJECT VARCHAR CLOB TEXT BINARY sqlBLOB sqlDECIMAL sqlFLOAT TINYINT SMALLINT BIGINT sqlINTEGER sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT @@ -4538,6 +4538,7 @@ clob: CLOB { $$ = $1; } + | TEXT { $$ = $1; } | CHARACTER LARGE OBJECT { $$ = $1; } ; blob: @@ -4601,6 +4602,7 @@ | SQL_EXPLAIN { $$ = sa_strdup(SA, "explain"); } | SQL_DEBUG { $$ = sa_strdup(SA, "debug"); } | SQL_TRACE { $$ = sa_strdup(SA, "trace"); } +| TEXT { $$ = sa_strdup(SA, "text"); } | AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); } /* SQL/XML non reserved words */ | STRIP { $$ = sa_strdup(SA, "strip"); } diff -r a5c01de6d739 -r 15698abe8e2c sql/src/server/sql_scan.mx --- a/sql/src/server/sql_scan.mx Wed Jul 07 12:44:53 2010 +0200 +++ b/sql/src/server/sql_scan.mx Wed Jul 07 11:21:10 2010 +0200 @@ -119,8 +119,8 @@ keywords_insert("OBJECT", OBJECT); keywords_insert("CLOB", CLOB); keywords_insert("BLOB", sqlBLOB); - keywords_insert("TEXT", CLOB); - keywords_insert("TINYTEXT", CLOB); + keywords_insert("TEXT", TEXT); + keywords_insert("TINYTEXT", TEXT); 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
