Changeset: a9ca51334e01 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a9ca51334e01
Modified Files:
sql/backends/monet5/vaults/csv/csv.c
sql/test/BugTracker-2024/Tests/All
sql/test/copy/Tests/All
Branch: Aug2024
Log Message:
Merge with 'Dec2023'
diffs (118 lines):
diff --git a/sql/backends/monet5/vaults/csv/csv.c
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -45,6 +45,7 @@ next_delim(const char *s, const char *e,
return s;
}
if (s <= e)
+ if (s <= e)
return s;
return NULL;
}
diff --git a/sql/test/BugTracker-2024/Tests/7542-column-name-resolution.test
b/sql/test/BugTracker-2024/Tests/7542-column-name-resolution.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7542-column-name-resolution.test
@@ -0,0 +1,13 @@
+
+-- https://github.com/MonetDB/MonetDB/issues/7542
+
+query I nosort
+WITH "E" AS ( SELECT 2 AS "F" )
+ SELECT 3 AS "Z" FROM (
+ SELECT "B"."X" FROM ( SELECT 2 AS "Y" FROM "E" ) AS "A"
+ LEFT OUTER JOIN ( SELECT 2 AS "X" ) AS "B" ON 1 = 1
+ ) AS "C"
+ ORDER BY "Z" DESC LIMIT 1
+----
+3
+
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -68,3 +68,4 @@ 7539-is-distinct-from
7537-prepare_stmt_with_dropped_table
7536-mclient-forgets-to-flush
7541-levenshtein
+7542-column-name-resolution
diff --git a/sql/test/copy/Tests/All b/sql/test/copy/Tests/All
--- a/sql/test/copy/Tests/All
+++ b/sql/test/copy/Tests/All
@@ -17,3 +17,4 @@ columns
no_escape
no_escape2
crlf_normalization
+select-from-file
diff --git a/sql/test/copy/Tests/aapnootmies.csv
b/sql/test/copy/Tests/aapnootmies.csv
new file mode 100644
--- /dev/null
+++ b/sql/test/copy/Tests/aapnootmies.csv
@@ -0,0 +1,3 @@
+1|aap
+2|noot
+3|mies
diff --git a/sql/test/copy/Tests/select-from-file.test.in
b/sql/test/copy/Tests/select-from-file.test.in
new file mode 100644
--- /dev/null
+++ b/sql/test/copy/Tests/select-from-file.test.in
@@ -0,0 +1,60 @@
+query IT rowsort
+SELECT * FROM R'$TSTSRCDIR/aapnootmies.csv';
+----
+1
+aap
+2
+noot
+3
+mies
+
+statement ok
+DROP TABLE IF EXISTS foo;
+
+statement ok
+CREATE TABLE foo(i INT, t TEXT);
+
+statement ok
+INSERT INTO foo SELECT * FROM R'$TSTSRCDIR/aapnootmies.csv';
+
+query IT rowsort
+SELECT * FROM foo;
+----
+1
+aap
+2
+noot
+3
+mies
+
+query IT nosort
+SELECT * FROM R'$TSTSRCDIR/aapnootmies.csv' ORDER BY name_1;
+----
+1
+aap
+3
+mies
+2
+noot
+
+query IT nosort
+SELECT * FROM R'$TSTSRCDIR/aapnootmies.csv' WHERE name_1 = 'aap';
+----
+1
+aap
+
+query IT rowsort
+SELECT count(name_0), name_1 FROM R'$TSTSRCDIR/aapnootmies.csv' GROUP BY
name_1;
+----
+1
+aap
+1
+mies
+1
+noot
+
+query IT nosort
+SELECT * FROM R'$TSTSRCDIR/aapnootmies.csv' a WHERE a.name_1 = 'aap';
+----
+1
+aap
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
