From e286fbb1434611a621978a7b2b5836c4c4829761 Mon Sep 17 00:00:00 2001 From: Vladimir Vinogradov Date: Wed, 26 Feb 2014 18:16:42 +0400 Subject: [PATCH] do not escape dot in names, but use capital case after it --- .../main/java/org/jooq/util/GenerationUtil.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java index dc05406057..2fa5d49f9c 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java @@ -178,19 +178,29 @@ class GenerationUtil { return "_"; } + boolean uppercaseNext = false; for (int i = 0; i < literal.length(); i++) { char c = literal.charAt(i); if (!Character.isJavaIdentifierPart(c)) { - sb.append(escape(c)); + if ('.' != c) + sb.append(escape(c)); } else if (i == 0 && !Character.isJavaIdentifierStart(literal.charAt(0))) { sb.append("_"); sb.append(c); } else { - sb.append(c); + if (uppercaseNext) + sb.append(Character.toUpperCase(c)); + else + sb.append(c); } + + if ('.' == c) + uppercaseNext = true; + else + uppercaseNext = false; } return sb.toString(); @@ -205,7 +215,7 @@ class GenerationUtil { } private static String escape(char c) { - if (c == ' ' || c == '-') + if (c == ' ' || c == '-' || c == '.') return "_"; else return "_" + Integer.toHexString(c);