GEOMESA-3294 Partitioned PostGIS - use default database schema if not…

… specified
locationtech · Sep 18, 2023 · fc0a1ed · fc0a1ed
1 parent bad5cf1
commit fc0a1ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...la/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala b/...la/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreFactory.scala
@@ -50,6 +50,13 @@ class PartitionedPostgisDataStoreFactory extends PostgisNGDataStoreFactory with
     if (!params.containsKey(PreparedStatements.key)) {
       params.put(PreparedStatements.key, java.lang.Boolean.TRUE)
     }
+    // set default schema, if not specified - postgis store doesn't actually use its own default
+    if (!params.containsKey(PostgisNGDataStoreFactory.SCHEMA.key)) {
+      // need to set it in the store, as the key has already been processed
+      store.setDatabaseSchema("public")
+      // also set in the params for consistency, although it's not used anywhere
+      params.put(PostgisNGDataStoreFactory.SCHEMA.key, "public")
+    }
     val ds = super.createDataStoreInternal(store, params)
     val dialect = new PartitionedPostgisDialect(ds)
 

diff --git a/...scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala b/...scala/org/locationtech/geomesa/gt/partition/postgis/PartitionedPostgisDataStoreTest.scala
@@ -77,7 +77,6 @@ class PartitionedPostgisDataStoreTest extends Specification with BeforeAfterAll
     "dbtype" -> PartitionedPostgisDataStoreParams.DbType.sample,
     "host" -> host,
     "port" -> port,
-    "schema" -> schema,
     "database" -> "postgres",
     "user" -> "postgres",
     "passwd" -> "postgres",