Changeset: b993662849a4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b993662849a4
Modified Files:
monetdb5/modules/mal/tablet.c
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (42 lines):
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
@@ -988,10 +988,10 @@ SQLload_parse_line(READERtask *task, int
errmsg[0] = 0;
if (task->quote || task->seplen != 1) {
- for (i = 0; *line && i < as->nr_attrs; i++) {
+ for (i = 0; i < as->nr_attrs; i++) {
task->fields[i][idx] = line;
/* recognize fields starting with a quote, keep them */
- if (*line == task->quote) {
+ if (*line && *line == task->quote) {
#ifdef _DEBUG_TABLET_
mnstr_printf(GDKout, "before #1 %s\n", s =
line);
#endif
diff --git a/sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out
b/sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out
--- a/sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out
+++ b/sql/test/BugTracker-2015/Tests/copy_into.Bug-3813.stable.out
@@ -66,11 +66,17 @@ Ready.
#START TRANSACTION;
#CREATE TABLE bug3813 ("playerID" STRING, "yearID" INTEGER, stint INTEGER,
"teamID" STRING, "lgID" STRING, "G" INTEGER, "AB" INTEGER, "R" INTEGER, "H"
INTEGER, "X2B" INTEGER, "X3B" INTEGER, "HR" INTEGER, "RBI" INTEGER, "SB"
INTEGER, "CS" INTEGER, "BB" INTEGER, "SO" INTEGER, "IBB" INTEGER, "HBP"
INTEGER, "SH" INTEGER, "SF" INTEGER, "GIDP" INTEGER);
+#COPY INTO bug3813 FROM
'/home/sjoerd/src/MonetDB/stable/sql/test/BugTracker-2015/Tests/batting.csv.gz'
USING DELIMITERS ',','\n','"' NULL AS '';
+[ 99846 ]
+#SELECT COUNT(*) FROM bug3813;
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 5 # length
+[ 99846 ]
#ROLLBACK;
-! Correct/expected stable output need to provided/approved !
+# 13:29:23 >
+# 13:29:23 > "Done."
+# 13:29:23 >
-# 15:06:50 >
-# 15:06:50 > "Done."
-# 15:06:50 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
