Remove refresh scripts and fix tests

apache · Jan 6, 2025 · 4dd5ef4 · 4dd5ef4
1 parent b3ab2dd
commit 4dd5ef4
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 96 deletions.
diff --git a/...ps-postgres/src/test/java/org/apache/baremaps/postgres/metadata/PostgresMetadataTest.java b/...ps-postgres/src/test/java/org/apache/baremaps/postgres/metadata/PostgresMetadataTest.java
@@ -40,10 +40,10 @@ void resetDatabase() throws SQLException, IOException {
       PostgresUtils.executeResource(connection, "queries/osm_drop_tables.sql");
       PostgresUtils.executeResource(connection, "queries/osm_drop_tables.sql");
       PostgresUtils.executeResource(connection, "queries/osm_create_tables.sql");
-      assertTrue(tableExists("osm_headers"));
-      assertTrue(tableExists("osm_nodes"));
-      assertTrue(tableExists("osm_ways"));
-      assertTrue(tableExists("osm_relations"));
+      assertTrue(tableExists("osm_header"));
+      assertTrue(tableExists("osm_node"));
+      assertTrue(tableExists("osm_way"));
+      assertTrue(tableExists("osm_relation"));
     }
   }
 

diff --git a/baremaps-postgres/src/test/resources/queries/osm_create_gin_indexes.sql b/baremaps-postgres/src/test/resources/queries/osm_create_gin_indexes.sql
@@ -13,11 +13,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_ways_gin ON
-    osm_ways
+    INDEX IF NOT EXISTS osm_way_gin ON
+    osm_way
         USING gin(nodes);
 
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_relations_gin ON
-    osm_relations
+    INDEX IF NOT EXISTS osm_relation_gin ON
+    osm_relation
         USING gin(member_refs);
diff --git a/baremaps-postgres/src/test/resources/queries/osm_create_gist_indexes.sql b/baremaps-postgres/src/test/resources/queries/osm_create_gist_indexes.sql
@@ -13,16 +13,16 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_nodes_gix ON
-    osm_nodes
+    INDEX IF NOT EXISTS osm_nodes_gix ON
+    osm_node
         USING GIST(geom);
 
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_ways_gix ON
-    osm_ways
+    INDEX IF NOT EXISTS osm_ways_gix ON
+    osm_way
         USING GIST(geom);
 
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_relations_gix ON
-    osm_relations
+    INDEX IF NOT EXISTS osm_relations_gix ON
+    osm_relation
         USING GIST(geom);
diff --git a/baremaps-postgres/src/test/resources/queries/osm_create_spgist_indexes.sql b/baremaps-postgres/src/test/resources/queries/osm_create_spgist_indexes.sql
@@ -13,16 +13,16 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_nodes_gix ON
-    osm_nodes
+    INDEX IF NOT EXISTS osm_node_gix ON
+    osm_node
         USING SPGIST(geom);
 
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_ways_gix ON
-    osm_ways
+    INDEX IF NOT EXISTS osm_way_gix ON
+    osm_way
         USING SPGIST(geom);
 
 CREATE
-    INDEX CONCURRENTLY IF NOT EXISTS osm_relations_gix ON
-    osm_relations
+    INDEX IF NOT EXISTS osm_relation_gix ON
+    osm_relation
         USING SPGIST(geom);
diff --git a/baremaps-postgres/src/test/resources/queries/osm_create_tables.sql b/baremaps-postgres/src/test/resources/queries/osm_create_tables.sql
@@ -14,7 +14,7 @@
 -- limitations under the License.
 CREATE
     TABLE
-        IF NOT EXISTS osm_headers(
+        IF NOT EXISTS osm_header(
             replication_sequence_number BIGINT PRIMARY KEY,
             replication_timestamp TIMESTAMP WITHOUT TIME ZONE,
             replication_url text,
@@ -24,7 +24,7 @@ CREATE
 
 CREATE
     TABLE
-        osm_nodes(
+        osm_node(
             id BIGINT PRIMARY KEY,
             version INT,
             uid INT,
@@ -38,7 +38,7 @@ CREATE
 
 CREATE
     TABLE
-        osm_ways(
+        osm_way(
             id BIGINT PRIMARY KEY,
             version INT,
             uid INT,
@@ -51,7 +51,7 @@ CREATE
 
 CREATE
     TABLE
-        osm_relations(
+        osm_relation(
             id BIGINT PRIMARY KEY,
             version INT,
             uid INT,

diff --git a/baremaps-postgres/src/test/resources/queries/osm_drop_tables.sql b/baremaps-postgres/src/test/resources/queries/osm_drop_tables.sql
@@ -14,16 +14,16 @@
 -- limitations under the License.
 DROP
     TABLE
-        IF EXISTS osm_headers;
+        IF EXISTS osm_header;
 
 DROP
     TABLE
-        IF EXISTS osm_nodes;
+        IF EXISTS osm_node;
 
 DROP
     TABLE
-        IF EXISTS osm_ways;
+        IF EXISTS osm_way;
 
 DROP
     TABLE
-        IF EXISTS osm_relations;
+        IF EXISTS osm_relation;
diff --git a/baremaps-postgres/src/test/resources/queries/osm_truncate_table.sql b/baremaps-postgres/src/test/resources/queries/osm_truncate_table.sql
@@ -14,13 +14,13 @@
 -- limitations under the License.
 
 TRUNCATE TABLE
-    osm_headers;
+    osm_header;
 
 TRUNCATE TABLE
-    osm_nodes;
+    osm_node;
 
 TRUNCATE TABLE
-    osm_ways;
+    osm_way;
 
 TRUNCATE TABLE
-    osm_relations;
+    osm_relation;
diff --git a/basemap/layers/linestring/refresh.sql b/basemap/layers/linestring/refresh.sql
diff --git a/basemap/layers/polygon/refresh.sql b/basemap/layers/polygon/refresh.sql
diff --git a/basemap/refresh.js b/basemap/refresh.js
@@ -26,8 +26,6 @@ export default {
                 // "layers/way/refresh.sql",
                 // "layers/relation/refresh.sql",
                 // "layers/member/refresh.sql",
-                // "layers/linestring/refresh.sql",
-                // "layers/polygon/refresh.sql",
                 // "layers/highway/refresh.sql",
                 // "layers/landuse/refresh.sql",
                 // "layers/leisure/refresh.sql",