Incapsulated setSchema/getSchema logic in SessionInterface

h2/src/main/org/h2/engine/Session.java

@@ -1221,10 +1221,17 @@ public class Session extends SessionWithState {
         this.currentSchemaName = schema.getName();
     }
 
+    @Override
     public String getCurrentSchemaName() {
         return currentSchemaName;
     }
 
+    @Override
+    public void setCurrentSchemaName(String schemaName) {
+        Schema schema = database.getSchema(schemaName);
+        setCurrentSchema(schema);
+    }
+
     /**
      * Create an internal connection. This connection is used when initializing
      * triggers, and when calling user defined functions.

h2/src/main/org/h2/engine/SessionInterface.java

@@ -7,8 +7,8 @@ package org.h2.engine;
 
 import java.io.Closeable;
 import java.util.ArrayList;
-
 import org.h2.command.CommandInterface;
+import org.h2.jdbc.JdbcConnection;
 import org.h2.message.Trace;
 import org.h2.store.DataHandler;
 import org.h2.value.Value;
@@ -140,4 +140,18 @@ public interface SessionInterface extends Closeable {
      * @return true if this session is remote
      */
     boolean isRemote();
+
+    /**
+     * Set current schema as in {@link JdbcConnection#setSchema(String)}.
+     *
+     * @param schema the schema name
+     */
+    void setCurrentSchemaName(String schema);
+
+    /**
+     * Get current schema as in {@link JdbcConnection#getSchema()}.
+     *
+     * @return the current schema name
+     */
+    String getCurrentSchemaName();
 }

h2/src/main/org/h2/engine/SessionRemote.java

@@ -858,4 +858,14 @@ public class SessionRemote extends SessionWithState implements DataHandler {
     public boolean isRemote() {
         return true;
     }
+
+    @Override
+    public String getCurrentSchemaName() {
+        throw DbException.getUnsupportedException("getSchema && remote session");
+    }
+
+    @Override
+    public void setCurrentSchemaName(String schema) {
+        throw DbException.getUnsupportedException("setSchema && remote session");
+    }
 }

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -1903,12 +1903,7 @@ public class JdbcConnection extends TraceObject implements Connection, JdbcConne
                 debugCodeCall("setSchema", schema);
             }
             checkClosed();
-            if (session.isRemote()) {
-                throw DbException.getUnsupportedException("setSchema && remote session");
-            }
-            Database database = (Database) session.getDataHandler();
-            Schema s = database.getSchema(schema);
-            ((Session) session).setCurrentSchema(s);
+            session.setCurrentSchemaName(schema);
         } catch (Exception e) {
             throw logAndConvert(e);
         }
@@ -1926,10 +1921,7 @@ public class JdbcConnection extends TraceObject implements Connection, JdbcConne
                 debugCodeCall("getSchema");
             }
             checkClosed();
-            if (session.isRemote()) {
-                throw DbException.getUnsupportedException("getSchema && remote session");
-            }
-            return ((Session) session).getCurrentSchemaName();
+            return session.getCurrentSchemaName();
         } catch (Exception e) {
             throw logAndConvert(e);
         }