Changeset: 5b3d38540bac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b3d38540bac
Modified Files:
clients/examples/perl/countries.sql
geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
geom/sql/pg_regression/Tests/clean.sql
sql/backends/monet5/Tests/limithack.sql
sql/backends/monet5/Tests/rapi15.sql
sql/benchmarks/alex/load.sql
sql/benchmarks/arno/load.int.sql
sql/benchmarks/arno_flt/load.flt.sql
sql/benchmarks/hist-uva/ground/load.sql
sql/benchmarks/ssbm/Tests/load-sf-0.01.sql
sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
sql/benchmarks/tpch/load-sf-0.01.sql
sql/benchmarks/tpch/load-sf-1.sql
sql/benchmarks/viam/Tests/dump.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/inlined_copy_into.SF-922392.sql
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.sql
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.sql
sql/test/BugTracker-2008/Tests/copy-count.SF-2485215.sql
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.sql
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.sql
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2008/insert-null-byte.sql
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.sql
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err
sql/test/BugTracker-2009/Tests/nullstr.SF-2704016.sql
sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql
sql/test/BugTracker-2010/Tests/cast-varchar.Bug-2682.sql
sql/test/BugTracker-2010/Tests/delete_insert.Bug-2529.sql
sql/test/BugTracker-2010/Tests/embedded_record_seperator.SF-2991400.sql
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.sql
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
sql/test/BugTracker-2010/Tests/heap_combine_crash.SF-2947763.sql
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.sql
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2010/Tests/multiple-common-table-expressions.Bug-2664.sql
sql/test/BugTracker-2010/Tests/reorder.SF-2995671.sql
sql/test/BugTracker-2011/Tests/FK_self_reference.Bug-2862.sql
sql/test/BugTracker-2011/Tests/copy-into-file-error.Bug-2722.sql
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
sql/test/BugTracker-2011/Tests/device-self-ref-fk.sql
sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql
sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.sql
sql/test/BugTracker-2011/Tests/operands-not-synced.Bug-2346.sql
sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.sql
sql/test/BugTracker-2012/Tests/hash_select.Bug-2947.sql
sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.sql
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql
sql/test/BugTracker-2013/Tests/copy-into-decimal.Bug-3265.sql
sql/test/BugTracker-2013/Tests/copy-out-quote.Bug-3393.sql
sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
sql/test/BugTracker-2013/Tests/median-null.Bug-3280.sql
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/udf_error.Bug-3396.sql
sql/test/BugTracker-2014/Tests/copy_decimal_into.Bug-3596.sql
sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.sql
sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stable.err
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.sql
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.err
sql/test/BugTracker-2015/Tests/import-non-ascii.Bug-3864.sql
sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.sql
sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.sql
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.sql
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.sql
sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.sql
sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.sql
sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.sql
sql/test/BugTracker-2017/Tests/empty-interval.Bug-6184.sql
sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.sql
sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql
sql/test/BugTracker-2018/Tests/copy-into-ignore-column-1.Bug-6532.sql
sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.sql
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.sql
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_into_crash.SF-1993999.sql
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.sql
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/BugTracker/Tests/variable_stack_crash_load.SF-1711251.sql
sql/test/BugTracker/Tests/with_row_number.SF-1898089.sql
sql/test/Skyserver/Skyserver_functions.sql
sql/test/Skyserver/Skyserver_functions_v6.sql
sql/test/Skyserver/Skyserver_import.sql
sql/test/Skyserver/Skyserver_import_v6.sql
sql/test/Skyserver/bugs/Tests/load_dbobjects.sql
sql/test/Skyserver/bugs/Tests/load_objmask.sql
sql/test/Tests/fsum.sql
sql/test/Tests/load_with_offset.sql
sql/test/Tests/lz4-dump.sql
sql/test/VOC/load.sql
sql/test/Via-m/create-viam.sql
sql/test/bugs/Tests/copy_into_quote.sql
sql/test/bugs/Tests/copy_into_with_schema.sql
sql/test/bugs/Tests/crash_order_by.sql
sql/test/bugs/Tests/decimal_copy_into_bug.sql
sql/test/bugs/Tests/ifthenelse_bug.sql
sql/test/bugs/Tests/in.sql
sql/test/bugs/Tests/order_limit_offset_bug.sql
sql/test/bugs/Tests/rangejoin_optimize_bug.sql
sql/test/bugs/Tests/simple_view.sql
sql/test/bugs/Tests/substring_limit_bug.sql
sql/test/bugs/insert_delete-bug-sf-904025.sql
sql/test/copy/Tests/columns.sql
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/embedded_sep.sql
sql/test/copy/Tests/escaped_char.sql
sql/test/copy/Tests/format_date.sql
sql/test/copy/Tests/incorrect_columns.sql
sql/test/copy/Tests/ingestion.sql
sql/test/copy/Tests/int_parse.sql
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/int_parse_best.sql
sql/test/copy/Tests/key_copy.sql
sql/test/copy/Tests/key_copy.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.sql
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/null_as_string.sql
sql/test/copy/Tests/null_as_string_errors.sql
sql/test/copy/Tests/null_as_string_errors.stable.err
sql/test/copy/Tests/null_as_string_output.sql
sql/test/copy/Tests/overflow_error.sql
sql/test/group-concat/Tests/groupconcat04.sql
sql/test/group-concat/Tests/groupconcat05.sql
sql/test/json/Tests/jsonvalidity.Bug-3753.sql
sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
sql/test/json/Tests/pgexample.sql
sql/test/mergetables/Tests/crash0.sql
sql/test/mergetables/Tests/forex.sql
sql/test/mergetables/Tests/mergedb_create.sql
sql/test/mergetables/Tests/mergedrop.sql
sql/test/mergetables/Tests/mergedropcascade.sql
sql/test/mergetables/Tests/mergekey.sql
sql/test/mergetables/Tests/mergeload.sql
sql/test/mergetables/Tests/mergeloadidx.sql
sql/test/mergetables/Tests/mergemergeload.sql
sql/test/mergetables/Tests/mergemergeload.stable.err
sql/test/mergetables/Tests/mergequery.sql
sql/test/mergetables/Tests/singlekeyconstraint.sql
sql/test/news.sql
sql/test/osm/Tests/delete_alter_bug.sql
sql/test/pg_regress/Tests/arrays.sql
sql/test/pg_regress/Tests/arrays.stable.err
sql/test/pg_regress/Tests/int8.sql
sql/test/pg_regress/Tests/int8.stable.err.int128
sql/test/pg_regress/Tests/numeric.sql
sql/test/pg_regress/Tests/numeric.stable.err
sql/test/pg_regress/Tests/numeric.stable.out.FreeBSD.int128
sql/test/pg_regress/Tests/numeric.stable.out.int128
sql/test/pg_regress/Tests/timestamp.sql
sql/test/pg_regress/Tests/timestamp.stable.err
sql/test/pg_regress/Tests/timestamptz.sql
sql/test/pg_regress/Tests/timestamptz.stable.err
sql/test/pg_regress/Tests/type_sanity.sql
sql/test/quantiles/Tests/quantiles.sql
sql/test/rank.sql
sql/test/testdb/Tests/load.sql
sql/test/thinksql-load.sql
sql/test/utf8/load.sql
sql/test/xquery/Tests/create.sql
Branch: default
Log Message:
Use E'...' escaped strings for strings with backslashes.
diffs (truncated from 3589 to 300 lines):
diff --git a/clients/examples/perl/countries.sql
b/clients/examples/perl/countries.sql
--- a/clients/examples/perl/countries.sql
+++ b/clients/examples/perl/countries.sql
@@ -3,7 +3,7 @@ CREATE TABLE countries (
cty_name VARCHAR(256),
cty_code VARCHAR(32)
);
-COPY INTO countries FROM STDIN USING DELIMITERS '\t','\n','"' NULL AS '';
+COPY INTO countries FROM STDIN USING DELIMITERS E'\t',E'\n','"' NULL AS '';
AFGHANISTAN .af
ÅLAND ISLANDS .ax
ALBANIA .al
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.sql
@@ -1,6 +1,6 @@
CREATE TABLE nodes (id serial, p GEOMETRY(POINT));
insert into nodes (id, p) values (45111955, 'POINT(52.0697 4.3723)');
-COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
+COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', E'\n';
45111956, 'POINT(52.0697 4.3723)'
drop table nodes;
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,8 +10,8 @@ stderr of test 'copy_into_crash.SF-19754
# 11:37:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423
# 11:37:42 >
-MAPI = (monetdb) /var/tmp/mtest-27003/.s.monetdb.30235
-QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
+MAPI = (monetdb) /var/tmp/mtest-25355/.s.monetdb.36316
+QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', E'\n';
45111956, 'POINT(52.0697 4.3723)'
ERROR = !Failed to import table 'nodes', line 1 field p 'geometry(4)' expected
in ' 'POINT(52.0697 4.3723)''
CODE = 42000
diff --git a/geom/sql/pg_regression/Tests/clean.sql
b/geom/sql/pg_regression/Tests/clean.sql
--- a/geom/sql/pg_regression/Tests/clean.sql
+++ b/geom/sql/pg_regression/Tests/clean.sql
@@ -2,7 +2,7 @@ CREATE TABLE clean_cases (origin varchar
orig geometry,
valid geometry);
-COPY 22 RECORDS INTO clean_cases FROM stdin USING DELIMITERS '|','\n';
+COPY 22 RECORDS INTO clean_cases FROM stdin USING DELIMITERS '|',E'\n';
RT|1|0103000000010000000700000000000000000000400000000000000040000000000000184000000000000000C000000000000024400000000000000040000000000000244000000000000000C000000000000018400000000000000040000000000000004000000000000000C000000000000000400000000000000040|010600000003000000010300000001000000040000000000000000000040000000000000004000000000000010400000000000000000000000000000004000000000000000C0000000000000004000000000000000400103000000010000000500000000000000000020400000000000000000000000000000184000000000000000C0000000000000104000000000000000000000000000001840000000000000004000000000000020400000000000000000010300000001000000040000000000000000002040000000000000000000000000000024400000000000000040000000000000244000000000000000C000000000000020400000000000000000
RT|2|01030000000100000007000000000000000000284000000000000000C000000000000028400000000000000040000000000000304000000000000000000000000000002C40000000000000000000000000000032400000000000000040000000000000324000000000000000C0000000000000284000000000000000C0|01030000000200000006000000000000000000284000000000000000C0000000000000284000000000000000400000000000002E40000000000000E03F00000000000032400000000000000040000000000000324000000000000000C0000000000000284000000000000000C0040000000000000000002E40000000000000E03F0000000000002C400000000000000000000000000000304000000000000000000000000000002E40000000000000E03F
RT|3|01030000000100000006000000000000000000004000000000000010400000000000000040000000000000184000000000000010400000000000001040000000000000184000000000000018400000000000001840000000000000104000000000000000400000000000001040|01060000000200000001030000000100000004000000000000000000004000000000000010400000000000000040000000000000184000000000000010400000000000001040000000000000004000000000000010400103000000010000000400000000000000000010400000000000001040000000000000184000000000000018400000000000001840000000000000104000000000000010400000000000001040
diff --git a/sql/backends/monet5/Tests/limithack.sql
b/sql/backends/monet5/Tests/limithack.sql
--- a/sql/backends/monet5/Tests/limithack.sql
+++ b/sql/backends/monet5/Tests/limithack.sql
@@ -11,7 +11,7 @@ CREATE TABLE "sys"."tbls" (
"readonly" BOOLEAN,
"temporary" SMALLINT
);
-COPY 40 RECORDS INTO "sys"."tbls" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 40 RECORDS INTO "sys"."tbls" FROM stdin USING DELIMITERS E'\t',E'\n','"';
2001 "schemas" 2000 NULL 0 true 0 false 0
2007 "types" 2000 NULL 0 true 0 false 0
2016 "functions" 2000 NULL 0 true 0 false 0
diff --git a/sql/backends/monet5/Tests/rapi15.sql
b/sql/backends/monet5/Tests/rapi15.sql
--- a/sql/backends/monet5/Tests/rapi15.sql
+++ b/sql/backends/monet5/Tests/rapi15.sql
@@ -2,7 +2,7 @@ start transaction;
create table "Marketing_Loyalty_4700298d-9862-40b3-9028-b0f15dab9dea"
("Consumer Number" INTEGER,"1-Disloyalty" varchar(250),"2-Age"
varchar(250),"3-Amount transferred" INTEGER,"4-Gender" varchar(250),"5-Citiz
enship" varchar(250),"6- Profession" varchar(250),"7-City" varchar(250),"8-1 NC
Billboard" varchar(250),"8-2 NC Friends" varchar(250),"8-3 NC Magazine"
varchar(250),"8-4 NC Others" varchar(250),"9-Score" decimal(18,3),"10- Type of
operation" varchar(250),"11-1 Welcoming" INTEGER,"11-2 Waiting time"
INTEGER,"11-3 Time to finish request" INTEGER,"11-4 Fees" INTEGER,"11-5
Courtesy of employees" INTEGER,"11-6 Branch layout" INTEGER,"11-7 Attention to
special requests" INTEGER,"12- Total time for service" decimal(18,3),"13-
Distance from POS" decimal(18,3),"14- Weight" INTEGER);
-COPY 233 offset 2 records INTO
"Marketing_Loyalty_4700298d-9862-40b3-9028-b0f15dab9dea" FROM stdin USING
DELIMITERS ',','\n','"' null as '';
+COPY 233 offset 2 records INTO
"Marketing_Loyalty_4700298d-9862-40b3-9028-b0f15dab9dea" FROM stdin USING
DELIMITERS ',',E'\n','"' null as '';
,,,,Female
,Citizen,Employee,Suburbs,No,No,No,No,,International,6,5,3,6,6,2,2,10.27,1.5,75,
2,Loyal,[21-30],3,Male
,Resident,Employee,Cities,No,Yes,No,No,9.51,Local,2,6,8,2,2,1,4,10.44,1.8,78,
3,Loyal,[21-30],3,Male,Resident,Employee,Suburbs,Yes,No,Yes,No,6.67,Local,5,2,8,4,7,8,3,14.34,2.2,75,
diff --git a/sql/benchmarks/alex/load.sql b/sql/benchmarks/alex/load.sql
--- a/sql/benchmarks/alex/load.sql
+++ b/sql/benchmarks/alex/load.sql
@@ -1,4 +1,4 @@
-COPY 9600000 RECORDS INTO earth from 'PWD/earth.tab' USING DELIMITERS ',','\n';
-COPY 10092544 RECORDS INTO tomo from 'PWD/tomo.tab' USING DELIMITERS ',','\n';
---COPY 96 RECORDS INTO earth from 'PWD/earth.tab' USING DELIMITERS ',','\n';
---COPY 100 RECORDS INTO tomo from 'PWD/tomo.tab' USING DELIMITERS ',','\n';
+COPY 9600000 RECORDS INTO earth from 'PWD/earth.tab' USING DELIMITERS
',',E'\n';
+COPY 10092544 RECORDS INTO tomo from 'PWD/tomo.tab' USING DELIMITERS ',',E'\n';
+--COPY 96 RECORDS INTO earth from 'PWD/earth.tab' USING DELIMITERS ',',E'\n';
+--COPY 100 RECORDS INTO tomo from 'PWD/tomo.tab' USING DELIMITERS ',',E'\n';
diff --git a/sql/benchmarks/arno/load.int.sql b/sql/benchmarks/arno/load.int.sql
--- a/sql/benchmarks/arno/load.int.sql
+++ b/sql/benchmarks/arno/load.int.sql
@@ -1,5 +1,5 @@
START TRANSACTION;
-COPY INTO atom from 'PWD/ATOM.int.tbl' USING DELIMITERS ',','\n';
-COPY INTO bond from 'PWD/BOND.int.tbl' USING DELIMITERS ',','\n';
-COPY INTO model from 'PWD/MODEL.int.tbl' USING DELIMITERS ',','\n';
+COPY INTO atom from 'PWD/ATOM.int.tbl' USING DELIMITERS ',',E'\n';
+COPY INTO bond from 'PWD/BOND.int.tbl' USING DELIMITERS ',',E'\n';
+COPY INTO model from 'PWD/MODEL.int.tbl' USING DELIMITERS ',',E'\n';
commit;
diff --git a/sql/benchmarks/arno_flt/load.flt.sql
b/sql/benchmarks/arno_flt/load.flt.sql
--- a/sql/benchmarks/arno_flt/load.flt.sql
+++ b/sql/benchmarks/arno_flt/load.flt.sql
@@ -1,4 +1,4 @@
-COPY INTO atom from 'PWD/ATOM.flt.tbl' USING DELIMITERS ',','\n';
-COPY INTO bond from 'PWD/BOND.flt.tbl' USING DELIMITERS ',','\n';
-COPY INTO model from 'PWD/MODEL.flt.tbl' USING DELIMITERS ',','\n';
+COPY INTO atom from 'PWD/ATOM.flt.tbl' USING DELIMITERS ',',E'\n';
+COPY INTO bond from 'PWD/BOND.flt.tbl' USING DELIMITERS ',',E'\n';
+COPY INTO model from 'PWD/MODEL.flt.tbl' USING DELIMITERS ',',E'\n';
commit;
diff --git a/sql/benchmarks/hist-uva/ground/load.sql
b/sql/benchmarks/hist-uva/ground/load.sql
--- a/sql/benchmarks/hist-uva/ground/load.sql
+++ b/sql/benchmarks/hist-uva/ground/load.sql
@@ -1,2 +1,2 @@
-COPY 100000 RECORDS INTO histogram256_tab from 'PWD/data.tab' USING DELIMITERS
',','\n';
---COPY 100 RECORDS INTO histogram256_tab from 'PWD/data.tab' USING DELIMITERS
',','\n';
+COPY 100000 RECORDS INTO histogram256_tab from 'PWD/data.tab' USING DELIMITERS
',',E'\n';
+--COPY 100 RECORDS INTO histogram256_tab from 'PWD/data.tab' USING DELIMITERS
',',E'\n';
diff --git a/sql/benchmarks/ssbm/Tests/load-sf-0.01.sql
b/sql/benchmarks/ssbm/Tests/load-sf-0.01.sql
--- a/sql/benchmarks/ssbm/Tests/load-sf-0.01.sql
+++ b/sql/benchmarks/ssbm/Tests/load-sf-0.01.sql
@@ -1,7 +1,7 @@
START TRANSACTION;
-COPY 2556 RECORDS INTO DWDATE FROM 'PWD/date.tbl' USING DELIMITERS
'|', '|\n';
-COPY 100 RECORDS INTO SUPPLIER FROM 'PWD/supplier.tbl' USING DELIMITERS
'|', '|\n';
-COPY 300 RECORDS INTO CUSTOMER FROM 'PWD/customer.tbl' USING DELIMITERS
'|', '|\n';
-COPY 2000 RECORDS INTO PART FROM 'PWD/part.tbl' USING DELIMITERS
'|', '|\n';
-COPY 60175 RECORDS INTO LINEORDER FROM 'PWD/lineorder.tbl' USING DELIMITERS
'|', '|\n';
+COPY 2556 RECORDS INTO DWDATE FROM 'PWD/date.tbl' USING DELIMITERS
'|', E'|\n';
+COPY 100 RECORDS INTO SUPPLIER FROM 'PWD/supplier.tbl' USING DELIMITERS
'|', E'|\n';
+COPY 300 RECORDS INTO CUSTOMER FROM 'PWD/customer.tbl' USING DELIMITERS
'|', E'|\n';
+COPY 2000 RECORDS INTO PART FROM 'PWD/part.tbl' USING DELIMITERS
'|', E'|\n';
+COPY 60175 RECORDS INTO LINEORDER FROM 'PWD/lineorder.tbl' USING DELIMITERS
'|', E'|\n';
COMMIT;
diff --git a/sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
b/sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
--- a/sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
+++ b/sql/benchmarks/tpch/load-sf-0.01-LOCKED.sql
@@ -1,8 +1,8 @@
-COPY 5 RECORDS INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS
'|', '|\n' LOCKED;
-COPY 25 RECORDS INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS
'|', '|\n' LOCKED;
-COPY 100 RECORDS INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING
DELIMITERS '|', '|\n' LOCKED;
-COPY 1500 RECORDS INTO customer from 'PWD/customer.tbl' ON CLIENT USING
DELIMITERS '|', '|\n' LOCKED;
-COPY 2000 RECORDS INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS
'|', '|\n' LOCKED;
-COPY 8000 RECORDS INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING
DELIMITERS '|', '|\n' LOCKED;
-COPY 15000 RECORDS INTO orders from 'PWD/orders.tbl' ON CLIENT USING
DELIMITERS '|', '|\n' LOCKED;
-COPY 70000 RECORDS INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING
DELIMITERS '|', '|\n' LOCKED;
+COPY 5 RECORDS INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n' LOCKED;
+COPY 25 RECORDS INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n' LOCKED;
+COPY 100 RECORDS INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n' LOCKED;
+COPY 1500 RECORDS INTO customer from 'PWD/customer.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n' LOCKED;
+COPY 2000 RECORDS INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n' LOCKED;
+COPY 8000 RECORDS INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n' LOCKED;
+COPY 15000 RECORDS INTO orders from 'PWD/orders.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n' LOCKED;
+COPY 70000 RECORDS INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n' LOCKED;
diff --git a/sql/benchmarks/tpch/load-sf-0.01.sql
b/sql/benchmarks/tpch/load-sf-0.01.sql
--- a/sql/benchmarks/tpch/load-sf-0.01.sql
+++ b/sql/benchmarks/tpch/load-sf-0.01.sql
@@ -1,10 +1,10 @@
START TRANSACTION;
-COPY 5 RECORDS INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS
'|', '|\n';
-COPY 25 RECORDS INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS
'|', '|\n';
-COPY 100 RECORDS INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING
DELIMITERS '|', '|\n';
-COPY 1500 RECORDS INTO customer from 'PWD/customer.tbl' ON CLIENT USING
DELIMITERS '|', '|\n';
-COPY 2000 RECORDS INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS
'|', '|\n';
-COPY 8000 RECORDS INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING
DELIMITERS '|', '|\n';
-COPY 15000 RECORDS INTO orders from 'PWD/orders.tbl' ON CLIENT USING
DELIMITERS '|', '|\n';
-COPY 70000 RECORDS INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING
DELIMITERS '|', '|\n';
+COPY 5 RECORDS INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n';
+COPY 25 RECORDS INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n';
+COPY 100 RECORDS INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n';
+COPY 1500 RECORDS INTO customer from 'PWD/customer.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n';
+COPY 2000 RECORDS INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS
'|', E'|\n';
+COPY 8000 RECORDS INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n';
+COPY 15000 RECORDS INTO orders from 'PWD/orders.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n';
+COPY 70000 RECORDS INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING
DELIMITERS '|', E'|\n';
COMMIT;
diff --git a/sql/benchmarks/tpch/load-sf-1.sql
b/sql/benchmarks/tpch/load-sf-1.sql
--- a/sql/benchmarks/tpch/load-sf-1.sql
+++ b/sql/benchmarks/tpch/load-sf-1.sql
@@ -1,10 +1,10 @@
START TRANSACTION;
-COPY INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS '|', '|\n';
-COPY INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS '|', '|\n';
-COPY INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING DELIMITERS '|',
'|\n';
-COPY INTO customer from 'PWD/customer.tbl' ON CLIENT USING DELIMITERS '|',
'|\n';
-COPY INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS '|', '|\n';
-COPY INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING DELIMITERS '|',
'|\n';
-COPY INTO orders from 'PWD/orders.tbl' ON CLIENT USING DELIMITERS '|', '|\n';
-COPY INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING DELIMITERS '|',
'|\n';
+COPY INTO region from 'PWD/region.tbl' ON CLIENT USING DELIMITERS '|', E'|\n';
+COPY INTO nation from 'PWD/nation.tbl' ON CLIENT USING DELIMITERS '|', E'|\n';
+COPY INTO supplier from 'PWD/supplier.tbl' ON CLIENT USING DELIMITERS '|',
E'|\n';
+COPY INTO customer from 'PWD/customer.tbl' ON CLIENT USING DELIMITERS '|',
E'|\n';
+COPY INTO part from 'PWD/part.tbl' ON CLIENT USING DELIMITERS '|', E'|\n';
+COPY INTO partsupp from 'PWD/partsupp.tbl' ON CLIENT USING DELIMITERS '|',
E'|\n';
+COPY INTO orders from 'PWD/orders.tbl' ON CLIENT USING DELIMITERS '|', E'|\n';
+COPY INTO lineitem from 'PWD/lineitem.tbl' ON CLIENT USING DELIMITERS '|',
E'|\n';
COMMIT;
diff --git a/sql/benchmarks/viam/Tests/dump.sql
b/sql/benchmarks/viam/Tests/dump.sql
--- a/sql/benchmarks/viam/Tests/dump.sql
+++ b/sql/benchmarks/viam/Tests/dump.sql
@@ -13,7 +13,7 @@ CREATE TABLE "sys"."video" (
"framecount" int NOT NULL,
CONSTRAINT "video_video_id_pkey" PRIMARY KEY ("video_id")
);
-COPY 1 RECORDS INTO "video" FROM stdin USING DELIMITERS '\t', '\n', '"';
+COPY 1 RECORDS INTO "video" FROM stdin USING DELIMITERS E'\t', E'\n', '"';
1 "20050407_mocky.mpg" "20050407_mocky.mpg" "T00:00:00:0F25"
"PT00H47M34S19N25F" 0 71369
CREATE TABLE "sys"."video_segment" (
"video_segment_id" int NOT NULL DEFAULT next value for "sys"."seq_3320",
@@ -27,7 +27,7 @@ CREATE TABLE "sys"."video_segment" (
CONSTRAINT "unq_shot_frame" UNIQUE ("framenumber", "framelength"),
CONSTRAINT "fk_video_segment_video_id" FOREIGN KEY ("video_id")
REFERENCES "video" ("video_id")
);
-COPY 71 RECORDS INTO "video_segment" FROM stdin USING DELIMITERS '\t', '\n',
'"';
+COPY 71 RECORDS INTO "video_segment" FROM stdin USING DELIMITERS E'\t', E'\n',
'"';
1 1 "frame_0" "T00:00:00:0F25" "PT00H00M00S01N25F"
0 1
2 1 "frame_10" "T00:00:00:10F25" "PT00H00M00S01N25F"
10 1
3 1 "frame_11" "T00:00:00:11F25" "PT00H00M00S01N25F"
11 1
@@ -131,7 +131,7 @@ CREATE TABLE "sys"."concepts" (
CONSTRAINT "concepts_concepts_id_pkey" PRIMARY KEY ("concepts_id"),
CONSTRAINT "fk_concepts_video_segment_id" FOREIGN KEY
("video_segment_id") REFERENCES "video_segment" ("video_segment_id")
);
-COPY 71 RECORDS INTO "concepts" FROM stdin USING DELIMITERS '\t';
+COPY 71 RECORDS INTO "concepts" FROM stdin USING DELIMITERS E'\t';
1 1 0.00577295991 1 0.0256887991 1 0.0251864996
1 1.00000001e-07 1 0.000110772002 1 0.0902884007 1
0.00199038 1 7.84385975e-06 1 0.40575701 1
3.89837987e-05 1 0.0656920969 1 1.00000001e-07 1
1.00000001e-07 1
2 2 0.0952574983 1 0.140557006 1 0.0421635993
1 0.000323351007 1 0.253017992 1 0.280176997 1
0.0607924014 1 0.0470448993 1 0.233169004 1
0.0635539964 1 0.201076001 1 0.120879002 1
0.386848986 1
3 3 0.0790096968 1 0.137465999 1 0.0346813984
1 0.000540950976 1 0.245244995 1 0.258863986 1
0.0831305012 1 0.0242940001 1 0.264544994 1
0.0712976977 1 0.215578005 1 0.130468994 1
0.527327001 1
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
@@ -21,16 +21,16 @@
copy 2 records into studenten
from stdin
- using delimiters ',','\n','"';
+ using delimiters ',',E'\n','"';
1,"[email protected]","Kang Zheng","1190857"
2,"[email protected]","Yang Yang","1194887"
copy 1 records into classes
from stdin
- using delimiters ',','\n','''';
+ using delimiters ',',E'\n','''';
1,'2004-4-20','13:45','14:30'
copy 2 records into groups
from stdin
- using delimiters ',','\n';
+ using delimiters ',',E'\n';
1,1
1,2
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/inlined_copy_into.SF-922392.sql
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/inlined_copy_into.SF-922392.sql
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/inlined_copy_into.SF-922392.sql
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/inlined_copy_into.SF-922392.sql
@@ -8,7 +8,7 @@ ALTER TABLE pos ADD PRIMARY KEY (harbour
ALTER TABLE pos ADD UNIQUE (x, y);
COPY 8 RECORDS INTO pos FROM stdin USING
-DELIMITERS '\t';
+DELIMITERS E'\t';
The Cape 9.3999999999999999e+307 1.3000000000000001e+308
Ceylon 1.1999999999999999e+308 1e+308
Bantam 1.31e+308 1.095e+308
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.sql
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.sql
--- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.sql
+++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.sql
@@ -5,7 +5,7 @@ CREATE TABLE "news" (
"date" timestamp,
CONSTRAINT "news_id_pkey" PRIMARY KEY ("id")
);
-COPY 1 RECORDS INTO "news" FROM stdin USING DELIMITERS '\t', '\n', '''';
+COPY 1 RECORDS INTO "news" FROM stdin USING DELIMITERS E'\t', E'\n', '''';
1 'dwerg.net word volwassen, er is eindelijk content
en het voicemail archief begint al aardig vol te lopen.
De commentaar en rating code voor de voicemails is ook
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
---
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
+++
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
@@ -75,8 +75,8 @@ stderr of test 'hang_on_copy_into.SF-110
# 23:26:36 > mclient -lsql -i --host=eir --port=38510
# 23:26:36 >
-MAPI = (monetdb) /var/tmp/mtest-25270/.s.monetdb.33644
-QUERY = COPY 1 RECORDS INTO "news" FROM stdin USING DELIMITERS '\t', '\n',
'''';
+MAPI = (monetdb) /var/tmp/mtest-10958/.s.monetdb.35734
+QUERY = COPY 1 RECORDS INTO "news" FROM stdin USING DELIMITERS E'\t', E'\n',
'''';
1 'dwerg.net word volwassen, er is eindelijk content
en het voicemail archief begint al aardig vol te lopen.
De commentaar en rating code voor de voicemails is ook
diff --git a/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.sql
b/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.sql
--- a/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.sql
+++ b/sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.sql
@@ -1,6 +1,6 @@
create table test (lhs varchar(16), rhs varchar(16));
-COPY 113 RECORDS into test from STDIN using delimiters ',','\n', '"';
+COPY 113 RECORDS into test from STDIN using delimiters ',',E'\n', '"';
"S","TOP"
"PP S@","S"
"IN NP","PP"
diff --git a/sql/test/BugTracker-2008/Tests/copy-count.SF-2485215.sql
b/sql/test/BugTracker-2008/Tests/copy-count.SF-2485215.sql
--- a/sql/test/BugTracker-2008/Tests/copy-count.SF-2485215.sql
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
