Changeset: 91c472eabc48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91c472eabc48
Added Files:
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out
Modified Files:
sql/server/sql_parser.y
sql/test/BugTracker-2015/Tests/All
Branch: Oct2014
Log Message:
fixed bug 3730, ie always pass the schema ('sys') for operators
diffs (239 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
@@ -3395,90 +3395,90 @@ simple_scalar_exp:
| scalar_exp '+' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "sql_add")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "sql_add")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '-' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "sql_sub")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "sql_sub")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '*' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "sql_mul")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "sql_mul")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '/' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "sql_div")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "sql_div")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '%' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "mod")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "mod")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '^' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "bit_xor")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "bit_xor")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '&' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "bit_and")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "bit_and")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp '|' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "bit_or")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "bit_or")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| '~' scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA, "bit_not")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "bit_not")));
append_symbol(l, $2);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp LEFT_SHIFT scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA,
"left_shift")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "left_shift")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp RIGHT_SHIFT scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA,
"right_shift")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "right_shift")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp LEFT_SHIFT_ASSIGN scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA,
"left_shift_assign")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "left_shift_assign")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
| scalar_exp RIGHT_SHIFT_ASSIGN scalar_exp
{ dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA,
"right_shift_assign")));
+ append_string(append_string(L(), sa_strdup(SA,
"sys")), sa_strdup(SA, "right_shift_assign")));
append_symbol(l, $1);
append_symbol(l, $3);
$$ = _symbol_create_list( SQL_BINOP, l ); }
@@ -3496,7 +3496,7 @@ simple_scalar_exp:
if (!$$) {
dlist *l = L();
append_list(l,
- append_string(L(), sa_strdup(SA,
"sql_neg")));
+ append_string(append_string(L(),
sa_strdup(SA, "sys")), sa_strdup(SA, "sql_neg")));
append_symbol(l, $2);
$$ = _symbol_create_list( SQL_UNOP, l );
}
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -31,3 +31,4 @@ union_project.Bug-3723
leftjoin.Bug-3720
adddrop_unknown_table.Bug-3718
outerjoin_project.Bug-3725
+left_shift_inet.Bug-3730
diff --git a/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql
b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql
@@ -0,0 +1,12 @@
+start transaction;
+create table test (a inet);
+insert into test (a) values ('10.0.0.1');
+select * from test where a << inet '10.0.0.0/8';
+
+create schema test;
+set schema test;
+select * from sys.test where a << inet '10.0.0.0/8';
+
+rollback;
+
+
diff --git a/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err
b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'left_shift_inet.Bug-3730` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 10:25:17 >
+# 10:25:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33923" "--set"
"mapi_usock=/var/tmp/mtest-5924/.s.monetdb.33923" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:25:17 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 33923
+# cmdline opt mapi_usock = /var/tmp/mtest-5924/.s.monetdb.33923
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:25:18 >
+# 10:25:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5924" "--port=33923"
+# 10:25:18 >
+
+
+# 10:25:18 >
+# 10:25:18 > "Done."
+# 10:25:18 >
+
diff --git a/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out
b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out
@@ -0,0 +1,51 @@
+stdout of test 'left_shift_inet.Bug-3730` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 10:25:17 >
+# 10:25:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33923" "--set"
"mapi_usock=/var/tmp/mtest-5924/.s.monetdb.33923" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:25:17 >
+
+# MonetDB 5 server v11.19.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:33923/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5924/.s.monetdb.33923
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:25:18 >
+# 10:25:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5924" "--port=33923"
+# 10:25:18 >
+
+#start transaction;
+#create table test (a inet);
+#insert into test (a) values ('10.0.0.1');
+[ 1 ]
+#select * from test where a << inet '10.0.0.0/8';
+% sys.test # table_name
+% a # name
+% inet # type
+% 0 # length
+[ 10.0.0.1 ]
+#create schema test;
+#set schema test;
+#select * from sys.test where a << inet '10.0.0.0/8';
+% sys.test # table_name
+% a # name
+% inet # type
+% 0 # length
+[ 10.0.0.1 ]
+#rollback;
+
+# 10:25:18 >
+# 10:25:18 > "Done."
+# 10:25:18 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
