Changeset: 540c9bf8377d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=540c9bf8377d Added Files: sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out Modified Files: sql/backends/monet5/sql.c sql/server/rel_schema.c sql/server/rel_select.c sql/test/BugTracker-2016/Tests/All Branch: default Log Message:
merged with Jun2016 diffs (247 lines): diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c --- a/sql/backends/monet5/sql.c +++ b/sql/backends/monet5/sql.c @@ -3955,6 +3955,7 @@ str_2time_daytimetz(daytime *res, const else pos = daytime_fromstr(*v, &len, &res); if (!pos || pos < (int)strlen(*v)) + if (!pos || pos < (int)strlen(*v) || ATOMcmp(TYPE_daytime, res, ATOMnilptr(TYPE_daytime)) == 0) throw(SQL, "daytime", "22007!daytime (%s) has incorrect format", *v); return daytime_2time_daytime(res, res, digits); } @@ -4030,7 +4031,7 @@ str_2time_timestamptz(timestamp *res, co pos = timestamp_tz_fromstr(*v, &len, &res); else pos = timestamp_fromstr(*v, &len, &res); - if (!pos || pos < (int)strlen(*v)) + if (!pos || pos < (int)strlen(*v) || ATOMcmp(TYPE_timestamp, res, ATOMnilptr(TYPE_timestamp)) == 0) throw(SQL, "timestamp", "22007!timestamp (%s) has incorrect format", *v); return timestamp_2time_timestamp(res, res, digits); } 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 @@ -941,6 +941,9 @@ rel_create_table(mvc *sql, sql_schema *s if (!sq) return NULL; + if ((tt == tt_merge_table || tt == tt_remote || tt == tt_replica_table) && with_data) + return sql_error(sql, 02, "42000!CREATE TABLE: cannot create %s table 'with data'", tt == tt_merge_table?"MERGE TABLE":tt == tt_remote?"REMOTE TABLE":"REPLICA TABLE"); + /* create table */ if ((t = mvc_create_table_as_subquery( sql, sq, s, name, column_spec, temp, commit_action)) == NULL) { rel_destroy(sq); diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -3025,10 +3025,10 @@ rel_binop_(mvc *sql, sql_exp *l, sql_exp node *m = f->func->ops->h; sql_arg *a = m->data; + prev = f; if (!check_card(card,f)) continue; - prev = f; l = rel_check_type(sql, &a->type, l, type_equal); a = m->next->data; r = rel_check_type(sql, &a->type, r, type_equal); diff --git a/sql/test/BugTracker-2016/Tests/All b/sql/test/BugTracker-2016/Tests/All --- a/sql/test/BugTracker-2016/Tests/All +++ b/sql/test/BugTracker-2016/Tests/All @@ -42,3 +42,5 @@ HAVE_GEOM?nested-mal-with-multiplex.Bug- querylog trigger_bulk.Bug-4045 innerjoin-leftjoin-or.Bug-4049 +create_merge_table_withdata.Bug-4041 +timestamp_with_tz_fromstr.Bug-4019 diff --git a/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql @@ -0,0 +1,9 @@ + +create table other_table (i1 int, i2 int); +insert into other_table values(1,2); + +create merge table mt as select * from other_table limit 1; + +create merge table mt as select * from other_table limit 1 with no data; +drop table mt;; +drop table other_table;; diff --git a/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err @@ -0,0 +1,38 @@ +stderr of test 'create_merge_table_withdata.Bug-4041` in directory 'sql/test/BugTracker-2016` itself: + + +# 15:43:39 > +# 15:43:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33213" "--set" "mapi_usock=/var/tmp/mtest-10452/.s.monetdb.33213" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 15:43:39 > + +# 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 = 33213 +# cmdline opt mapi_usock = /var/tmp/mtest-10452/.s.monetdb.33213 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 15:43:40 > +# 15:43:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10452" "--port=33213" +# 15:43:40 > + +MAPI = (monetdb) /var/tmp/mtest-10452/.s.monetdb.33213 +QUERY = create merge table mt as select * from other_table limit 1; +ERROR = !CREATE TABLE: cannot create MERGE TABLE table 'with data' + +# 15:43:40 > +# 15:43:40 > "Done." +# 15:43:40 > + diff --git a/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out @@ -0,0 +1,38 @@ +stdout of test 'create_merge_table_withdata.Bug-4041` in directory 'sql/test/BugTracker-2016` itself: + + +# 15:43:39 > +# 15:43:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33213" "--set" "mapi_usock=/var/tmp/mtest-10452/.s.monetdb.33213" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 15:43:39 > + +# MonetDB 5 server v11.23.8 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 7.332 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:33213/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10452/.s.monetdb.33213 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 15:43:40 > +# 15:43:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10452" "--port=33213" +# 15:43:40 > + +#create table other_table (i1 int, i2 int); +#insert into other_table values(1,2); +[ 1 ] +#create merge table mt as select * from other_table limit 1 with no data; +#drop table mt;; +#drop table other_table;; + +# 15:43:40 > +# 15:43:40 > "Done." +# 15:43:40 > + diff --git a/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql @@ -0,0 +1,2 @@ +select cast('2015-12-08T00:46:60' as timestamp); +select cast('2015-12-08 00:46:60' as timestamp); diff --git a/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err @@ -0,0 +1,41 @@ +stderr of test 'timestamp_with_tz_fromstr.Bug-4019` in directory 'sql/test/BugTracker-2016` itself: + + +# 16:31:48 > +# 16:31:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32740" "--set" "mapi_usock=/var/tmp/mtest-1703/.s.monetdb.32740" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 16:31:48 > + +# 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 = 32740 +# cmdline opt mapi_usock = /var/tmp/mtest-1703/.s.monetdb.32740 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 16:31:49 > +# 16:31:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1703" "--port=32740" +# 16:31:49 > + +MAPI = (monetdb) /var/tmp/mtest-1703/.s.monetdb.32740 +QUERY = select cast('2015-12-08T00:46:60' as timestamp); +ERROR = !timestamp (2015-12-08T00:46:60) has incorrect format +MAPI = (monetdb) /var/tmp/mtest-1703/.s.monetdb.32740 +QUERY = select cast('2015-12-08 00:46:60' as timestamp); +ERROR = !timestamp (2015-12-08 00:46:60) has incorrect format + +# 16:31:49 > +# 16:31:49 > "Done." +# 16:31:49 > + diff --git a/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out @@ -0,0 +1,32 @@ +stdout of test 'timestamp_with_tz_fromstr.Bug-4019` in directory 'sql/test/BugTracker-2016` itself: + + +# 16:31:48 > +# 16:31:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32740" "--set" "mapi_usock=/var/tmp/mtest-1703/.s.monetdb.32740" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 16:31:48 > + +# MonetDB 5 server v11.23.8 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 7.332 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32740/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1703/.s.monetdb.32740 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 16:31:49 > +# 16:31:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1703" "--port=32740" +# 16:31:49 > + + +# 16:31:49 > +# 16:31:49 > "Done." +# 16:31:49 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list