Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2023.1.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>ru.yandex.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/io/ebean/test/containers/PostgisContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ private PostgisContainer(Builder config) {
*/
public static class Builder extends BaseDbBuilder<PostgisContainer, Builder> {

private boolean useLW;

private Builder(String version) {
super("postgis", 6432, 5432, version);
this.image = "ghcr.io/baosystems/postgis:" + version;
Expand All @@ -44,19 +46,32 @@ private Builder(String version) {
this.extraDbExtensions = extensions;
}

private String prefix() {
return useLW ? "jdbc:postgresql_lwgis://" : "jdbc:postgresql://";
}

@Override
protected String buildJdbcUrl() {
return "jdbc:postgresql://" + host + ":" + port + "/" + dbName;
return prefix() + host + ":" + port + "/" + dbName;
}

@Override
protected String buildJdbcAdminUrl() {
return "jdbc:postgresql://" + host + ":" + port + "/postgres";
return prefix() + host + ":" + port + "/postgres";
}

@Override
protected String buildExtraJdbcUrl() {
return "jdbc:postgresql://" + host + ":" + port + "/" + extraDb;
return prefix() + host + ":" + port + "/" + extraDb;
}

/**
* Set to use HexWKB and DriverWrapperLW. The JDBC URL will prefix with
* <code>jdbc:postgresql_lwgis://</code> instead of <code>jdbc:postgresql://</code>.
*/
Builder useLW(boolean useLW) {
this.useLW = useLW;
return this;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class PostgisContainerTest {
void extraDb() throws java.sql.SQLException {
PostgisContainer container = PostgisContainer.builder("15")
.port(0)
.useLW(true)
.extraDb("myextra")
.build();

Expand All @@ -27,6 +28,7 @@ void extraDb() throws java.sql.SQLException {

String jdbcUrl = container.config().jdbcUrl();
assertThat(jdbcUrl).contains(":" + containerConfig.port());
assertThat(jdbcUrl).startsWith("jdbc:postgresql_lwgis://");
runSomeSql(container);

DataSourcePool dataSource = container.ebean().dataSourceBuilder().build();
Expand Down