Merge pull request #33 from arno82/master

replace-sequence-values Bugfix and EOL bugfix

Author: qwazer

src/main/java/com/googlecode/scheme2ddl/DDLFormatter.java

@@ -20,6 +20,10 @@ public String formatDDL(String ddl) {
             return ddl;
 
         ddl = ddl.trim() + "\n";
+		
+		// replace unix line endings with windows
+		ddl = ddl.replaceAll("\r\n", "\n");
+        ddl = ddl.replaceAll("\n", "\r\n");
 
         if (!isMorePrettyFormat)
             return ddl;

src/main/java/com/googlecode/scheme2ddl/Main.java

@@ -305,7 +305,7 @@ private static void collectArgs(String[] args) throws Exception {
                 justTestConnection = true;
             } else if (arg.equals("--stop-on-warning")) {
                 stopOnWarning = true;
-            }   else if ((arg.equals("-fsv") || arg.equals("--filter-sequence-values"))) {
+            }   else if ((arg.equals("-rsv") || arg.equals("--replace-sequence-values"))) {
                 replaceSequenceValues = true;
             } else if (arg.equals("-c") || arg.equals("--config")) {
                 customConfigLocation = args[i + 1];

src/main/java/com/googlecode/scheme2ddl/UserObjectProcessor.java

@@ -67,13 +67,13 @@ private boolean matchesByPattern(String s, String pattern) {
     private String map2Ddl(UserObject userObject) throws CannotGetDDLException, NonSkippableException {
         try {
             if (userObject.getType().equals("DBMS JOB")) {
-                return userObjectDao.findDbmsJobDDL(userObject.getName());
+                return ddlFormatter.formatDDL(userObjectDao.findDbmsJobDDL(userObject.getName()));
             }
             if (userObject.getType().equals("PUBLIC DATABASE LINK")) {
-                return userObjectDao.findDDLInPublicScheme(map2TypeForDBMS(userObject.getType()), userObject.getName());
+                return ddlFormatter.formatDDL(userObjectDao.findDDLInPublicScheme(map2TypeForDBMS(userObject.getType()), userObject.getName()));
             }
 			if (userObject.getType().equals("REFRESH_GROUP")) {
-                return userObjectDao.findRefGroupDDL(userObject.getType(), userObject.getName());
+                return ddlFormatter.formatDDL(userObjectDao.findRefGroupDDL(userObject.getType(), userObject.getName()));
             }
             String res = userObjectDao.findPrimaryDDL(map2TypeForDBMS(userObject.getType()), userObject.getName());
             if (userObject.getType().equals("SEQUENCE") && replaceSequenceValues) {