From 7432f474a8ebfa7576eea9bc8e520757866b9d06 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 10 Feb 2015 11:18:13 +0100 Subject: [PATCH] [#3734] Implement "C:/Program Files (x86)/Git/bin/sh.exe" as a default expression in matcher strategy rules --- .../src/main/java/org/jooq/util/MatcherStrategy.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/MatcherStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/MatcherStrategy.java index b3576e4065..7cdb5ab97a 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/MatcherStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/MatcherStrategy.java @@ -85,6 +85,11 @@ public class MatcherStrategy extends DefaultGeneratorStrategy { } private final String match(Definition definition, String expression, String ruleExpression, MatcherTransformType ruleTransformType) { + // [#3734] If users forget to specify the rule's expression but they use + // a transformer (e.g. PASCAL), we should assume the "default" replacement + if (ruleTransformType != null && ruleExpression == null) + ruleExpression = "$0"; + if (ruleExpression != null) { Pattern p = compile(defaultIfEmpty(expression, "^.*$").trim()); Matcher m = p.matcher(definition.getName());