Changeset: 194b768b35e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=194b768b35e9
Added Files:
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err
sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out
Modified Files:
sql/server/sql_parser.y
sql/test/BugTracker-2012/Tests/All
Branch: Apr2012
Log Message:
added 'no' to the non reserved keywords
diffs (116 lines):
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -4673,7 +4673,7 @@ ident:
| non_reserved_word
;
-non_reserved_word: /* (lexicographically sorted for convenience) */
+non_reserved_word:
LARGE { $$ = sa_strdup(SA, "large"); } /* sloppy:
officially reserved */
| sqlNAME { $$ = sa_strdup(SA, "name"); }
| OBJECT { $$ = sa_strdup(SA, "object"); } /* sloppy: officially
reserved */
@@ -4711,6 +4711,7 @@ non_reserved_word: /* (lexicographicall
| SQL_TRACE { $$ = sa_strdup(SA, "trace"); }
| sqlTEXT { $$ = sa_strdup(SA, "text"); }
| AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); }
+| NO { $$ = sa_strdup(SA, "no"); }
/* SQL/XML non reserved words */
| STRIP { $$ = sa_strdup(SA, "strip"); }
| WHITESPACE { $$ = sa_strdup(SA, "whitespace"); }
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -31,3 +31,4 @@ table_returning_func_returns_too_many_co
table_functions_fail_after_restart-0.Bug-3063
table_functions_fail_after_restart-1.Bug-3063
user_defined_decimal_function.Bug-2992
+non_keyword_no.Bug-3079
diff --git a/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql
b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.sql
@@ -0,0 +1,3 @@
+start transaction;
+create table test1 ( no int);
+rollback;
diff --git a/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err
b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'non_keyword_no.Bug-3079` in directory 'test/BugTracker-2012`
itself:
+
+
+# 08:41:22 >
+# 08:41:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=35811" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 08:41:22 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35811
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 08:41:23 >
+# 08:41:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35811"
+# 08:41:23 >
+
+
+# 08:41:23 >
+# 08:41:23 > "Done."
+# 08:41:23 >
+
diff --git a/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out
b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/non_keyword_no.Bug-3079.stable.out
@@ -0,0 +1,33 @@
+stdout of test 'non_keyword_no.Bug-3079` in directory 'test/BugTracker-2012`
itself:
+
+
+# 08:41:22 >
+# 08:41:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=35811" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 08:41:22 >
+
+# MonetDB 5 server v11.9.2
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:35811/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 08:41:23 >
+# 08:41:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35811"
+# 08:41:23 >
+
+#start transaction;
+#create table test1 ( no int);
+#rollback;
+
+# 08:41:23 >
+# 08:41:23 > "Done."
+# 08:41:23 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
