Changeset: 41809101608a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41809101608a
Modified Files:
sql/server/sql_parser.y
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
Branch: Jul2017
Log Message:
allow for column aliases without as
diffs (126 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
@@ -4140,6 +4140,7 @@ column_exp:
opt_alias_name:
/* empty */ { $$ = NULL; }
| AS ident { $$ = $2; }
+ | ident { $$ = $1; }
;
atom:
diff --git
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128
---
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128
+++
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128
@@ -30,13 +30,7 @@ stderr of test 'hexadecimal_literals.Bug
# 17:24:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30147" "--port=33525"
# 17:24:30 >
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = select 0xg;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select 0xg"
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = select 0xG;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select 0xg"
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-15050/.s.monetdb.37163
QUERY = select 0x80000000000000000000000000000000;
ERROR = !invalid hexadecimal number or hexadecimal too large
(0x80000000000000000000000000000000) in: "select
0x80000000000000000000000000000000"
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
@@ -48,13 +42,7 @@ ERROR = !invalid hexadecimal number or h
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select 0x123456789abcdef0123456789abcdef01;
ERROR = !invalid hexadecimal number or hexadecimal too large
(0x123456789abcdef0123456789abcdef01) in: "select
0x123456789abcdef0123456789abcdef01"
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = select -0xg;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select -0xg"
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = select -0xG;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select -0xg"
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-15050/.s.monetdb.37163
QUERY = select -0x80000000000000000000000000000000;
ERROR = !invalid hexadecimal number or hexadecimal too large
(0x80000000000000000000000000000000) in: "select
-0x80000000000000000000000000000000"
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
diff --git
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
--- a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
+++ b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
@@ -186,6 +186,18 @@ Ready.
% tinyint # type
% 2 # length
[ 15 ]
+#select 0xg;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
+#select 0xG;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
#select 0x00;
% .L1 # table_name
% L1 # name
@@ -721,6 +733,18 @@ Ready.
% tinyint # type
% 3 # length
[ -15 ]
+#select -0xg;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
+#select -0xG;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
#select -0x00;
% .L1 # table_name
% L1 # name
diff --git
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
---
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
+++
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
@@ -186,6 +186,18 @@ Ready.
% tinyint # type
% 2 # length
[ 15 ]
+#select 0xg;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
+#select 0xG;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
#select 0x00;
% .L2 # table_name
% L2 # name
@@ -774,6 +786,18 @@ Ready.
% tinyint # type
% 3 # length
[ -15 ]
+#select -0xg;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
+#select -0xG;
+% .L2 # table_name
+% xg # name
+% tinyint # type
+% 1 # length
+[ 0 ]
#select -0x00;
% .L2 # table_name
% L2 # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list