This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch 745-daylight in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 356f46c5f60297759b9329d55ece0779a177b55e Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Aug 29 08:58:30 2023 +0200 Fix delete query --- .../openstreetmap/postgres/PostgresNodeRepository.java | 8 ++++---- .../openstreetmap/postgres/PostgresRelationRepository.java | 4 ++-- .../baremaps/openstreetmap/postgres/PostgresWayRepository.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java index 7d2d83de..34181108 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java @@ -90,11 +90,11 @@ public class PostgresNodeRepository implements NodeRepository { this.createTable = String.format(""" CREATE TABLE %1$s ( - %2$s bigint PRIMARY KEY, + %2$s int8 PRIMARY KEY, %3$s int, %4$s int, %5$s timestamp without time zone, - %6$s bigint, + %6$s int8, %7$s jsonb, %8$s float, %9$s float, @@ -121,7 +121,7 @@ public class PostgresNodeRepository implements NodeRepository { tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, longitudeColumn, latitudeColumn, geometryColumn); this.delete = String.format("DELETE FROM %1$s WHERE %2$s = ?", tableName, idColumn); - this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s IN (?)", tableName, idColumn); + this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s = ANY (?)", tableName, idColumn); this.copy = String.format( "COPY %1$s (%2$s, %3$s, %4$s, %5$s, %6$s, %7$s, %8$s, %9$s, %10$s) FROM STDIN BINARY", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, @@ -252,7 +252,7 @@ public class PostgresNodeRepository implements NodeRepository { } try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(deleteIn)) { - statement.setArray(1, connection.createArrayOf("bigint", keys.toArray())); + statement.setArray(1, connection.createArrayOf("int8", keys.toArray())); statement.execute(); } catch (SQLException e) { throw new RepositoryException(e); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java index bdc1f54b..e68a72fa 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java @@ -127,7 +127,7 @@ public class PostgresRelationRepository implements RelationRepository { %11$s = excluded.%11$s""", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, memberRefs, memberTypes, memberRoles, geometryColumn); this.delete = String.format("DELETE FROM %1$s WHERE %2$s = ?", tableName, idColumn); - this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s IN (?)", tableName, idColumn); + this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s = ANY (?)", tableName, idColumn); this.copy = String.format( "COPY %1$s (%2$s, %3$s, %4$s, %5$s, %6$s, %7$s, %8$s, %9$s, %10$s, %11$s) FROM STDIN BINARY", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, @@ -258,7 +258,7 @@ public class PostgresRelationRepository implements RelationRepository { } try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(deleteIn)) { - statement.setArray(1, connection.createArrayOf("bigint", keys.toArray())); + statement.setArray(1, connection.createArrayOf("int8", keys.toArray())); statement.execute(); } catch (SQLException e) { throw new RepositoryException(e); diff --git a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java index 13cd5b70..27dcfa48 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java @@ -91,13 +91,13 @@ public class PostgresWayRepository implements WayRepository { this.dataSource = dataSource; this.createTable = String.format(""" CREATE TABLE %1$s ( - %2$s bigint PRIMARY KEY, + %2$s int8 PRIMARY KEY, %3$s int, %4$s int, %5$s timestamp without time zone, - %6$s bigint, + %6$s int8, %7$s jsonb, - %8$s bigint[], + %8$s int8[], %9$s geometry )""", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, nodesColumn, geometryColumn); @@ -124,7 +124,7 @@ public class PostgresWayRepository implements WayRepository { %9$s = excluded.%9$s""", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, nodesColumn, geometryColumn); this.delete = String.format("DELETE FROM %1$s WHERE %2$s = ?", tableName, idColumn); - this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s IN (?)", tableName, idColumn); + this.deleteIn = String.format("DELETE FROM %1$s WHERE %2$s = ANY (?)", tableName, idColumn); this.copy = String.format( "COPY %1$s (%2$s, %3$s, %4$s, %5$s, %6$s, %7$s, %8$s, %9$s) FROM STDIN BINARY", tableName, idColumn, versionColumn, uidColumn, timestampColumn, changesetColumn, tagsColumn, @@ -255,7 +255,7 @@ public class PostgresWayRepository implements WayRepository { } try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(deleteIn)) { - statement.setArray(1, connection.createArrayOf("bigint", keys.toArray())); + statement.setArray(1, connection.createArrayOf("int8", keys.toArray())); statement.execute(); } catch (SQLException e) { throw new RepositoryException(e);
