From e37788981dfd026477c9fadb2e1bff1b9cca1324 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 19 Feb 2019 10:42:52 +0100 Subject: [PATCH] [#8336] DDLDatabase cannot load relative paths in Maven modules that do not contain wildcards --- .../src/main/java/org/jooq/meta/tools/FilePattern.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/tools/FilePattern.java b/jOOQ-meta/src/main/java/org/jooq/meta/tools/FilePattern.java index 9c6d5c3605..37cda071a2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/tools/FilePattern.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/tools/FilePattern.java @@ -112,8 +112,14 @@ public final class FilePattern { load(encoding, file, fileComparator, null, loader); loaded = true; } - else if (pattern.contains("*") || pattern.contains("?")) { - file = new File(pattern.replaceAll("[*?].*", "")).getCanonicalFile(); + else { + + // [#8336] Relative paths aren't necessarily relative to the + // working directory, but maybe to some subdirectory + if (pattern.contains("*") || pattern.contains("?")) + file = new File(pattern.replaceAll("[*?].*", "")).getCanonicalFile(); + else + file = new File(".").getCanonicalFile(); Pattern regex = Pattern.compile("^.*?" + pattern