Changeset: 6f22c3a68031 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f22c3a68031
Added Files:
sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err
sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out
Modified Files:
sql/server/sql_parser.y
sql/test/ADT2006/Tests/sander.stable.err
sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql
Branch: Aug2018
Log Message:
Fixes for bug 6653 (i.e. disallow any empty identifier).
diffs (248 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
@@ -310,9 +310,11 @@ int yydebug=1;
opt_constraint_name
non_reserved_word
ident
+ calc_ident
authorization_identifier
func_ident
restricted_ident
+ calc_restricted_ident
column
authid
grantee
@@ -5346,7 +5348,7 @@ column: ident ;
authid: restricted_ident ;
-restricted_ident:
+calc_restricted_ident:
IDENT { $$ = $1; }
| aTYPE { $$ = $1; }
| ALIAS { $$ = $1; }
@@ -5355,7 +5357,20 @@ restricted_ident:
| RANK { $$ = $1; } /* without '(' */
;
-ident:
+restricted_ident:
+ calc_restricted_ident
+ {
+ $$ = $1;
+ if (!$1 || _strlen($1) == 0) {
+ char *msg = sql_message(SQLSTATE(42000) "An identifier
cannot be empty");
+ yyerror(m, msg);
+ _DELETE(msg);
+ YYABORT;
+ }
+ }
+ ;
+
+calc_ident:
IDENT { $$ = $1; }
| aTYPE { $$ = $1; }
| FILTER_FUNC { $$ = $1; }
@@ -5366,6 +5381,19 @@ ident:
| non_reserved_word
;
+ident:
+ calc_ident
+ {
+ $$ = $1;
+ if (!$1 || _strlen($1) == 0) {
+ char *msg = sql_message(SQLSTATE(42000) "An identifier
cannot be empty");
+ yyerror(m, msg);
+ _DELETE(msg);
+ YYABORT;
+ }
+ }
+ ;
+
non_reserved_word:
LARGE { $$ = sa_strdup(SA, "large"); } /* sloppy:
officially reserved */
| sqlNAME { $$ = sa_strdup(SA, "name"); }
diff --git a/sql/test/ADT2006/Tests/sander.stable.err
b/sql/test/ADT2006/Tests/sander.stable.err
--- a/sql/test/ADT2006/Tests/sander.stable.err
+++ b/sql/test/ADT2006/Tests/sander.stable.err
@@ -15,7 +15,8 @@ QUERY = insert into suspect (name, pictu
victim_name) values ("Dr. Thomas Neill Cream ",
"http://blabla/toolong";, "did commit murders, but by
poisoning", "");
-ERROR = !SELECT: identifier 'Dr. Thomas Neill Cream ' unknown
+ERROR = !An identifier cannot be empty in: "insert into suspect (name,
picture_uri, notes,
+ !victim_name) values ("Dr. Thomas "
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = insert into suspect (name, picture_uri, notes,
diff --git
a/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql
b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql
--- a/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql
+++ b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.sql
@@ -1,3 +1,14 @@
-CREATE TABLE tbl ("" INT);
+CREATE TABLE tbl ("" INT); --error
+
+CREATE TABLE "" (i INT); --error
+
+CREATE TABLE selectme (a STRING);
-CREATE TABLE "" (i INT);
+INSERT INTO selectme VALUES (""); --error
+INSERT INTO selectme VALUES ('');
+
+SELECT * FROM (SELECT a FROM selectme) AS ""; --error
+SELECT a AS "" FROM (SELECT a FROM selectme) AS "other"; --error
+SELECT a AS "othera" FROM (SELECT a FROM selectme) AS "other";
+
+DROP TABLE selectme;
diff --git
a/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err
b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err
@@ -0,0 +1,58 @@
+stderr of test 'create_table_empty_column_name.Bug-6653` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 17:00:01 >
+# 17:00:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38434" "--set"
"mapi_usock=/var/tmp/mtest-26840/.s.monetdb.38434" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 17:00:01 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# 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 mapi_open = true
+# cmdline opt mapi_port = 38434
+# cmdline opt mapi_usock = /var/tmp/mtest-26840/.s.monetdb.38434
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 17:00:01 >
+# 17:00:01 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26840" "--port=38434"
+# 17:00:01 >
+
+MAPI = (monetdb) /var/tmp/mtest-26840/.s.monetdb.38434
+QUERY = CREATE TABLE tbl ("" INT); --error
+ERROR = !An identifier cannot be empty in: "create table tbl ("""
+ !syntax error, unexpected sqlINTEGER in: "int"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-26840/.s.monetdb.38434
+QUERY = CREATE TABLE "" (i INT); --error
+ERROR = !An identifier cannot be empty in: "create table """
+ !syntax error, unexpected IDENT, expecting SELECT or '(' in: "(i"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-26840/.s.monetdb.38434
+QUERY = INSERT INTO selectme VALUES (""); --error
+ERROR = !An identifier cannot be empty in: "insert into selectme values ("")"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-26840/.s.monetdb.38434
+QUERY = SELECT * FROM (SELECT a FROM selectme) AS ""; --error
+ERROR = !An identifier cannot be empty in: "select * from (select a from
selectme) as """
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-26840/.s.monetdb.38434
+QUERY = SELECT a AS "" FROM (SELECT a FROM selectme) AS "other"; --error
+ERROR = !An identifier cannot be empty in: "select a as """
+ !syntax error, unexpected FROM in: "from"
+CODE = 42000
+
+# 17:00:01 >
+# 17:00:01 > "Done."
+# 17:00:01 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out
b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.out
@@ -0,0 +1,81 @@
+stdout of test 'create_table_empty_column_name.Bug-6653` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 17:00:01 >
+# 17:00:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38434" "--set"
"mapi_usock=/var/tmp/mtest-26840/.s.monetdb.38434" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 17:00:01 >
+
+# MonetDB 5 server v11.31.10
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.492 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://wired-142.cwi.nl:38434/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26840/.s.monetdb.38434
+# MonetDB/GIS module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:00:01 >
+# 17:00:01 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26840" "--port=38434"
+# 17:00:01 >
+
+#CREATE TABLE selectme (a STRING);
+#INSERT INTO selectme VALUES ('');
+[ 1 ]
+#SELECT a AS "othera" FROM (SELECT a FROM selectme) AS "other";
+% sys.L3 # table_name
+% othera # name
+% clob # type
+% 0 # length
+[ "" ]
+#DROP TABLE selectme;
+
+# 17:00:01 >
+# 17:00:01 > "Done."
+# 17:00:01 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
