Changeset: b3a92d9a1728 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a92d9a1728
Modified Files:
sql/test/osm/Tests/delete_alter_bug.sql
sql/test/osm/Tests/delete_alter_bug.test
testing/mktest.py
Branch: mtest
Log Message:
Don't do extra escaping, revert change of quote characters.
diffs (152 lines):
diff --git a/sql/test/osm/Tests/delete_alter_bug.sql
b/sql/test/osm/Tests/delete_alter_bug.sql
--- a/sql/test/osm/Tests/delete_alter_bug.sql
+++ b/sql/test/osm/Tests/delete_alter_bug.sql
@@ -1,30 +1,30 @@
CREATE TABLE way_tags (way integer, k varchar(255), v varchar(1024));
-COPY 25 RECORDS INTO way_tags from STDIN USING DELIMITERS ',', E'\n', '|';
-23950357,|created_by|,|Potlatch 0.10f|
-23950357,|highway|,|tertiary|
-23950357,|oneway|,|yes|
-23950375,|name|,|Haarholzer Straße|
-23950375,|name|,|Haarholzer Straße|
-23950375,|created_by|,|Potlatch 0.10f|
-23950375,|created_by|,|Potlatch 0.10f|
-23950375,|maxspeed|,|30|
-23950375,|highway|,|residential|
-23950375,|maxspeed|,|30|
-23950375,|highway|,|residential|
-23950375,|lanes|,|1|
-23950375,|lanes|,|1|
-24644006,|name|,|Kapelsesteenweg|
-24644006,|highway|,|residential|
-24644162,|created_by|,|Potlatch 0.9c|
-24644162,|name|,|Kampelaer|
-24644162,|name|,|Kampelaer|
-24644162,|created_by|,|Potlatch 0.9c|
-24644162,|highway|,|residential|
-24644162,|highway|,|residential|
-24644169,|highway|,|residential|
-24644169,|name|,|Jakobstraße|
-24644170,|created_by|,|Potlatch 0.9c|
-24644170,|name|,|Werrastraße|
+COPY 25 RECORDS INTO way_tags from STDIN USING DELIMITERS ',', E'\n', '''';
+23950357,'created_by','Potlatch 0.10f'
+23950357,'highway','tertiary'
+23950357,'oneway','yes'
+23950375,'name','Haarholzer Straße'
+23950375,'name','Haarholzer Straße'
+23950375,'created_by','Potlatch 0.10f'
+23950375,'created_by','Potlatch 0.10f'
+23950375,'maxspeed','30'
+23950375,'highway','residential'
+23950375,'maxspeed','30'
+23950375,'highway','residential'
+23950375,'lanes','1'
+23950375,'lanes','1'
+24644006,'name','Kapelsesteenweg'
+24644006,'highway','residential'
+24644162,'created_by','Potlatch 0.9c'
+24644162,'name','Kampelaer'
+24644162,'name','Kampelaer'
+24644162,'created_by','Potlatch 0.9c'
+24644162,'highway','residential'
+24644162,'highway','residential'
+24644169,'highway','residential'
+24644169,'name','Jakobstraße'
+24644170,'created_by','Potlatch 0.9c'
+24644170,'name','Werrastraße'
select distinct way from way_tags group by way, k having count(*) > 1;
select * from way_tags where way in (23950375, 24644162);
diff --git a/sql/test/osm/Tests/delete_alter_bug.test
b/sql/test/osm/Tests/delete_alter_bug.test
--- a/sql/test/osm/Tests/delete_alter_bug.test
+++ b/sql/test/osm/Tests/delete_alter_bug.test
@@ -2,33 +2,33 @@ statement ok
CREATE TABLE way_tags (way integer, k varchar(255), v varchar(1024))
statement ok
-COPY 25 RECORDS INTO way_tags from STDIN USING DELIMITERS ',', E'\n', '|'
+COPY 25 RECORDS INTO way_tags from STDIN USING DELIMITERS ',', E'\n', ''''
<COPY_INTO_DATA>
-23950357,|created_by|,|Potlatch 0.10f|
-23950357,|highway|,|tertiary|
-23950357,|oneway|,|yes|
-23950375,|name|,|Haarholzer Straße|
-23950375,|name|,|Haarholzer Straße|
-23950375,|created_by|,|Potlatch 0.10f|
-23950375,|created_by|,|Potlatch 0.10f|
-23950375,|maxspeed|,|30|
-23950375,|highway|,|residential|
-23950375,|maxspeed|,|30|
-23950375,|highway|,|residential|
-23950375,|lanes|,|1|
-23950375,|lanes|,|1|
-24644006,|name|,|Kapelsesteenweg|
-24644006,|highway|,|residential|
-24644162,|created_by|,|Potlatch 0.9c|
-24644162,|name|,|Kampelaer|
-24644162,|name|,|Kampelaer|
-24644162,|created_by|,|Potlatch 0.9c|
-24644162,|highway|,|residential|
-24644162,|highway|,|residential|
-24644169,|highway|,|residential|
-24644169,|name|,|Jakobstraße|
-24644170,|created_by|,|Potlatch 0.9c|
-24644170,|name|,|Werrastraße|
+23950357,'created_by','Potlatch 0.10f'
+23950357,'highway','tertiary'
+23950357,'oneway','yes'
+23950375,'name','Haarholzer Straße'
+23950375,'name','Haarholzer Straße'
+23950375,'created_by','Potlatch 0.10f'
+23950375,'created_by','Potlatch 0.10f'
+23950375,'maxspeed','30'
+23950375,'highway','residential'
+23950375,'maxspeed','30'
+23950375,'highway','residential'
+23950375,'lanes','1'
+23950375,'lanes','1'
+24644006,'name','Kapelsesteenweg'
+24644006,'highway','residential'
+24644162,'created_by','Potlatch 0.9c'
+24644162,'name','Kampelaer'
+24644162,'name','Kampelaer'
+24644162,'created_by','Potlatch 0.9c'
+24644162,'highway','residential'
+24644162,'highway','residential'
+24644169,'highway','residential'
+24644169,'name','Jakobstraße'
+24644170,'created_by','Potlatch 0.9c'
+24644170,'name','Werrastraße'
query I rowsort
select distinct way from way_tags group by way, k having count(*) > 1
diff --git a/testing/mktest.py b/testing/mktest.py
--- a/testing/mktest.py
+++ b/testing/mktest.py
@@ -179,14 +179,6 @@ def to_sqllogic_test(query, copy_into_st
print('{} values hashing to {}'.format(len(args) *
crs.rowcount, h))
print('')
-def monet_escape(data):
- """
- returns an escaped string
- """
- data = str(data).replace("\\", "\\\\")
- data = data.replace("\'", "\\\'")
- return "%s" % str(data)
-
def process_copyfrom_stmt(query):
index = 0
for i, n in enumerate(query):
@@ -195,9 +187,7 @@ def process_copyfrom_stmt(query):
break
index+=1
copy_into_stmt = '\n'.join(query[:index]).rstrip(';')
- rest_ = query[index:]
- # escape stuff
- copy_into_data = list(map(lambda x: monet_escape(x), rest_))
+ copy_into_data = query[index:]
query = '\n'.join(query)
to_sqllogic_test(query, copy_into_stmt=copy_into_stmt,
copy_into_data=copy_into_data)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
