Added underscore to generated name's suffix Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/28cd2cd0 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/28cd2cd0 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/28cd2cd0
Branch: refs/heads/master Commit: 28cd2cd07f4bd385fed81dab10df8cf369e33fd5 Parents: a2314f8 Author: kaspersorensen <i.am.kasper.soren...@gmail.com> Authored: Tue Apr 26 08:28:37 2016 -0700 Committer: kaspersorensen <i.am.kasper.soren...@gmail.com> Committed: Tue Apr 26 08:28:37 2016 -0700 ---------------------------------------------------------------------- .../metamodel/schema/naming/UniqueColumnNamingStrategy.java | 4 ++-- .../metamodel/schema/naming/DefaultColumnNamingStrategyTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/28cd2cd0/core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java b/core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java index e5288fe..d4d21dd 100644 --- a/core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java +++ b/core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java @@ -25,7 +25,7 @@ import java.util.Set; * A {@link ColumnNamingStrategy} that uses the intrinsic column names, but * ensures that all column names are unique. When duplicate names are * encountered a number will be appended yielding column names like "name", - * "name1", "name2" etc. + * "name_2", "name_3" etc. */ public class UniqueColumnNamingStrategy implements ColumnNamingStrategy { @@ -47,7 +47,7 @@ public class UniqueColumnNamingStrategy implements ColumnNamingStrategy { String newName = null; for (int i = 2; !unique; i++) { - newName = intrinsicName + i; + newName = intrinsicName + '_' + i; unique = names.add(newName); } return newName; http://git-wip-us.apache.org/repos/asf/metamodel/blob/28cd2cd0/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java b/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java index c8c408b..a293939 100644 --- a/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java +++ b/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java @@ -34,7 +34,7 @@ public class DefaultColumnNamingStrategyTest { try (final ColumnNamingSession session = namingStrategy.startColumnNamingSession()) { assertEquals("foo", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 0))); assertEquals("bar", session.getNextColumnName(new ColumnNamingContextImpl(null, "bar", 1))); - assertEquals("foo2", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 2))); + assertEquals("foo_2", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 2))); } }