Merge branch 'master' into wip/h2database-v2

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.13.3-SNAPSHOT</version>
+    <version>12.14.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.12.1</version>
+      <version>12.13.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.13.3-SNAPSHOT</version>
+      <version>12.14.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.13.3-SNAPSHOT</version>
+      <version>12.14.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java

@@ -5,6 +5,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.ddlrunner.DdlRunner;
 import io.ebean.ddlrunner.ScriptTransform;
+import io.ebean.util.IOUtils;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiDdlGenerator;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -17,13 +18,11 @@ import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Reader;
+import java.io.Writer;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -50,6 +49,7 @@ public class DdlGenerator implements SpiDdlGenerator {
   private final ScriptTransform scriptTransform;
   private final Platform platform;
   private final String platformName;
+  private final boolean useMigrationStoredProcedures;
 
   private CurrentModel currentModel;
   private String dropAllContent;
@@ -71,9 +71,11 @@ public class DdlGenerator implements SpiDdlGenerator {
       log.warn("DDL can't be run on startup with TenantMode " + config.getTenantMode());
       this.runDdl = false;
       this.ddlAutoCommit = false;
+      this.useMigrationStoredProcedures = false;
     } else {
       this.runDdl = config.isDdlRun();
       this.ddlAutoCommit = databasePlatform.isDdlAutoCommit();
+      this.useMigrationStoredProcedures = config.getDatabasePlatform().isUseMigrationStoredProcedures();
     }
     this.scriptTransform = createScriptTransform(config);
     this.baseDir = initBaseDir();
@@ -187,7 +189,7 @@ public class DdlGenerator implements SpiDdlGenerator {
 
   protected void runDropSql(Connection connection) throws IOException {
     if (!createOnly) {
-      if (extraDdl && jaxbPresent) {
+      if (extraDdl && jaxbPresent && useMigrationStoredProcedures) {
         String extraApply = ExtraDdlXmlReader.buildExtra(platform, true);
         if (extraApply != null) {
           runScript(connection, false, extraApply, "extra-ddl");
@@ -268,7 +270,7 @@ public class DdlGenerator implements SpiDdlGenerator {
         if (is == null) {
           log.warn("sql script {} was not found as a resource", sqlScript);
         } else {
-          String content = readContent(new InputStreamReader(is));
+          String content = readContent(IOUtils.newReader(is)); // 'is' is closed
           runScript(connection, false, content, sqlScript);
         }
       }
@@ -337,7 +339,7 @@ public class DdlGenerator implements SpiDdlGenerator {
 
   protected void writeFile(String fileName, String fileContent) throws IOException {
     File f = new File(baseDir, fileName);
-    try (FileWriter fw = new FileWriter(f)) {
+    try (Writer fw = IOUtils.newWriter(f)) {
       fw.write(fileContent);
       fw.flush();
     }
@@ -348,7 +350,9 @@ public class DdlGenerator implements SpiDdlGenerator {
     if (!f.exists()) {
       return null;
     }
-    return readContent(new FileReader(f));
+    try (Reader reader = IOUtils.newReader(f)) {
+      return readContent(reader);
+    }
   }
 
   protected String readContent(Reader reader) throws IOException {

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java

@@ -1,8 +1,22 @@
 package io.ebeaninternal.dbmigration;
 
+import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringJoiner;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.Platform;
+import io.ebean.config.ClassLoadConfig;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.PlatformConfig;
@@ -27,6 +41,8 @@ import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer16Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebean.dbmigration.DbMigration;
+import io.ebean.util.IOUtils;
+import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.DbOffline;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
@@ -42,17 +58,6 @@ import io.ebeaninternal.dbmigration.model.PlatformDdlWriter;
 import io.ebeaninternal.extraddl.model.DdlScript;
 import io.ebeaninternal.extraddl.model.ExtraDdl;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
 
 /**
  * Generates DB Migration xml and sql scripts.
@@ -392,19 +397,22 @@ public class DefaultDbMigration implements DbMigration {
   private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, boolean tablePartitioning) throws IOException {
     if (dbPlatform != null) {
       if (tablePartitioning && includeBuiltInPartitioning) {
-        generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning());
+        generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning(), false);
       }
-      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin());
-      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.read());
+      // skip built-in migration stored procedures based on isUseMigrationStoredProcedures
+      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltin(), true);
+      generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.read(), false);
     }
   }
 
-  private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl) throws IOException {
+  private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl, boolean checkSkip) throws IOException {
     if (extraDdl != null) {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
         if (!script.isDrop() && matchPlatform(dbPlatform.getPlatform(), script.getPlatforms())) {
-          writeExtraDdl(migrationDir, script);
+          if (!checkSkip || dbPlatform.isUseMigrationStoredProcedures()) {
+            writeExtraDdl(migrationDir, script);
+          }
         }
       }
     }
@@ -417,7 +425,7 @@ public class DefaultDbMigration implements DbMigration {
     String fullName = repeatableMigrationName(script.isInit(), script.getName());
     logger.debug("writing repeatable script {}", fullName);
     File file = new File(migrationDir, fullName);
-    try (FileWriter writer = new FileWriter(file)) {
+    try (Writer writer = IOUtils.newWriter(file)) {
       writer.write(script.getValue());
       writer.flush();
     }

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java

@@ -2,10 +2,11 @@ package io.ebeaninternal.dbmigration;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.migration.MigrationVersion;
+import io.ebean.util.IOUtils;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -50,17 +51,17 @@ class IndexMigration {
 
   private void generateIndex() throws IOException {
     Collections.sort(all);
-    FileWriter writer = new FileWriter(indexFile);
-    for (Entry entry : all) {
-      writeChecksumPadded(writer, entry.checksum);
-      writer.write(entry.fileName);
+    try (Writer writer = IOUtils.newWriter(indexFile)) {
+      for (Entry entry : all) {
+        writeChecksumPadded(writer, entry.checksum);
+        writer.write(entry.fileName);
+        writer.write(eol);
+      }
       writer.write(eol);
     }
-    writer.write(eol);
-    writer.close();
   }
 
-  private void writeChecksumPadded(FileWriter writer, int checksum) throws IOException {
+  private void writeChecksumPadded(Writer writer, int checksum) throws IOException {
     final String asStr = String.valueOf(checksum);
     writer.write(asStr);
     writer.write(',');

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/MChecksum.java

@@ -4,6 +4,8 @@ import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.CRC32;
 
+import io.ebean.util.IOUtils;
+
 /**
  * Calculates the checksum for the given file content.
  */
@@ -13,9 +15,8 @@ class MChecksum {
    * Returns the checksum of the file. Agnostic of encoding and new line character.
    */
   static int calculate(File file) {
-    try {
+    try (BufferedReader bufferedReader = IOUtils.newReader(file)) {
       final CRC32 crc32 = new CRC32();
-      BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
       String line;
       while ((line = bufferedReader.readLine()) != null) {
         final byte[] lineBytes = line.getBytes(StandardCharsets.UTF_8);

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java

@@ -18,12 +18,15 @@ public class MySqlDdl extends PlatformDdl {
   // this flag is for compatibility. Use it with care.
   private static final boolean USE_CHECK_CONSTRAINT = Boolean.getBoolean("ebean.mysql.useCheckConstraint");
 
+  private final boolean useMigrationStoredProcedures;
+
   public MySqlDdl(DatabasePlatform platform) {
     super(platform);
     this.alterColumn = "modify";
     this.dropUniqueConstraint = "drop index";
     this.historyDdl = new MySqlHistoryDdl();
     this.inlineComments = true;
+    this.useMigrationStoredProcedures = platform.isUseMigrationStoredProcedures();
   }
 
   /**
@@ -34,6 +37,15 @@ public class MySqlDdl extends PlatformDdl {
     return "drop index " + maxConstraintName(indexName) + " on " + tableName;
   }
 
+  @Override
+  public void alterTableDropColumn(final DdlBuffer buffer, final String tableName, final String columnName) throws IOException {
+    if (this.useMigrationStoredProcedures) {
+      buffer.append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')").endOfStatement();
+    } else {
+      super.alterTableDropColumn(buffer, tableName, columnName);
+    }
+  }
+
   /**
    * Return the drop foreign key clause.
    */

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java

@@ -1,14 +1,15 @@
 package io.ebeaninternal.dbmigration.migrationreader;
 
 
+import io.ebean.util.IOUtils;
 import io.ebeaninternal.dbmigration.migration.Migration;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 
 /**
  * Simple writer for output of the Migration/ChangeSet as an XML document.
@@ -26,7 +27,7 @@ public class MigrationXmlWriter {
    */
   public void write(Migration migration, File file) {
 
-    try (FileWriter writer = new FileWriter(file)) {
+    try (Writer writer = IOUtils.newWriter(file)) {
 
       writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
       if (comment != null) {

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java

@@ -2,6 +2,7 @@ package io.ebeaninternal.dbmigration.model;
 
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.util.IOUtils;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
@@ -14,7 +15,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.List;
@@ -70,16 +70,16 @@ public class PlatformDdlWriter {
    */
   protected void writePlatformDdl(DdlWrite write, File resourcePath, String fullVersion) throws IOException {
     if (!write.isApplyEmpty()) {
-      try (FileWriter applyWriter = createWriter(resourcePath, fullVersion, ".sql")) {
+      try (Writer applyWriter = createWriter(resourcePath, fullVersion, ".sql")) {
         writeApplyDdl(applyWriter, write);
         applyWriter.flush();
       }
     }
   }
 
-  protected FileWriter createWriter(File path, String fullVersion, String suffix) throws IOException {
+  protected Writer createWriter(File path, String fullVersion, String suffix) throws IOException {
     File applyFile = new File(path, fullVersion + suffix);
-    return new FileWriter(applyFile);
+    return IOUtils.newWriter(applyFile);
   }
 
   /**

ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml

@@ -112,5 +112,88 @@ BEGIN
 END
 GO
 </ddl-script>
+<ddl-script name="create procs" platforms="mysql" init="true">-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
 
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+DECLARE done INT DEFAULT FALSE;
+DECLARE c_fk_name CHAR(255);
+DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
+WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+AND REFERENCED_TABLE_NAME IS NOT NULL;
+DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+OPEN curs;
+
+read_loop: LOOP
+FETCH curs INTO c_fk_name;
+IF done THEN
+LEAVE read_loop;
+END IF;
+SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+END LOOP;
+
+CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+END
+$$
+</ddl-script>
+
+<ddl-script name="create procs" platforms="hana" init="true">-- Inital script to create stored procedures etc for the hana platform
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_foreign_keys(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
+DECLARE i INT;
+
+foreign_key_names = SELECT CONSTRAINT_NAME, TABLE_NAME FROM SYS.REFERENTIAL_CONSTRAINTS WHERE SCHEMA_NAME=CURRENT_SCHEMA AND TABLE_NAME=UPPER(:table_name) AND COLUMN_NAME=UPPER(:column_name);
+
+FOR I IN 1 .. RECORD_COUNT(:foreign_key_names) DO
+EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) || '" DROP CONSTRAINT "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.CONSTRAINT_NAME[i]) || '"';
+END FOR;
+
+END;
+$$
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE OR REPLACE PROCEDURE usp_ebean_drop_column(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
+AS
+BEGIN
+CALL usp_ebean_drop_foreign_keys(table_name, column_name);
+EXEC 'ALTER TABLE "' || UPPER(ESCAPE_DOUBLE_QUOTES(table_name)) || '" DROP ("' || UPPER(ESCAPE_DOUBLE_QUOTES(column_name)) || '")';
+END;
+$$
+</ddl-script>
 </extra-ddl>

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MChecksumTest.java

@@ -7,7 +7,7 @@ import java.io.File;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MChecksumTest {
-
+  
   @Test
   public void calculate() {
     File file = new File("src/test/resources/dbmigration/index/1.0__hello.sql");
@@ -15,4 +15,12 @@ public class MChecksumTest {
 
     assertThat(MChecksum.calculate(file)).isEqualTo(907060870);
   }
+
+  @Test
+  public void calculateWithSpecialChars() {
+    File file = new File("src/test/resources/dbmigration/index-special-chars/1.0__hello.sql");
+    assertThat(file).exists();
+
+    assertThat(MChecksum.calculate(file)).isEqualTo(1859426839);
+  }
 }

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MysqlGenerateMigrationTest.java

@@ -0,0 +1,85 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.annotation.Platform;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.config.PlatformConfig;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Class to test the alternative drop behaviour using stored procedures for MySql databases .
+ *
+ * @author Jonas Pöhler, FOCONIS AG
+ */
+public class MysqlGenerateMigrationTest {
+
+  @AfterEach
+  public void resetPendingDropsProperty() {
+    System.clearProperty("ddl.migration.pendingDropsFor");
+  }
+
+  @Test
+  public void testMysqlStoredProcedures() throws Exception {
+    DefaultDbMigration migration = new DefaultDbMigration();
+    migration.setIncludeIndex(true);
+    // We use src/test/resources as output directory (so we see in GIT if files will change)
+    migration.setPathToResources("src/test/resources");
+
+    migration.addPlatform(Platform.MYSQL, "mysql");
+
+    final PlatformConfig platformConfig = new PlatformConfig();
+    platformConfig.setUseMigrationStoredProcedures(true);
+
+    DatabaseConfig config = new DatabaseConfig();
+    config.setName("migrationtest");
+    config.loadFromProperties();
+    config.setPlatformConfig(platformConfig);
+    config.setRegister(false);
+    config.setDefaultServer(false);
+    config.getProperties().put("ebean.migration.migrationPath", "db/migration/mysql");
+
+    config.setPackages(Arrays.asList("misc.migration.mysql_v1_0"));
+    Database server = DatabaseFactory.create(config);
+    migration.setServer(server);
+    migration.setMigrationPath("mysql/procedures");
+
+    // First, we clean up the output-directory
+    assertThat(migration.migrationDirectory().getAbsolutePath()).contains("procedures");
+    Files.walk(migration.migrationDirectory().toPath())
+      .filter(Files::isRegularFile)
+      .map(Path::toFile).forEach(File::delete);
+
+    // then we generate migration scripts for v1_0
+    assertThat(migration.generateMigration()).isEqualTo("1.0__initial");
+
+    config.setPackages(Arrays.asList("misc.migration.mysql_v1_1"));
+    server.shutdown();
+    server = DatabaseFactory.create(config);
+    migration.setServer(server);
+    migration.setMigrationPath("mysql/procedures");
+    assertThat(migration.generateMigration()).isEqualTo("1.1");
+
+    System.setProperty("ddl.migration.pendingDropsFor", "1.1");
+    assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
+
+    final Path sqlFile = migration.migrationDirectory().toPath()
+      .resolve("mysql/1.2__dropsFor_1.1.sql");
+
+    assertThat(sqlFile).isNotEmptyFile();
+    assertThat(Files.readAllLines(sqlFile, StandardCharsets.UTF_8))
+      .contains("CALL usp_ebean_drop_column('migtest_e_basic', 'status2');")
+      .contains("CALL usp_ebean_drop_column('migtest_e_basic', 'description');");
+
+  }
+}

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/Helper.java

@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration;
 
+import io.ebean.util.IOUtils;
 import io.ebeaninternal.dbmigration.migration.AddColumn;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.CreateTable;
@@ -9,8 +10,8 @@ import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.io.Reader;
 import java.util.List;
 
 /**
@@ -89,8 +90,7 @@ public class Helper {
 
   public static String asText(InputStream in) throws IOException {
 
-    try {
-      InputStreamReader reader = new InputStreamReader(in);
+    try (Reader reader = IOUtils.newReader(in)) {
 
       LineNumberReader lineNumberReader = new LineNumberReader(reader);
 

ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_0/EBasic.java

@@ -0,0 +1,89 @@
+package misc.migration.mysql_v1_0;
+
+import io.ebean.annotation.DbDefault;
+import io.ebean.annotation.EnumValue;
+import io.ebean.annotation.NotNull;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
+@Entity
+@Table(name = "migtest_e_basic")
+public class EBasic {
+
+  public enum Status {
+    @EnumValue("N")
+    NEW,
+
+    @EnumValue("A")
+    ACTIVE,
+
+    @EnumValue("I")
+    INACTIVE,
+  }
+
+  @Id
+  Integer id;
+
+  Status status;
+
+  @DbDefault("N")
+  @NotNull
+  Status status2;
+
+  @Size(max=127)
+  String name;
+
+  @Size(max=127)
+  String description;
+
+  public EBasic() {
+
+  }
+
+  public EBasic(String name) {
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Status getStatus2() {
+    return status2;
+  }
+
+  public void setStatus2(final Status status2) {
+    this.status2 = status2;
+  }
+}

ebean-ddl-generator/src/test/java/misc/migration/mysql_v1_1/EBasic.java

@@ -0,0 +1,64 @@
+package misc.migration.mysql_v1_1;
+
+import io.ebean.annotation.EnumValue;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+
+@Entity
+@Table(name = "migtest_e_basic")
+public class EBasic {
+
+  public enum Status {
+    @EnumValue("N")
+    NEW,
+
+    @EnumValue("A")
+    ACTIVE,
+
+    @EnumValue("I")
+    INACTIVE,
+  }
+
+  @Id
+  Integer id;
+
+  Status status;
+
+  @Size(max=127)
+  String name;
+
+  public EBasic() {
+
+  }
+
+  public EBasic(String name) {
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public Status getStatus() {
+    return status;
+  }
+
+  public void setStatus(Status status) {
+    this.status = status;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

ebean-ddl-generator/src/test/resources/dbmigration/index-special-chars/1.0__hello.sql

@@ -0,0 +1 @@
+helloäüü

ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.0__initial.model.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply">
+        <createTable name="migtest_e_basic" pkName="pk_migtest_e_basic">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="status" type="varchar(1)" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>
+            <column name="status2" type="varchar(1)" defaultValue="'N'" notnull="true" checkConstraint="check ( status2 in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status2"/>
+            <column name="name" type="varchar(127)"/>
+            <column name="description" type="varchar(127)"/>
+        </createTable>
+    </changeSet>
+</migration>

ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.1.model.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="pendingDrops">
+        <dropColumn columnName="status2" tableName="migtest_e_basic"/>
+        <dropColumn columnName="description" tableName="migtest_e_basic"/>
+    </changeSet>
+</migration>

ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.2__dropsFor_1.1.model.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+    <changeSet type="apply" dropsFor="1.1">
+        <dropColumn columnName="status2" tableName="migtest_e_basic"/>
+        <dropColumn columnName="description" tableName="migtest_e_basic"/>
+    </changeSet>
+</migration>

ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.0__initial.sql

@@ -0,0 +1,11 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+create table migtest_e_basic (
+  id                            integer auto_increment not null,
+  status                        varchar(1),
+  status2                       varchar(1) default 'N' not null,
+  name                          varchar(127),
+  description                   varchar(127),
+  constraint pk_migtest_e_basic primary key (id)
+);
+

ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.2__dropsFor_1.1.sql

@@ -0,0 +1,6 @@
+-- Migrationscripts for ebean unittest
+-- apply changes
+CALL usp_ebean_drop_column('migtest_e_basic', 'status2');
+
+CALL usp_ebean_drop_column('migtest_e_basic', 'description');
+

ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/I__create_procs.sql

@@ -0,0 +1,48 @@
+-- Inital script to create stored procedures etc for mysql platform
+DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN
+-- deletes all constraints and foreign keys referring to TABLE.COLUMN
+--
+CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+DECLARE done INT DEFAULT FALSE;
+DECLARE c_fk_name CHAR(255);
+DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE
+WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name
+AND REFERENCED_TABLE_NAME IS NOT NULL;
+DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+OPEN curs;
+
+read_loop: LOOP
+FETCH curs INTO c_fk_name;
+IF done THEN
+LEAVE read_loop;
+END IF;
+SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+END LOOP;
+
+CLOSE curs;
+END
+$$
+
+DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
+
+delimiter $$
+--
+-- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN
+-- deletes the column and ensures that all indices and constraints are dropped first
+--
+CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
+BEGIN
+CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
+SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+END
+$$

ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/idx_mysql.migrations

@@ -0,0 +1,4 @@
+1835064798,     I__create_procs.sql
+1968521526,     1.0__initial.sql
+-728933533,     1.2__dropsFor_1.1.sql
+