#414 BUG: Migrations containing strings that span more than one line and have \; fail to run

Author: Igor Polevoy

db-migrator/src/main/java/org/javalite/db_migrator/Migration.java

@@ -3,10 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
+import java.io.*;
 
 import static org.javalite.db_migrator.DbUtils.exec;
 
@@ -32,58 +29,94 @@ public String getName() {
         return migrationFile.getName();
     }
 
+    public static String read(InputStream in, String charset) throws IOException {
+        if (in == null) {
+            throw new IllegalArgumentException("input stream cannot be null");
+        }
+        InputStreamReader reader = null;
+        try {
+            reader = new InputStreamReader(in, charset);
+            char[] buffer = new char[1024];
+            StringBuilder sb = new StringBuilder();
+            int len;
+            while ((len = reader.read(buffer)) != -1) {
+                sb.append(buffer, 0, len);
+            }
+            return sb.toString();
+        } finally {
+            assert reader != null;
+            reader.close();
+        }
+    }
+
+
     public void migrate(String encoding) throws Exception {
 
+        //TODO: I must say this needs to be refactored.
+        try {
+            String migration = read(new FileInputStream(migrationFile), encoding == null ? "UTF-8" : encoding);
+            if (migration.contains("BLOCK")) {
+                processAsBlocks(migration);
+            } else {
+                processLineByLine(encoding);
+            }
+        } catch (Exception e) {
+            throw new MigrationException(e);
+        }
+    }
 
+    private void processLineByLine(String encoding) throws IOException {
         StringBuilder command = null;
-        try {
-            String delimiter = DEFAULT_DELIMITER;
-            LineNumberReader lineReader = new LineNumberReader(new InputStreamReader(new FileInputStream(migrationFile), encoding == null? "UTF-8" : encoding));
-            String line;
-            while ((line = lineReader.readLine()) != null) {
-                if (command == null) {
-                    command = new StringBuilder();
-                }
 
-                line = line.trim(); // Strip extra whitespace too?
+        String delimiter = DEFAULT_DELIMITER;
+        LineNumberReader lineReader = new LineNumberReader(new InputStreamReader(new FileInputStream(migrationFile), encoding == null ? "UTF-8" : encoding));
+        String line;
+        while ((line = lineReader.readLine()) != null) {
+            if (command == null) {
+                command = new StringBuilder();
+            }
+
+            line = line.trim(); // Strip extra whitespace too?
+
+            if (line.length() < 1) {
+                // Do nothing, it's an empty line.
+            } else if (commentLine(line)) {
+                logger.debug(line);
+            } else {
+                if (startsWithIgnoreCase(line, DEFAULT_DELIMITER_KEYWORD)) {
+                    delimiter = line.substring(9).trim();
+                } else if ((command.length() == 0) && startsWithIgnoreCase(line, "create ") && containsIgnoreCase(line, " as ")) {
+                    delimiter = line.substring(line.toLowerCase().lastIndexOf(" as ") + 4);
+                    command.append(line);
+                    command.append(" ");
+                } else if (line.contains(delimiter)) {
+                    if (line.startsWith(delimiter)) {
+                        delimiter = DEFAULT_DELIMITER;
+                    }
 
-                if (line.length() < 1) {
-                    // Do nothing, it's an empty line.
-                } else if (commentLine(line)) {
-                    logger.debug(line);
-                } else {
-                    if (startsWithIgnoreCase(line, DEFAULT_DELIMITER_KEYWORD)) {
-                        delimiter = line.substring(10).trim();
-                    } else if ((command.length() == 0) && startsWithIgnoreCase(line, "create ") && containsIgnoreCase(line, " as ")) {
-                        delimiter = line.substring(line.toLowerCase().lastIndexOf(" as ") + 4);
-                        command.append(line);
-                        command.append(" ");
-                    } else if (line.contains(delimiter)) {
-                        if (line.startsWith(delimiter)) {
-                            delimiter = DEFAULT_DELIMITER;
-                        }
-
-                        if (line.endsWith(delimiter)) {
-                            command.append(line.substring(0, line.lastIndexOf(delimiter)));
-                            exec(command.toString().trim());
-                            command = null;
-                        }
-                    } else {
-                        command.append(line);
-                        command.append(" ");
+                    if (line.endsWith(delimiter)) {
+                        command.append(line.substring(0, line.lastIndexOf(delimiter)));
+                        exec(command.toString().trim());
+                        command = null;
                     }
+                } else {
+                    command.append(line);
+                    command.append(" ");
                 }
             }
+        }
 
-            // Check to see if we have an unexecuted statement in command.
-            if (command != null && command.length() > 0) {
-                //Last statement in script is missing a terminating delimiter, executing anyway.
-                exec(command.toString().trim());
-            }
+        // Check to see if we have an unexecuted statement in command.
+        if (command != null && command.length() > 0) {
+            //Last statement in script is missing a terminating delimiter, executing anyway.
+            exec(command.toString().trim());
+        }
+    }
 
-        } catch (Exception e) {
-            logger.error("Error executing: {}", command, e);
-            throw e;
+    private void processAsBlocks(String migration) {
+        String[] statements = migration.split("BLOCK");
+        for (String statement : statements) {
+            exec(statement);
         }
     }
 

db-migrator/src/test/java/org/javalite/db_migrator/MigrationSpec.java

@@ -97,4 +97,22 @@ public void shouldExecuteLastStatementWhenDelimiterIsMissing() throws Exception
         assertEquals(statements.get(0), "create table users ( username varchar not null, password varchar not null )");
         assertEquals(statements.get(1), "create table roles ( name varchar not null unique, description text not null )");
     }
+
+    @Test
+    public void shouldHandleNewLinesAndSpacesInStatements() throws Exception {
+        Migration m = new Migration("123", new File("src/test/resources/sql/newlines_and_spaces.sql"));
+        m.migrate(null);
+        List statements = getStatements();
+
+        for (Object o : statements) {
+
+            String statement = o.toString().trim();
+            if(!statement.equals("")){
+
+                System.out.println("===");
+                System.out.println(o);
+            }
+
+        }
+    }
 }

db-migrator/src/test/resources/sql/complex.sql

@@ -1,4 +1,4 @@
--- END BLOCK
+-- END
 
 update dav_file set parent = ( select id from ( select id from dav_file where name = '__SITE_PROTECTED__' ) as x )
   where ( name = 'templates' and parent is null )

db-migrator/src/test/resources/sql/newlines_and_spaces.sql

@@ -0,0 +1,14 @@
+BLOCK
+
+SET @facility_id = (SELECT id from facilities where state = 'Illin;\
+
+
+ois' and name = 'Cook County');
+
+BLOCK
+
+select * from people where name  = ' \;
+
+asdadsy a8fdyg
+';
+