From 04867f7e21a298cf7310510f00ffa3ab9d68766b Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 29 Apr 2015 09:28:35 +0200 Subject: [PATCH] [#4227] ScalaGenerator should have its own list of reserved words --- jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 3b7c2a62a2..35f156717b 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java @@ -170,7 +170,7 @@ class GenerationUtil { if (language == JAVA && JAVA_KEYWORDS.contains(literal)) return literal + "_"; if (language == SCALA && SCALA_KEYWORDS.contains(literal)) - return literal + "_"; + return "`" + literal + "`"; StringBuilder sb = new StringBuilder(); @@ -229,6 +229,9 @@ class GenerationUtil { */ static String getArrayBaseType(SQLDialect dialect, String t, String u) { switch (dialect.family()) { + /* [pro] xx + xxxx xxxxxxxxx + xx [/pro] */ case POSTGRES: { // The convention is to prepend a "_" to a type to get an array type