#13 - Support setting [default] schema via properties

Author: rbygrave

src/main/java/io/ebean/datasource/DataSourceConfig.java

@@ -22,6 +22,8 @@ public class DataSourceConfig {
 
   private String password;
 
+  private String schema;
+
   /**
    * The name of the database platform (for use with ownerUsername and InitDatabase).
    */
@@ -98,6 +100,7 @@ public DataSourceConfig copy() {
     copy.url = url;
     copy.username = username;
     copy.password = password;
+    copy.schema = schema;
     copy.platform = platform;
     copy.ownerUsername = ownerUsername;
     copy.ownerPassword = ownerPassword;
@@ -149,6 +152,9 @@ public DataSourceConfig setDefaults(DataSourceConfig other) {
     if (password == null) {
       password = other.password;
     }
+    if (schema == null) {
+      schema = other.schema;
+    }
     return this;
   }
 
@@ -207,6 +213,21 @@ public DataSourceConfig setPassword(String password) {
     return this;
   }
 
+  /**
+   * Return the database username.
+   */
+  public String getSchema() {
+    return schema;
+  }
+
+  /**
+   * Set the default database schema to use.
+   */
+  public DataSourceConfig setSchema(String schema) {
+    this.schema = schema;
+    return this;
+  }
+
   /**
    * Return the database driver.
    */
@@ -752,6 +773,7 @@ private void loadSettings(ConfigPropertiesHelper properties) {
 
     username = properties.get("username", username);
     password = properties.get("password", password);
+    schema = properties.get("schema", schema);
     platform = properties.get("platform", platform);
     ownerUsername = properties.get("ownerUsername", ownerUsername);
     ownerPassword = properties.get("ownerPassword", ownerPassword);

src/test/java/io/ebean/datasource/DataSourceConfigTest.java

@@ -2,8 +2,10 @@
 
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -54,6 +56,7 @@ public void copy() {
     source.setUsername("un");
     source.setPassword("pw");
     source.setUrl("url");
+    source.setSchema("sch");
 
     Map<String,String> customSource = new LinkedHashMap<>();
     customSource.put("a","a");
@@ -65,6 +68,7 @@ public void copy() {
     assertEquals("un", copy.getUsername());
     assertEquals("pw", copy.getPassword());
     assertEquals("url", copy.getUrl());
+    assertEquals("sch", copy.getSchema());
     assertEquals(42, copy.getMinConnections());
     assertEquals(45, copy.getMaxConnections());
 
@@ -88,6 +92,8 @@ public void defaults() {
     assertThat(readOnly.getUrl()).isEqualTo(config.getUrl());
     assertThat(readOnly.getUsername()).isEqualTo(config.getUsername());
     assertThat(readOnly.getPassword()).isEqualTo(config.getPassword());
+    assertThat(readOnly.getSchema()).isEqualTo(config.getSchema());
+
   }
 
   @Test
@@ -115,4 +121,18 @@ private DataSourceConfig create() {
     config.setPassword("bar");
     return config;
   }
+
+  @Test
+  public void loadSettings() throws IOException {
+
+    DataSourceConfig config = new DataSourceConfig();
+
+    Properties props = new Properties();
+    props.load(getClass().getResourceAsStream("/example.properties"));
+    config.loadSettings(props, "db");
+
+    assertThat(config.getUsername()).isEqualTo("myusername");
+    assertThat(config.getPassword()).isEqualTo("mypassword");
+    assertThat(config.getSchema()).isEqualTo("myschema");
+  }
 }

src/test/resources/example.properties

@@ -0,0 +1,3 @@
+datasource.db.username=myusername
+datasource.db.password=mypassword
+datasource.db.schema=myschema