Merge pull request #117 from ebean-orm/feature/mysql-extradb

MySql MariaDB - Add support for extraDb

Author: rbygrave

src/main/java/io/ebean/test/containers/BaseMySqlContainer.java

@@ -2,6 +2,8 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 abstract class BaseMySqlContainer<C extends BaseMySqlContainer<C>> extends BaseJdbcContainer<C> {
@@ -25,6 +27,9 @@ private void createRoleAndDatabase(boolean withDrop) {
       if (withDrop) {
         dropUserIfExists(connection, dbConfig.getUsername());
         dropDatabaseIfExists(connection, dbConfig.getDbName());
+        for (String extraDb : toDatabaseNames(dbConfig.getExtraDb())) {
+          dropDatabaseIfExists(connection, extraDb);
+        }
       }
       createDatabase(connection);
       createUser(connection);
@@ -34,13 +39,8 @@ private void createRoleAndDatabase(boolean withDrop) {
     }
   }
 
-  private void createUser(Connection connection) {
-    createUser(connection, dbConfig.getUsername(), dbConfig.getPassword(), dbConfig.getDbName());
-  }
-
-
   private void dropDatabaseIfExists(Connection connection, String dbName) {
-    if (databaseExists(connection, dbName)) {
+    if (notEmpty(dbName) && databaseExists(connection, dbName)) {
       sqlRun(connection, "drop database " + dbName);
     }
   }
@@ -51,22 +51,32 @@ private void dropUserIfExists(Connection connection, String username) {
     }
   }
 
-  private void createUser(Connection connection, String dbUser, String dbPassword, String db) {
-    if (!userExists(connection, dbUser)) {
-      sqlRun(connection, "create user '" + dbUser + "'@'%' identified by '" + dbPassword + "'");
-      sqlRun(connection, "grant all on " + db + ".* to '" + dbUser + "'@'%'");
+  private void createUser(Connection connection) {
+    if (!userExists(connection, dbConfig.getUsername())) {
+      sqlRun(connection, "create user '" + dbConfig.getUsername() + "'@'%' identified by '" + dbConfig.getPassword() + "'");
+      sqlRun(connection, "grant all on " + dbConfig.getDbName() + ".* to '" + dbConfig.getUsername() + "'@'%'");
+      for (String extraDb : toDatabaseNames(dbConfig.getExtraDb())) {
+        sqlRun(connection, "grant all on " + extraDb + ".* to '" + dbConfig.getUsername() + "'@'%'");
+      }
     }
   }
 
   private void createDatabase(Connection connection) {
     if (!databaseExists(connection, dbConfig.getDbName())) {
       createDatabase(connection, dbConfig.getDbName());
+      createExtraDatabases(connection);
       if (!dbConfig.version().startsWith("5")) {
         setLogBinTrustFunction(connection);
       }
     }
   }
 
+  private void createExtraDatabases(Connection connection) {
+    for (String extraDb : toDatabaseNames(dbConfig.getExtraDb())) {
+      createDatabase(connection, extraDb);
+    }
+  }
+
   private void setLogBinTrustFunction(Connection connection) {
     sqlRun(connection, "set global log_bin_trust_function_creators=1");
   }
@@ -85,7 +95,6 @@ private boolean userExists(Connection connection, String dbUser) {
 
   @Override
   protected ProcessBuilder runProcess() {
-
     List<String> args = dockerRun();
     if (defined(dbConfig.getAdminPassword())) {
       args.add("-e");
@@ -116,4 +125,18 @@ protected ProcessBuilder runProcess() {
     return createProcessBuilder(args);
   }
 
+  static List<String> toDatabaseNames(String dbNames) {
+    if (dbNames == null) {
+      return Collections.emptyList();
+    }
+    String[] names = dbNames.split(",");
+    List<String> dbNameList = new ArrayList<>();
+    for (String name : names) {
+      name = name.trim();
+      if (!name.isEmpty()) {
+        dbNameList.add(name);
+      }
+    }
+    return dbNameList;
+  }
 }

src/test/java/io/ebean/test/containers/BaseMySqlContainerTest.java

@@ -0,0 +1,36 @@
+package io.ebean.test.containers;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BaseMySqlContainerTest {
+
+  @Test
+  void toDatabaseNames() {
+    List<String> names = BaseMySqlContainer.toDatabaseNames("foo");
+    assertThat(names).containsExactly("foo");
+
+    names = BaseMySqlContainer.toDatabaseNames("foo,");
+    assertThat(names).containsExactly("foo");
+    names = BaseMySqlContainer.toDatabaseNames(",foo,");
+    assertThat(names).containsExactly("foo");
+    names = BaseMySqlContainer.toDatabaseNames(",foo");
+    assertThat(names).containsExactly("foo");
+  }
+
+  @Test
+  void toDatabaseNames_multiple() {
+    List<String> names = BaseMySqlContainer.toDatabaseNames(" foo , bar ");
+    assertThat(names).containsExactly("foo", "bar");
+
+    names = BaseMySqlContainer.toDatabaseNames("foo,bar");
+    assertThat(names).containsExactly("foo", "bar");
+    names = BaseMySqlContainer.toDatabaseNames(",foo,bar,");
+    assertThat(names).containsExactly("foo", "bar");
+    names = BaseMySqlContainer.toDatabaseNames("  ,  foo  ,  bar  ,  ");
+    assertThat(names).containsExactly("foo", "bar");
+  }
+}

src/test/java/io/ebean/test/containers/MariaDBContainerTest.java

@@ -34,6 +34,7 @@ void randomPort() {
   void start() {
     MariaDBContainer container = MariaDBContainer.builder("latest")
       .containerName("temp_mariadb")
+      .extraDb("foo, bar")
       .port(8306)
       .fastStartMode(true)
       .build();