Changeset: 26e5652ee43a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26e5652ee43a
Modified Files:
.hgignore
sql/ChangeLog.Jun2010
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (89 lines):
diff -r 4382914beeb2 -r 26e5652ee43a .hgignore
--- a/.hgignore Wed Jul 07 12:45:14 2010 +0200
+++ b/.hgignore Wed Jul 07 13:29:10 2010 +0200
@@ -35,6 +35,10 @@
^buildtools/burg/y\.tab\.h$
^buildtools/burg/ylwrap$
^buildtools/depcomp$
+^buildtools/doc/HowToRelease\.html$
+^buildtools/doc/HowToRelease\.pdf$
+^buildtools/doc/windowsbuild\.html$
+^buildtools/doc/windowsbuild\.pdf$
^buildtools/dummy.h.in$
^buildtools/mel/.*\.[ch]$
^buildtools/mel/.*\.cxx$
diff -r 4382914beeb2 -r 26e5652ee43a buildtools/doc/Makefile
--- a/buildtools/doc/Makefile Wed Jul 07 12:45:14 2010 +0200
+++ b/buildtools/doc/Makefile Wed Jul 07 13:29:10 2010 +0200
@@ -1,7 +1,13 @@
-all: HowToRelease.html windowsbuild.html
+all: HowToRelease.html windowsbuild.html HowToRelease.pdf windowsbuild.pdf
HowToRelease.html: HowToRelease.rst
- rst2html.py HowToRelease.rst > HowToRelease.html
+ rst2html HowToRelease.rst > HowToRelease.html
windowsbuild.html: windowsbuild.rst
- rst2html.py windowsbuild.rst > windowsbuild.html
+ rst2html windowsbuild.rst > windowsbuild.html
+
+HowToRelease.pdf: HowToRelease.rst
+ rst2pdf HowToRelease.rst
+
+windowsbuild.pdf: windowsbuild.rst
+ rst2pdf windowsbuild.rst
diff -r 4382914beeb2 -r 26e5652ee43a sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 13:29:10 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Fabian Groffen <fab...@cwi.nl>
+- 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 <ni...@cwi.nl>
- 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 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_parser.mx Wed Jul 07 13:29: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
@@ -4542,6 +4542,7 @@
clob:
CLOB { $$ = $1; }
+ | TEXT { $$ = $1; }
| CHARACTER LARGE OBJECT { $$ = $1; }
;
blob:
@@ -4605,6 +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"); }
| AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); }
/* SQL/XML non reserved words */
| STRIP { $$ = sa_strdup(SA, "strip"); }
diff -r 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_scan.mx Wed Jul 07 13:29: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
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
