Changeset: b54f3fa1ebdb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b54f3fa1ebdb
Added Files:
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err
sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out
Removed Files:
sql/scripts/19_cluster.sql
Modified Files:
clients/mapiclient/mclient.1
clients/mapiclient/msqldump.1
sql/backends/monet5/sql_upgrades.c
sql/test/BugTracker-2015/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 465 to 300 lines):
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -451,4 +451,3 @@ for more information about the COPY INTO
.SH SEE ALSO
.IR msqldump (1),
.IR mserver5 (1)
-
diff --git a/clients/mapiclient/msqldump.1 b/clients/mapiclient/msqldump.1
--- a/clients/mapiclient/msqldump.1
+++ b/clients/mapiclient/msqldump.1
@@ -17,6 +17,30 @@ accelerators, SQL- and XML- frontends.
.I Msqldump
is the program to dump an MonetDB/SQL database.
The dump can be used to populate a new MonetDB/SQL database.
+.PP
+Before
+.I msqldump
+starts parsing command line options, it reads a
+.I .monetdb
+file.
+If the environment variable
+.B DOTMONETDBFILE
+is set, it reads the file pointed to by that variable instead.
+When unset,
+.I msqldump
+searches for a
+.I .monetdb
+file in the current working directory, and if that doesn't exist, in the
+current user's home directory.
+This file can contain defaults for the flags
+.BR user
+and
+.BR password .
+To disable reading the
+.I .monetdb
+file, set the variable
+.B DOTMONETDBFILE
+to the empty string in the environment.
.SH OPTIONS
.TP
\fB\-\-help\fP (\fB\-?\fP)
@@ -64,4 +88,3 @@ and the server.
.SH SEE ALSO
.IR mclient (1),
.IR mserver5 (1)
-
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1500,7 +1500,7 @@ sql_update_jul2015(Client c)
pos += snprintf(buf + pos, bufsize - pos,
- "insert into sys.systemfunctions (select id from
sys.functions where name in ('columnsize', 'ilike', 'imprintsize', 'like',
'querylog_calls', 'storage', 'storagemodel', 'tracelog') and schema_id =
(select id from sys.schemas where name = 'sys') and id not in (select
function_id from sys.systemfunctions));\n"
+ "insert into sys.systemfunctions (select id from
sys.functions where name in ('columnsize', 'epoch', 'ilike', 'imprintsize',
'like', 'querylog_calls', 'storage', 'storagemodel', 'tracelog') and schema_id
= (select id from sys.schemas where name = 'sys') and id not in (select
function_id from sys.systemfunctions));\n"
"delete from systemfunctions where function_id not in
(select id from functions);\n"
"update sys._tables set system = true where name in
('dependency_types', 'keywords', 'querylog_calls', 'querylog_history',
'statistics', 'storage', 'storagemodel', 'tables', 'tablestoragemodel',
'table_types', 'tracelog') and schema_id = (select id from sys.schemas where
name = 'sys');\n");
diff --git a/sql/scripts/19_cluster.sql b/sql/scripts/19_cluster.sql
deleted file mode 100644
--- a/sql/scripts/19_cluster.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- This Source Code Form is subject to the terms of the Mozilla Public
--- License, v. 2.0. If a copy of the MPL was not distributed with this
--- file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
--- Copyright 2008-2015 MonetDB B.V.
-
--- Clustering a relational table should be done with care.
--- For, the oid's are used in join-indices.
-
--- Clustering of tables may improve IO performance
--- The foreign key constraints should be dropped before
--- and re-established after the cluster operation.
-
-create procedure cluster1(sys string, tab string)
- external name sql.cluster1;
-
-create procedure cluster2(sys string, tab string)
- external name sql.cluster2;
-
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
@@ -40,3 +40,5 @@ cast_to_num.Bug-3744
null_is_null.Bug-3739
mergejoin_NULL.Bug-3747
epoch_now.Bug-3740
+schema_view2.Bug-3766
+create-temp-table-using-like.Bug-3767
diff --git
a/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.sql
@@ -0,0 +1,7 @@
+create table t1 (i int);
+create temp table tmp (like t1);
+select * from tmp;
+drop table tmp;
+
+drop table t1;
+
diff --git
a/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'create-temp-table-using-like.Bug-3767` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 00:02:47 >
+# 00:02:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35165" "--set"
"mapi_usock=/var/tmp/mtest-20552/.s.monetdb.35165" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 00:02:47 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/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 = 35165
+# cmdline opt mapi_usock = /var/tmp/mtest-20552/.s.monetdb.35165
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 00:02:47 >
+# 00:02:47 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20552" "--port=35165"
+# 00:02:47 >
+
+# 00:02:47 >
+# 00:02:47 > "Done."
+# 00:02:47 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2015/Tests/create-temp-table-using-like.Bug-3767.stable.out
@@ -0,0 +1,82 @@
+stdout of test 'create-temp-table-using-like.Bug-3767` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 00:02:47 >
+# 00:02:47 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35165" "--set"
"mapi_usock=/var/tmp/mtest-20552/.s.monetdb.35165" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 00:02:47 >
+
+# MonetDB 5 server v11.21.0
+# 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://riga.ins.cwi.nl:35165/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20552/.s.monetdb.35165
+# 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
+
+# 00:02:47 >
+# 00:02:47 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20552" "--port=35165"
+# 00:02:47 >
+
+#create table t1 (i int);
+#create temp table tmp (like t1);
+#select * from tmp;
+% sys.t1 # table_name
+% i # name
+% int # type
+% 1 # length
+#drop table tmp;
+#drop table t1;
+
+
+
+# 00:02:47 >
+# 00:02:47 > "Done."
+# 00:02:47 >
+
diff --git a/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql
b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.sql
@@ -0,0 +1,10 @@
+create table t1 (i int);
+create schema tst;
+create view tst.v1 (i) as select * from t1;
+select * from tst.v1;
+select * from _tables where name like '%v1%';
+create view tst.v1 (i) as select * from t1;
+drop view tst.v1;
+
+drop schema tst;
+drop table t1;
diff --git a/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'schema_view2.Bug-3766` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 16:30:14 >
+# 16:30:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37297" "--set"
"mapi_usock=/var/tmp/mtest-2635/.s.monetdb.37297" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:30:14 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/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 = 37297
+# cmdline opt mapi_usock = /var/tmp/mtest-2635/.s.monetdb.37297
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:30:15 >
+# 16:30:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2635" "--port=37297"
+# 16:30:15 >
+
+MAPI = (monetdb) /var/tmp/mtest-2635/.s.monetdb.37297
+QUERY = create view tst.v1 (i) as select * from t1;
+ERROR = !CREATE VIEW: name 'v1' already in use
+
+# 16:30:15 >
+# 16:30:15 > "Done."
+# 16:30:15 >
+
diff --git a/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out
b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view2.Bug-3766.stable.out
@@ -0,0 +1,88 @@
+stdout of test 'schema_view2.Bug-3766` in directory 'sql/test/BugTracker-2015`
itself:
+
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
