Merge pull request #69 from ebean-orm/feature/use-connectionSetSchema

When schema specified, change to use connection.setSchema() rather than connection Properties

Author: rbygrave

ebean-datasource-api/src/main/java/io/ebean/datasource/PostgresInitDatabase.java

@@ -17,10 +17,14 @@ public class PostgresInitDatabase implements InitDatabase {
   public void run(Connection connection, DataSourceConfig config) throws SQLException {
     String username = config.getUsername();
     String password = config.getPassword();
-    log.log(System.Logger.Level.INFO, "Creating schema and role for {0}", username);
-    execute(connection, String.format("create schema if not exists %s", username));
+    String schema = config.getSchema();
+    if (schema == null) {
+      schema = username;
+    }
+    log.log(System.Logger.Level.INFO, "Creating schema {0} role {1}", schema, username);
+    execute(connection, String.format("create schema if not exists %s", schema));
     execute(connection, String.format("create role %s with login password '%s'", username, password));
-    execute(connection, String.format("grant all on schema %s to %s", username, username));
+    execute(connection, String.format("grant all on schema %s to %s", schema, username));
   }
 
   private void execute(Connection connection, String sql) throws SQLException {

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -43,6 +43,7 @@ final class ConnectionPool implements DataSourcePool {
   private final String driver;
   private final String url;
   private final String user;
+  private final String schema;
   private final String heartbeatsql;
   private final int heartbeatFreqSecs;
   private final int heartbeatTimeoutSeconds;
@@ -114,6 +115,7 @@ final class ConnectionPool implements DataSourcePool {
     this.applicationName = params.getApplicationName();
     this.clientInfo = params.getClientInfo();
     this.queue = new PooledConnectionQueue(this);
+    this.schema = params.getSchema();
     this.user = params.getUsername();
     if (user == null) {
       throw new DataSourceConfigurationException("DataSource user is not set? url is [" + url + "]");
@@ -125,10 +127,6 @@ final class ConnectionPool implements DataSourcePool {
     this.connectionProps = new Properties();
     this.connectionProps.setProperty("user", user);
     this.connectionProps.setProperty("password", pw);
-    final String schema = params.getSchema();
-    if (schema != null) {
-      this.connectionProps.setProperty("schema", schema);
-    }
 
     Map<String, String> customProperties = params.getCustomProperties();
     if (customProperties != null) {
@@ -427,6 +425,9 @@ private void initConnection(Connection conn) throws SQLException {
     if (readOnly) {
       conn.setReadOnly(true);
     }
+    if (schema != null) {
+      conn.setSchema(schema);
+    }
     if (applicationName != null) {
       try {
         conn.setClientInfo("ApplicationName", applicationName);

ebean-datasource/src/test/java/io/ebean/datasource/test/PostgresInitTest.java

@@ -77,24 +77,39 @@ void test_with_clientInfo() throws SQLException {
   }
 
   @Test
-  void test_with_applicationName() throws SQLException {
+  void test_with_applicationNameAndSchema() throws SQLException {
     DataSourceConfig ds = new DataSourceConfig();
     ds.setUrl("jdbc:postgresql://127.0.0.1:9999/app");
-    // our application credentials (typically same as db and schema name with Postgres)
-    ds.setUsername("app");
-    ds.setPassword("app_pass");
-    // database owner credentials used to create the "app" role as needed
-    ds.setOwnerUsername("db_owner");
-    ds.setOwnerPassword("test");
+    ds.setSchema("fred");
+    ds.setUsername("db_owner");
+    ds.setPassword("test");
     ds.setApplicationName("my-application-name");
 
     DataSourcePool pool = DataSourceFactory.create("app", ds);
     try {
       try (Connection connection = pool.getConnection()) {
-        try (PreparedStatement statement = connection.prepareStatement("create table if not exists app.my_table (acol integer);")) {
+        try (PreparedStatement statement = connection.prepareStatement("create schema if not exists fred;")) {
           statement.execute();
         }
         connection.commit();
+        try (PreparedStatement statement = connection.prepareStatement("create table if not exists fred_table (acol integer);")) {
+          statement.execute();
+        }
+        try (PreparedStatement statement = connection.prepareStatement("insert into fred_table (acol) values (?);")) {
+          statement.setInt(1, 42);
+          int rows = statement.executeUpdate();
+          assertThat(rows).isEqualTo(1);
+        }
+        try (PreparedStatement statement = connection.prepareStatement("select acol from fred.fred_table")) {
+          try (ResultSet resultSet = statement.executeQuery()) {
+            while(resultSet.next()) {
+              int res = resultSet.getInt(1);
+              assertThat(res).isEqualTo(42);
+            }
+          }
+        }
+        connection.commit();
+
         try (PreparedStatement statement = connection.prepareStatement("select application_name from pg_stat_activity where usename = ?")) {
           statement.setString(1, "app");
           try (ResultSet rset = statement.executeQuery()) {