fixes #2323 always reset schema upon connection retrieval (#2346)

cmuchinsky · web-flow · commit b81bbc9d438f · 2025-08-08T18:16:08.000+09:00
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
@@ -505,11 +505,8 @@ public String getSchema() throws SQLException
    public void setSchema(String schema) throws SQLException
    {
       delegate.setSchema(schema);
-      var appliedSchema = delegate.getSchema();
-      if (appliedSchema != null && !appliedSchema.equals(dbschema)) {
-         dirtyBits |= DIRTY_BIT_SCHEMA;
-      }
-      dbschema = appliedSchema;
+      dbschema = delegate.getSchema();
+      dirtyBits |= DIRTY_BIT_SCHEMA;
    }
 
    /** {@inheritDoc} */
diff --git a/src/test/java/com/zaxxer/hikari/pool/PostgresTest.java b/src/test/java/com/zaxxer/hikari/pool/PostgresTest.java
@@ -42,12 +42,13 @@
 public class PostgresTest
 {
    private static final DockerImageName IMAGE_NAME = DockerImageName.parse("postgres:16");
+   private static final String SCHEMA_NAME = "test";
 
    private PostgreSQLContainer<?> postgres;
 
    @Before
    public void beforeTest() {
-     postgres = new PostgreSQLContainer<>(IMAGE_NAME);
+     postgres = new PostgreSQLContainer<>(IMAGE_NAME).withInitScript("postgres_init_script.sql");
      postgres.start();
    }
 
@@ -139,6 +140,31 @@ public void testCredentialRotation()
       exerciseConfig(config, 3);
    }
 
+   @Test
+   public void testSchema() throws Exception {
+      HikariConfig config = createConfig(postgres);
+      config.setMinimumIdle(1);
+      config.setMaximumPoolSize(1);
+      config.setSchema(SCHEMA_NAME);
+
+      try (HikariDataSource ds = new HikariDataSource(config)) {
+         assertTrue(ds.isRunning());
+         try (Connection connection = ds.getConnection()) {
+            // The connection should be using the schema specified in the config
+            assertEquals(SCHEMA_NAME, connection.getSchema());
+            // Explicitly set the schema to an invalid schema
+            connection.setSchema("invalid");
+            // The connection should have a null schema after setting to an invalid schema
+            assertNull(connection.getSchema());
+         }
+         try (Connection connection = ds.getConnection()) {
+            // The connection should be reset to the schema specified in the config
+            assertEquals(SCHEMA_NAME, connection.getSchema());
+         }
+         assertTrue(ds.isRunning());
+      }
+   }
+
    static private void exerciseConfig(HikariConfig config, int numThreads) {
       try (final HikariDataSource ds = new HikariDataSource(config)) {
          assertTrue(ds.isRunning());
diff --git a/src/test/resources/postgres_init_script.sql b/src/test/resources/postgres_init_script.sql
@@ -0,0 +1 @@
+CREATE SCHEMA IF NOT EXISTS test;

Original file line number	Diff line number	Diff line change
`@@ -505,11 +505,8 @@ public String getSchema() throws SQLException`
`505`	`505`	`public void setSchema(String schema) throws SQLException`
`506`	`506`	`{`
`507`	`507`	`delegate.setSchema(schema);`
`508`		`- var appliedSchema = delegate.getSchema();`
`509`		`- if (appliedSchema != null && !appliedSchema.equals(dbschema)) {`
`510`		`- dirtyBits \|= DIRTY_BIT_SCHEMA;`
`511`		`- }`
`512`		`- dbschema = appliedSchema;`
	`508`	`+ dbschema = delegate.getSchema();`
	`509`	`+ dirtyBits \|= DIRTY_BIT_SCHEMA;`
`513`	`510`	`}`
`514`	`511`
`515`	`512`	`/** {@inheritDoc} */`