Changeset: a294cafd5cac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a294cafd5cac
Added Files:
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out
Modified Files:
NT/mksqlwxs.py
monetdb5/modules/mal/tablet.c
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (173 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -116,7 +116,7 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(features, id, 16,
- [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
print(r' </Directory>')
id = comp(features, id, 14,
[r'lib\libbat.lib',
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1030,7 +1030,7 @@ SQLload_parse_line(READERtask *task, int
endoffieldcheck:
;
/* check for user defined NULL string */
- if (!fmt->skip && (!quote || !fmt->null_length) &&
fmt->nullstr && task->fields[i][idx] && strncasecmp(task->fields[i][idx],
fmt->nullstr, fmt->null_length + 1) == 0)
+ if ((!quote || !fmt->null_length) && fmt->nullstr &&
task->fields[i][idx] && strncasecmp(task->fields[i][idx], fmt->nullstr,
fmt->null_length + 1) == 0)
task->fields[i][idx] = 0;
}
} else {
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -17,3 +17,4 @@ aggr-in-case.Bug-6526
crash-orderby-alias.Bug-6527
sqlitelogictest-in-cast-null.Bug-6529
sqlitelogictest-not-in-wrong-results.Bug-6530
+copy-into-ignore-column-1.Bug-6532
diff --git
a/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
@@ -0,0 +1,6 @@
+start transaction;
+create table t (id int auto_increment, a clob);
+copy 1 records into t (a) from stdin (id, a) using delimiters ',','\n','"'
null as '';
+100,
+select count(a) from t;
+rollback;
diff --git
a/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'copy-into-ignore-column-1.Bug-6532` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 09:58:35 >
+# 09:58:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39926" "--set"
"mapi_usock=/var/tmp/mtest-26747/.s.monetdb.39926" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 09:58:35 >
+
+# 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 = 39926
+# cmdline opt mapi_usock = /var/tmp/mtest-26747/.s.monetdb.39926
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 553648138
+
+# 09:58:35 >
+# 09:58:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26747" "--port=39926"
+# 09:58:35 >
+
+
+# 09:58:36 >
+# 09:58:36 > "Done."
+# 09:58:36 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.stable.out
@@ -0,0 +1,84 @@
+stdout of test 'copy-into-ignore-column-1.Bug-6532` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 09:58:35 >
+# 09:58:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39926" "--set"
"mapi_usock=/var/tmp/mtest-26747/.s.monetdb.39926" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 09:58:35 >
+
+# MonetDB 5 server v11.27.14 (hg id: e2fda4b58c9f+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 62.695 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:39926/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26747/.s.monetdb.39926
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python2 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: 18_index.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: 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: 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
+
+# 09:58:35 >
+# 09:58:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26747" "--port=39926"
+# 09:58:35 >
+
+#start transaction;
+#create table t (id int auto_increment, a clob);
+#copy 1 records into t (a) from stdin (id, a) using delimiters ',','\n','"'
null as '';
+#100,
+[ 1 ]
+#select count(a) from t;
+% sys.L4 # table_name
+% L3 # name
+% bigint # type
+% 1 # length
+[ 0 ]
+#rollback;
+
+# 09:58:36 >
+# 09:58:36 > "Done."
+# 09:58:36 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
