Merge pull request #743 from gitfool/fix-includeAll

Fix root path to work on Mac and Windows
liquibase · Feb 14, 2018 · 97a9297 · 97a9297
2 parents 86827b4 + 1241256
commit 97a9297
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/liquibase-core/src/main/java/liquibase/resource/FileSystemResourceAccessor.java b/liquibase-core/src/main/java/liquibase/resource/FileSystemResourceAccessor.java
@@ -127,7 +127,12 @@ public int compare(String o1, String o2) {
             });
 
             for (String rootPath : getRootPaths()) {
-                rootPaths.add(rootPath.replaceFirst("^file:", "").replace("\\", "/"));
+                if (rootPath.matches("file:/[A-Za-z]:/.*")) {
+                    rootPath = rootPath.replaceFirst("file:/", "");
+                } else {
+                    rootPath = rootPath.replaceFirst("file:", "");
+                }
+                rootPaths.add(rootPath.replace("\\", "/"));
             }
 
             Set<String> finalReturnSet = new LinkedHashSet<String>();