Merge pull request #5 from FOCONIS/master

Fix for preparedStatementCache on different schemas

Author: rbygrave

pom.xml

@@ -4,12 +4,12 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>oss-parent</artifactId>
+    <artifactId>java8-parent</artifactId>
     <version>1.1</version>
   </parent>
 
   <artifactId>avaje-datasource</artifactId>
-  <version>1.1.5-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
 
   <scm>
     <connection>scm:git:https://github.com/ebean-orm/avaje-datasource.git</connection>
@@ -19,7 +19,7 @@
   </scm>
 
   <properties>
-    <java.version>1.6</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
@@ -44,6 +44,14 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- Override com.h2database version to get schema support -->    
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.193</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

src/main/java/org/avaje/datasource/delegate/ConnectionDelegator.java

@@ -8,6 +8,8 @@
 public class ConnectionDelegator implements Connection {
 
   private final Connection delegate;
+  
+  protected String currentSchema;
 
   public ConnectionDelegator(Connection delegate) {
     this.delegate = delegate;
@@ -23,6 +25,7 @@ public Connection getDelegate() {
   @Override
   public void setSchema(String schema) throws SQLException {
     delegate.setSchema(schema);
+    currentSchema = schema;
   }
 
   @Override

src/main/java/org/avaje/datasource/pool/PooledConnection.java

@@ -363,15 +363,21 @@ void returnPreparedStatement(ExtendedPreparedStatement pstmt) {
    * This will try to use a cache of PreparedStatements.
    */
   public PreparedStatement prepareStatement(String sql, int returnKeysFlag) throws SQLException {
-    String cacheKey = sql + returnKeysFlag;
-    return prepareStatement(sql, true, returnKeysFlag, cacheKey);
+    StringBuilder cacheKey = new StringBuilder(sql.length() + 50);
+    cacheKey.append(sql);
+    cacheKey.append(':').append(currentSchema);
+    cacheKey.append(':').append(returnKeysFlag);
+    return prepareStatement(sql, true, returnKeysFlag, cacheKey.toString());
   }
 
   /**
    * This will try to use a cache of PreparedStatements.
    */
   public PreparedStatement prepareStatement(String sql) throws SQLException {
-    return prepareStatement(sql, false, 0, sql);
+    StringBuilder cacheKey = new StringBuilder(sql.length() + 50);
+    cacheKey.append(sql);
+    cacheKey.append(':').append(currentSchema);
+    return prepareStatement(sql, false, 0, cacheKey.toString());
   }
 
   /**

src/test/java/org/avaje/datasource/pool/ConnectionPoolTest.java

@@ -8,6 +8,9 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.sql.DataSource;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
@@ -116,4 +119,29 @@ public void getDelegate() throws SQLException {
     assertThat(underlying).isInstanceOf(org.h2.jdbc.JdbcConnection.class);
     connection.close();
   }
+  
+  @Test
+  public void testSchemaSwitch() throws SQLException {
+    Connection conn = pool.getConnection();
+    Statement stmt = conn.createStatement();
+    stmt.executeUpdate("CREATE SCHEMA TENANT_1");
+    stmt.executeUpdate("CREATE SCHEMA TENANT_2");
+    stmt.executeUpdate("CREATE TABLE TENANT_1.LOCAL_MODEL (id integer)");
+    stmt.executeUpdate("CREATE TABLE TENANT_2.LOCAL_MODEL (id integer)");
+    stmt.close();
+    
+    conn.setSchema("TENANT_1");
+    PreparedStatement ps1 = conn.prepareStatement("SELECT * from local_model");
+    ps1.close();
+    PreparedStatement ps2 = conn.prepareStatement("SELECT * from local_model");
+    ps2.close();
+
+    conn.setSchema("TENANT_2");
+    PreparedStatement ps3 = conn.prepareStatement("SELECT * from local_model");
+    ps3.close();
+
+
+    assertThat(ps1).isSameAs(ps2);  // test if pstmtCache is working
+    assertThat(ps1).isNotSameAs(ps3); // test if datasource recognize schema change
+  }
 }