Changeset: 50520d8024e8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50520d8024e8 Modified Files: sql/test/copy/Tests/All sql/test/copy/Tests/columns.sql sql/test/copy/Tests/columns.test sql/test/copy/Tests/format_date.test sql/test/copy/Tests/ingestion.sql sql/test/copy/Tests/ingestion.test sql/test/copy/Tests/int_parse.sql sql/test/copy/Tests/int_parse.test sql/test/copy/Tests/null_as_string_errors.sql sql/test/copy/Tests/null_as_string_errors.test Branch: mtest Log Message:
Fixes for tests in sql/test/copy diffs (truncated from 946 to 300 lines): 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 @@ -4,13 +4,13 @@ escaped_char null_as_string null_as_string_errors null_as_string_output -int_parse_best +# int_parse_best int_parse load_stdin_incorrect_line_nr overflow_error format_date key_copy -nonutf8 +# nonutf8 incorrect_columns columns no_escape diff --git a/sql/test/copy/Tests/columns.sql b/sql/test/copy/Tests/columns.sql --- a/sql/test/copy/Tests/columns.sql +++ b/sql/test/copy/Tests/columns.sql @@ -4,6 +4,7 @@ copy 3 records into tbl (i, d) from stdi 1,2.0 2,2.1 3,2.2 + select * from tbl; drop table tbl; @@ -13,6 +14,7 @@ copy 3 records into tbl (i, d) from stdi 1,"test",2.0 2,"test1",2.1 3,"test",2.2 + select * from tbl; drop table tbl; @@ -22,5 +24,6 @@ copy 3 records into tbl (i, d) from stdi 1,2.0 2,2.1 3,2.2 + select * from tbl; drop table tbl; diff --git a/sql/test/copy/Tests/columns.test b/sql/test/copy/Tests/columns.test --- a/sql/test/copy/Tests/columns.test +++ b/sql/test/copy/Tests/columns.test @@ -2,71 +2,69 @@ statement ok create table tbl (i int, s string, d decimal(5, 2)) statement error -copy 3 records into tbl (i, d) from stdin using delimiters ',',E'\n' +copy 3 records into tbl (i, d) from stdin delimiters ',',E'\n' <COPY_INTO_DATA> 1,2.0 2,2.1 3,2.2 - -query ITT nosort -select * from tbl; +query ITR rowsort +select * from tbl ---- statement ok -drop table tbl; +drop table tbl statement ok create table tbl (i int, s string, d decimal(5, 2)) statement ok -copy 3 records into tbl (i, d) from stdin using delimiters ',',E'\n' +copy 3 records into tbl (i, d) from stdin delimiters ',',E'\n' <COPY_INTO_DATA> 1,"test",2.0 2,"test1",2.1 3,"test",2.2 - -query ITT nosort -select * from tbl; +query ITR rowsort +select * from tbl ---- 1 NULL -2.00 +2.000 2 NULL -2.10 +2.100 3 NULL -2.20 +2.200 statement ok -drop table tbl; +drop table tbl statement ok create table tbl (i int, s string, d decimal(5, 2)) statement ok -copy 3 records into tbl (i, d) from stdin (i, d) using delimiters ',',E'\n' +copy 3 records into tbl (i, d) from stdin (i, d) delimiters ',',E'\n' <COPY_INTO_DATA> 1,2.0 2,2.1 3,2.2 -query ITT nosort -select * from tbl; +query ITR rowsort +select * from tbl ---- 1 NULL -2.00 +2.000 2 NULL -2.10 +2.100 3 NULL -2.20 +2.200 statement ok -drop table tbl; +drop table tbl diff --git a/sql/test/copy/Tests/format_date.test b/sql/test/copy/Tests/format_date.test --- a/sql/test/copy/Tests/format_date.test +++ b/sql/test/copy/Tests/format_date.test @@ -7,323 +7,328 @@ CREATE TABLE orders_1 (o_orderkey INT NO statement ok CREATE TABLE orders_2 (o_orderkey INT NOT NULL, o_custkey INT NOT NULL, o_orderstatus VARCHAR(1) NOT NULL, o_totalprice FLOAT NOT NULL, o_orderdate DATE NOT NULL, o_orderpriority VARCHAR(15) NOT NULL, o_clerk VARCHAR(15) NOT NULL, o_shippriority INT NOT NULL, o_comment VARCHAR(79) NOT NULL) -statement error +statement ok COPY 150 RECORDS INTO orders_1 from STDIN USING DELIMITERS '|', E'|\n' <COPY_INTO_DATA> -1|370|O|172799.49|1996-01-02|5-LOW|Clerk -2|781|O|38426.09|1996-12-01|1-URGENT|Clerk -3|1234|F|205654.30|1993-10-14|5-LOW|Clerk -4|1369|O|56000.91|1995-10-11|5-LOW|Clerk -5|445|F|105367.67|1994-07-30|5-LOW|Clerk -6|557|F|45523.10|1992-02-21|4-NOT SPECIFIED|Clerk -7|392|O|271885.66|1996-01-10|2-HIGH|Clerk -32|1301|O|198665.57|1995-07-16|2-HIGH|Clerk -33|670|F|146567.24|1993-10-27|3-MEDIUM|Clerk -34|611|O|73315.48|1998-07-21|3-MEDIUM|Clerk -35|1276|O|194641.93|1995-10-23|4-NOT SPECIFIED|Clerk -36|1153|O|42011.04|1995-11-03|1-URGENT|Clerk -37|862|F|131896.49|1992-06-03|3-MEDIUM|Clerk -38|1249|O|71553.08|1996-08-21|4-NOT SPECIFIED|Clerk -39|818|O|326565.37|1996-09-20|3-MEDIUM|Clerk -64|322|F|35831.73|1994-07-16|3-MEDIUM|Clerk -65|163|P|95469.44|1995-03-18|1-URGENT|Clerk -66|1292|F|104190.66|1994-01-20|5-LOW|Clerk -67|568|O|182481.16|1996-12-19|4-NOT SPECIFIED|Clerk -68|286|O|301968.79|1998-04-18|3-MEDIUM|Clerk -69|845|F|204110.73|1994-06-04|4-NOT SPECIFIED|Clerk -70|644|F|125705.32|1993-12-18|5-LOW|Clerk -71|34|O|260603.38|1998-01-24|4-NOT SPECIFIED|Clerk -96|1078|F|64364.30|1994-04-17|2-HIGH|Clerk -97|211|F|100572.55|1993-01-29|3-MEDIUM|Clerk -98|1045|F|71721.40|1994-09-25|1-URGENT|Clerk -99|890|F|108594.87|1994-03-13|4-NOT SPECIFIED|Clerk -100|1471|O|198978.27|1998-02-28|4-NOT SPECIFIED|Clerk -101|280|O|118448.39|1996-03-17|3-MEDIUM|Clerk -102|8|O|184806.58|1997-05-09|2-HIGH|Clerk -103|292|O|118745.16|1996-06-20|4-NOT SPECIFIED|Clerk -128|740|F|34997.04|1992-06-15|1-URGENT|Clerk -129|712|F|254281.41|1992-11-19|5-LOW|Clerk -130|370|F|140213.54|1992-05-08|2-HIGH|Clerk -131|928|F|140726.47|1994-06-08|3-MEDIUM|Clerk -132|265|F|133485.89|1993-06-11|3-MEDIUM|Clerk -133|440|O|95971.06|1997-11-29|1-URGENT|Clerk -134|62|F|208201.46|1992-05-01|4-NOT SPECIFIED|Clerk -135|605|O|230472.84|1995-10-21|4-NOT SPECIFIED|Clerk -160|826|O|114742.32|1996-12-19|4-NOT SPECIFIED|Clerk -161|167|F|17668.60|1994-08-31|2-HIGH|Clerk -162|142|O|3553.15|1995-05-08|3-MEDIUM|Clerk -163|878|O|177809.13|1997-09-05|3-MEDIUM|Clerk -164|8|F|250417.20|1992-10-21|5-LOW|Clerk -165|274|F|193302.35|1993-01-30|4-NOT SPECIFIED|Clerk -166|1079|O|158207.39|1995-09-12|2-HIGH|Clerk -167|1195|F|64017.85|1993-01-04|4-NOT SPECIFIED|Clerk -192|826|O|194637.57|1997-11-25|5-LOW|Clerk -193|791|F|80834.26|1993-08-08|1-URGENT|Clerk -194|619|F|154284.73|1992-04-05|3-MEDIUM|Clerk -195|1355|F|216638.92|1993-12-28|3-MEDIUM|Clerk -196|649|F|38660.64|1993-03-17|2-HIGH|Clerk -197|326|P|155247.48|1995-04-07|2-HIGH|Clerk -198|1103|O|149551.63|1998-01-02|4-NOT SPECIFIED|Clerk -199|530|O|95867.70|1996-03-07|2-HIGH|Clerk -224|25|F|234050.44|1994-06-18|4-NOT SPECIFIED|Clerk -225|331|P|226028.98|1995-05-25|1-URGENT|Clerk -226|1276|F|256459.40|1993-03-10|2-HIGH|Clerk -227|100|O|69020.68|1995-11-10|5-LOW|Clerk -228|442|F|2744.06|1993-02-25|1-URGENT|Clerk -229|1118|F|195619.74|1993-12-29|1-URGENT|Clerk -230|1027|F|147711.01|1993-10-27|1-URGENT|Clerk -231|910|F|234383.86|1994-09-29|2-HIGH|Clerk -256|1249|F|132718.67|1993-10-19|4-NOT SPECIFIED|Clerk -257|1228|O|9255.12|1998-03-28|3-MEDIUM|Clerk -258|419|F|259466.78|1993-12-29|1-URGENT|Clerk -259|433|F|110611.59|1993-09-29|4-NOT SPECIFIED|Clerk -260|1048|O|268084.69|1996-12-10|3-MEDIUM|Clerk -261|461|F|278279.30|1993-06-29|3-MEDIUM|Clerk -262|304|O|173401.63|1995-11-25|4-NOT SPECIFIED|Clerk -263|1162|F|104961.32|1994-05-17|2-HIGH|Clerk -288|71|O|239366.68|1997-02-21|1-URGENT|Clerk -289|1039|O|174624.55|1997-02-10|3-MEDIUM|Clerk -290|1180|F|67636.54|1994-01-01|4-NOT SPECIFIED|Clerk -291|1411|F|88375.89|1994-03-13|1-URGENT|Clerk -292|223|F|54152.77|1992-01-13|2-HIGH|Clerk -293|301|F|46128.56|1992-10-02|2-HIGH|Clerk -294|505|F|46889.54|1993-07-16|3-MEDIUM|Clerk -295|190|F|148569.49|1994-09-29|2-HIGH|Clerk -320|4|O|50202.60|1997-11-21|2-HIGH|Clerk -321|1226|F|73024.50|1993-03-21|3-MEDIUM|Clerk -322|1336|F|165992.05|1992-03-19|1-URGENT|Clerk -323|392|F|121127.17|1994-03-26|1-URGENT|Clerk -324|1052|F|46327.90|1992-03-20|1-URGENT|Clerk -325|401|F|94638.59|1993-10-17|5-LOW|Clerk -326|760|O|325448.68|1995-06-04|2-HIGH|Clerk -327|1447|P|32302.12|1995-04-17|5-LOW|Clerk -352|1066|F|25542.02|1994-03-08|2-HIGH|Clerk -353|19|F|224983.69|1993-12-31|5-LOW|Clerk -354|1384|O|231311.22|1996-03-14|2-HIGH|Clerk -355|701|F|103949.82|1994-06-14|5-LOW|Clerk -356|1469|F|189160.02|1994-06-30|4-NOT SPECIFIED|Clerk -357|604|O|138936.83|1996-10-09|2-HIGH|Clerk -358|23|F|362024.17|1993-09-20|2-HIGH|Clerk -359|776|F|214770.97|1994-12-19|3-MEDIUM|Clerk -384|1132|F|191275.12|1992-03-03|5-LOW|Clerk -385|331|O|75866.47|1996-03-22|5-LOW|Clerk -386|602|F|119718.02|1995-01-25|2-HIGH|Clerk -387|34|O|197839.44|1997-01-26|4-NOT SPECIFIED|Clerk -388|448|F|161560.04|1992-12-16|4-NOT SPECIFIED|Clerk -389|1270|F|3266.69|1994-02-17|2-HIGH|Clerk -390|1027|O|232256.36|1998-04-07|5-LOW|Clerk -391|1103|F|14517.91|1994-11-17|2-HIGH|Clerk -416|403|F|106818.50|1993-09-27|5-LOW|Clerk -417|547|F|132531.73|1994-02-06|3-MEDIUM|Clerk -418|949|P|39431.46|1995-04-13|4-NOT SPECIFIED|Clerk -419|1163|O|159079.22|1996-10-01|3-MEDIUM|Clerk -420|902|O|269064.47|1995-10-31|4-NOT SPECIFIED|Clerk -421|392|F|1292.21|1992-02-22|5-LOW|Clerk -422|731|O|155533.71|1997-05-31|4-NOT SPECIFIED|Clerk -423|1034|O|31900.60|1996-06-01|1-URGENT|Clerk -448|1498|O|157247.56|1995-08-21|3-MEDIUM|Clerk -449|958|O|55082.33|1995-07-20|2-HIGH|Clerk -450|475|P|213638.07|1995-03-05|4-NOT SPECIFIED|Clerk -451|988|O|142756.81|1998-05-25|5-LOW|Clerk -452|596|O|2072.79|1997-10-14|1-URGENT|Clerk -453|442|O|343004.49|1997-05-26|5-LOW|Clerk -454|488|O|24543.95|1995-12-27|5-LOW|Clerk -455|121|O|190711.32|1996-12-04|1-URGENT|Clerk -480|715|F|30644.49|1993-05-08|5-LOW|Clerk -481|304|F|160370.14|1992-10-08|2-HIGH|Clerk -482|1252|O|197194.23|1996-03-26|1-URGENT|Clerk -483|349|O|66194.38|1995-07-11|2-HIGH|Clerk -484|544|O|331553.32|1997-01-03|3-MEDIUM|Clerk -485|1006|O|142389.70|1997-03-26|2-HIGH|Clerk -486|509|O|286150.09|1996-03-11|4-NOT SPECIFIED|Clerk -487|1079|F|88805.07|1992-08-18|1-URGENT|Clerk -512|631|P|183939.48|1995-05-20|5-LOW|Clerk -513|607|O|78769.71|1995-05-01|2-HIGH|Clerk -514|749|O|123202.51|1996-04-04|2-HIGH|Clerk -515|1420|F|177231.12|1993-08-29|4-NOT SPECIFIED|Clerk -516|440|O|13277.79|1998-04-21|2-HIGH|Clerk -517|94|O|109269.47|1997-04-07|5-LOW|Clerk -518|1444|O|335285.37|1998-02-08|2-HIGH|Clerk -519|631|O|109395.60|1997-10-31|1-URGENT|Clerk -544|934|F|58960.45|1993-02-17|2-HIGH|Clerk -545|632|O|35129.54|1995-11-07|2-HIGH|Clerk -546|1433|O|26227.74|1996-11-01|2-HIGH|Clerk -547|983|O|137852.72|1996-06-22|3-MEDIUM|Clerk -548|1240|F|139094.89|1994-09-21|1-URGENT|Clerk -549|1100|F|211787.30|1992-07-13|1-URGENT|Clerk -550|236|O|54818.45|1995-08-02|1-URGENT|Clerk -551|898|O|64301.40|1995-05-30|1-URGENT|Clerk -576|296|O|24722.97|1997-05-13|3-MEDIUM|Clerk -577|553|F|47860.53|1994-12-19|5-LOW|Clerk -578|926|O|103543.00|1997-01-10|5-LOW|Clerk -579|671|O|146610.11|1998-03-11|2-HIGH|Clerk -580|593|O|144557.44|1997-07-05|2-HIGH|Clerk -581|688|O|175985.28|1997-02-23|4-NOT SPECIFIED|Clerk -582|494|O|181813.20|1997-10-21|1-URGENT|Clerk +1|370|O|172799.49|1996-01-02|5-LOW|Clerk#000000951|0|blithely final dolphins solve-- blithely blithe packages nag blith| _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
