Changeset: abb0465976b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abb0465976b8
Added Files:
sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.sql
sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err
sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.out
Modified Files:
sql/server/rel_schema.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
Check whether foreign key was already added.
This should fix bug 3820 by making the precondition for the crash
impossible.
diffs (202 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
@@ -459,6 +459,9 @@ table_foreign_key(mvc *sql, char *name,
if (!ft) {
sql_error(sql, 02, "42S02!CONSTRAINT FOREIGN KEY: no such table
'%s'\n", rtname);
return SQL_ERR;
+ } else if (list_find_name(t->keys.set, name)) {
+ sql_error(sql, 02, "42000!CONSTRAINT FOREIGN KEY: key '%s'
already exists", name);
+ return SQL_ERR;
} else {
sql_key *rk = NULL;
sql_fkey *fk;
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
@@ -66,4 +66,5 @@ not-like-without-wildcard.Bug-3811
copy_into.Bug-3813
select-tilde-arg.Bug-3814
crash_in_reduce_groupby.Bug-3818
+duplicate-constraint.Bug-3820
case_type.Bug-3821
diff --git a/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.sql
b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.sql
@@ -0,0 +1,30 @@
+start transaction;
+
+CREATE TABLE exchange (
+ pk_symbol VARCHAR(16) NOT NULL,
+ name VARCHAR(128) NOT NULL,
+ CONSTRAINT exchange_pk PRIMARY KEY (pk_symbol)
+);
+
+CREATE TABLE entity (
+ pk_uuid UUID NOT NULL,
+ name VARCHAR(128) NOT NULL,
+ industry VARCHAR(64),
+ category VARCHAR(64),
+ subcategory VARCHAR(64),
+ CONSTRAINT entity_pk PRIMARY KEY (pk_uuid)
+);
+
+CREATE TABLE instrument (
+ pk_uuid UUID NOT NULL,
+ symbol VARCHAR(32) NOT NULL,
+ fk_exchange VARCHAR(16) NOT NULL,
+ fk_entity_uuid UUID NOT NULL,
+ CONSTRAINT instrument_pk PRIMARY KEY (pk_uuid),
+-- INCORRECT DOUBLE CONSTRAINT
+ CONSTRAINT instrument_exchange_fk FOREIGN KEY (fk_exchange) REFERENCES
exchange (pk_symbol),
+ CONSTRAINT instrument_exchange_fk FOREIGN KEY (fk_exchange) REFERENCES
exchange (pk_symbol),
+ CONSTRAINT instrument_entity_fk FOREIGN KEY (fk_entity_uuid) REFERENCES
entity (pk_uuid)
+);
+
+rollback;
diff --git
a/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err
b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.err
@@ -0,0 +1,49 @@
+stderr of test 'duplicate-constraint.Bug-3820` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 13:08:15 >
+# 13:08:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33935" "--set"
"mapi_usock=/var/tmp/mtest-7920/.s.monetdb.33935" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 13:08:15 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/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 = 33935
+# cmdline opt mapi_usock = /var/tmp/mtest-7920/.s.monetdb.33935
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 13:08:16 >
+# 13:08:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7920" "--port=33935"
+# 13:08:16 >
+
+MAPI = (monetdb) /var/tmp/mtest-7920/.s.monetdb.33935
+QUERY = CREATE TABLE instrument (
+ pk_uuid UUID NOT NULL,
+ symbol VARCHAR(32) NOT NULL,
+ fk_exchange VARCHAR(16) NOT NULL,
+ fk_entity_uuid UUID NOT NULL,
+ CONSTRAINT instrument_pk PRIMARY KEY (pk_uuid),
+ -- INCORRECT DOUBLE CONSTRAINT
+ CONSTRAINT instrument_exchange_fk FOREIGN KEY (fk_exchange)
REFERENCES exchange (pk_symbol),
+ CONSTRAINT instrument_exchange_fk FOREIGN KEY (fk_exchange)
REFERENCES exchange (pk_symbol),
+ CONSTRAINT instrument_entity_fk FOREIGN KEY (fk_entity_uuid)
REFERENCES entity (pk_uuid)
+ERROR = !CONSTRAINT FOREIGN KEY: key 'instrument_exchange_fk' already exists
+
+# 13:08:16 >
+# 13:08:16 > "Done."
+# 13:08:16 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.out
b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/duplicate-constraint.Bug-3820.stable.out
@@ -0,0 +1,86 @@
+stdout of test 'duplicate-constraint.Bug-3820` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 13:08:15 >
+# 13:08:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33935" "--set"
"mapi_usock=/var/tmp/mtest-7920/.s.monetdb.33935" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 13:08:15 >
+
+# MonetDB 5 server v11.21.6 (hg id: 2fdf65f25ee3+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 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://madrid.ins.cwi.nl:33935/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7920/.s.monetdb.33935
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# 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: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.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_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.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
+
+# 13:08:16 >
+# 13:08:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7920" "--port=33935"
+# 13:08:16 >
+
+#start transaction;
+#CREATE TABLE exchange (
+# pk_symbol VARCHAR(16) NOT NULL,
+# name VARCHAR(128) NOT NULL,
+# CONSTRAINT exchange_pk PRIMARY KEY (pk_symbol)
+#);
+#CREATE TABLE entity (
+# pk_uuid UUID NOT NULL,
+# name VARCHAR(128) NOT NULL,
+# industry VARCHAR(64),
+# category VARCHAR(64),
+# subcategory VARCHAR(64),
+# CONSTRAINT entity_pk PRIMARY KEY (pk_uuid)
+#);
+#rollback;
+
+# 13:08:16 >
+# 13:08:16 > "Done."
+# 13:08:16 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
