Changeset: 1e867e91e8c0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e867e91e8c0 Added Files: sql/test/osm/Tests/delete_alter_bug.test sql/test/osm/Tests/drop_constraint_bug.test sql/test/osm/Tests/exp_name_bug.test Modified Files: sql/test/osm/Tests/delete_alter_bug.sql Branch: mtest Log Message:
Updated osm tests. Use a different csv string delimeter to not confuse Mconvert.py diffs (172 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 new file mode 100644 --- /dev/null +++ b/sql/test/osm/Tests/delete_alter_bug.test @@ -0,0 +1,53 @@ +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_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" + +query I rowsort +select distinct way from way_tags group by way, k having count(*) > 1 +---- +23950375 +24644162 + +query ITT rowsort +select * from way_tags where way in (23950375, 24644162) +---- +48 values hashing to 117456b7f3bdcd634f32faafeafac0e9 + +statement ok +delete from way_tags where way in (23950375, 24644162) + +statement ok +ALTER table way_tags add primary key(way, k) + +statement ok +DROP table way_tags + + diff --git a/sql/test/osm/Tests/drop_constraint_bug.test b/sql/test/osm/Tests/drop_constraint_bug.test new file mode 100644 --- /dev/null +++ b/sql/test/osm/Tests/drop_constraint_bug.test @@ -0,0 +1,32 @@ +statement ok +CREATE TABLE "sys"."ways" ( + "id" int NOT NULL, + "username" varchar(255), + "timestamp" timestamptz(7), + CONSTRAINT "ways_id_pkey" PRIMARY KEY ("id") +) + +statement ok +CREATE TABLE way_tags2 (way integer, k varchar(255), v varchar(1024), +primary key (way, k), foreign key(way) references ways) + +statement error +alter table ways drop constraint ways_id_pkey + +query I rowsort +SELECT count(*) FROM ways +LEFT JOIN way_tags2 ON + ways.id = way_tags2.way +WHERE + k = 'highway' AND + v = 'secondary' +---- +0 + +statement ok +drop table way_tags2 + +statement ok +drop table ways + + diff --git a/sql/test/osm/Tests/exp_name_bug.test b/sql/test/osm/Tests/exp_name_bug.test new file mode 100644 --- /dev/null +++ b/sql/test/osm/Tests/exp_name_bug.test @@ -0,0 +1,12 @@ +statement ok +CREATE TABLE relation_members_relation (relation integer, idx integer, to_relation integer, role varchar(255), primary key(relation, idx)) + +query III rowsort +WITH a(relation, to_relation, indent) AS (SELECT relation, to_relation, + 0 FROM relation_members_relation) SELECT * FROM a +---- + +statement ok +DROP table relation_members_relation + + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list