You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/11/02 16:08:43 UTC
cayenne git commit: CAY-2116 Split schema synchronization code in a
separate module
Repository: cayenne
Updated Branches:
refs/heads/master 6c5d9dbed -> 1b58b2ed0
CAY-2116 Split schema synchronization code in a separate module
* missed a few cases where name generator is used explicitly
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1b58b2ed
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1b58b2ed
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1b58b2ed
Branch: refs/heads/master
Commit: 1b58b2ed000ee5bdc5f6ecd1b02bdf1386e589ef
Parents: 6c5d9db
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Wed Nov 2 19:04:44 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Wed Nov 2 19:04:47 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b58b2ed/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java
index b57a6dd..b5c508a 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/CreateTableToModel.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.dbsync.merge;
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
import org.apache.cayenne.dbsync.naming.NameBuilder;
-import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
@@ -64,8 +63,7 @@ public class CreateTableToModel extends AbstractToModelToken.Entity {
objEntity.setName(NameBuilder
.builder(objEntity, dbEntity.getDataMap())
- // TODO: name generator must be injected...
- .baseName(new DefaultObjectNameGenerator().objEntityName(dbEntity))
+ .baseName(context.getEntityMergeSupport().getNameGenerator().objEntityName(dbEntity))
.name());
objEntity.setDbEntity(getEntity());