Provide a fix for preparedStatementCache

Author: rPraml

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());
   }
 
   /**