Changeset: 8a627c9a08b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a627c9a08b4
Added Files:
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
Modified Files:
sql/server/rel_schema.c
sql/test/BugTracker-2019/Tests/All
Branch: default
Log Message:
Merge with Apr2019.
diffs (truncated from 312 to 300 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -855,7 +855,7 @@ table_element(sql_query *query, symbol *
}
if (!os)
os = ss;
- ot = mvc_bind_table(sql, os, name);
+ ot = mvc_bind_table(sql, os, name);
if (!ot) {
sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: no
such table '%s'", name);
return SQL_ERR;
@@ -863,6 +863,10 @@ table_element(sql_query *query, symbol *
for (n = ot->columns.set->h; n; n = n->next) {
sql_column *oc = n->data;
+ if (mvc_bind_column(sql, t, oc->base.name)) {
+ sql_error(sql, 02, SQLSTATE(42S21) "CREATE
TABLE: a column named '%s' already exists\n", oc->base.name);
+ return SQL_ERR;
+ }
(void)mvc_create_column(sql, t, oc->base.name,
&oc->type);
}
} break;
diff --git a/sql/test/BugTracker-2019/Tests/All
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -21,3 +21,5 @@ select_window_function_and_asterisk.Bug-
disallow_duplicate_column_aliases.Bug-6723
prepare-types.Bug-6724
prepare-non-existing-function.Bug-6725
+select-distinct.Bug-6728
+table-duplicate-column.Bug-6729
diff --git a/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
@@ -0,0 +1,9 @@
+start transaction;
+create table r(a1 string, a2 string);
+insert into r values ('a','b'), ('a','b'), ('b','a');
+SELECT DISTINCT a1,a2 FROM r;
+SELECT DISTINCT
+ CASE WHEN a1 > a2 THEN a2 ELSE a1 END as c1,
+ CASE WHEN a1 < a2 THEN a2 ELSE a1 END as c2
+FROM r;
+rollback;
diff --git a/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
@@ -0,0 +1,33 @@
+stderr of test 'select-distinct.Bug-6728` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 18:19:28 >
+# 18:19:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31539" "--set"
"mapi_usock=/var/tmp/mtest-24894/.s.monetdb.31539" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 18:19:28 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/monetdb5/dbfarm/demo
+# 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 = 31539
+# cmdline opt mapi_usock = /var/tmp/mtest-24894/.s.monetdb.31539
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 18:19:29 >
+# 18:19:29 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24894" "--port=31539"
+# 18:19:29 >
+
+
+# 18:19:29 >
+# 18:19:29 > "Done."
+# 18:19:29 >
+
diff --git a/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
@@ -0,0 +1,90 @@
+stdout of test 'select-distinct.Bug-6728` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 18:19:28 >
+# 18:19:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31539" "--set"
"mapi_usock=/var/tmp/mtest-24894/.s.monetdb.31539" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 18:19:28 >
+
+# MonetDB 5 server v11.33.4 (hg id: 551c00fc1950+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://localhost.localdomain:31539/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-24894/.s.monetdb.31539
+# 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
+
+# 18:24:51 >
+# 18:24:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1457" "--port=39911"
+# 18:24:51 >
+
+#start transaction;
+#create table r(a1 string, a2 string);
+#insert into r values ('a','b'), ('a','b'), ('b','a');
+[ 3 ]
+#SELECT DISTINCT a1,a2 FROM r;
+% sys.r, sys.r # table_name
+% a1, a2 # name
+% clob, clob # type
+% 1, 1 # length
+[ "a", "b" ]
+[ "b", "a" ]
+#SELECT DISTINCT
+# CASE WHEN a1 > a2 THEN a2 ELSE a1 END as c1,
+# CASE WHEN a1 < a2 THEN a2 ELSE a1 END as c2
+#FROM r;
+% sys.L1, sys.L2 # table_name
+% c1, c2 # name
+% clob, clob # type
+% 1, 1 # length
+[ "a", "b" ]
+#rollback;
+
+# 18:19:29 >
+# 18:19:29 > "Done."
+# 18:19:29 >
+
diff --git a/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql
b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql
@@ -0,0 +1,4 @@
+CREATE TABLE products ("id" int not null primary key, "name" varchar(99) not
null, "price" decimal(7,2) not null);
+CREATE TABLE products_new ("id" serial, like products); --error, column id
already exists
+CREATE TABLE products_new2 (like products, like products); --error, column id
already exists
+DROP TABLE products;
diff --git
a/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err
b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'table-duplicate-column.Bug-6729` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 17:55:36 >
+# 17:55:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37725" "--set"
"mapi_usock=/var/tmp/mtest-21642/.s.monetdb.37725" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:55:36 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/monetdb5/dbfarm/demo
+# 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 = 37725
+# cmdline opt mapi_usock = /var/tmp/mtest-21642/.s.monetdb.37725
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019
+# cmdline opt embedded_c = true
+#client2:!ERROR:ParseException:SQLparser:42S21!CREATE TABLE: a column named
'id' already exists
+#client2:!ERROR:ParseException:SQLparser:42S21!CREATE TABLE: a column named
'id' already exists
+#main thread:!ERROR:MALException:client.quit:Server stopped
+
+# 17:55:37 >
+# 17:55:37 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21642" "--port=37725"
+# 17:55:37 >
+
+MAPI = (monetdb) /var/tmp/mtest-21642/.s.monetdb.37725
+QUERY = CREATE TABLE products_new ("id" serial, like products); --error,
column id already exists
+ERROR = !CREATE TABLE: a column named 'id' already exists
+CODE = 42S21
+MAPI = (monetdb) /var/tmp/mtest-21642/.s.monetdb.37725
+QUERY = CREATE TABLE products_new2 (like products, like products); --error,
column id already exists
+ERROR = !CREATE TABLE: a column named 'id' already exists
+CODE = 42S21
+
+# 17:55:37 >
+# 17:55:37 > "Done."
+# 17:55:37 >
+
diff --git
a/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
@@ -0,0 +1,71 @@
+stdout of test 'table-duplicate-column.Bug-6729` in directory
'sql/test/BugTracker-2019` itself:
+
+
+# 17:55:36 >
+# 17:55:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37725" "--set"
"mapi_usock=/var/tmp/mtest-21642/.s.monetdb.37725" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019"
"--set" "embedded_c=true"
+# 17:55:36 >
+
+# MonetDB 5 server v11.33.4 (hg id: 551c00fc1950+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2019', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://localhost.localdomain:37725/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21642/.s.monetdb.37725
+# 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
