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/10/04 12:45:31 UTC
[3/7] cayenne git commit: CAY-2114 cdbimport: object layer settings
are not respected
CAY-2114 cdbimport: object layer settings are not respected
* will respect 'usePrimitives'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7884a8fa
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7884a8fa
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7884a8fa
Branch: refs/heads/master
Commit: 7884a8fa6caccf94528d77eba84117f0cff4622d
Parents: 3a5f31d
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Tue Oct 4 13:51:07 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Tue Oct 4 13:59:37 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/dbsync/merge/MergerContext.java | 4 ----
.../apache/cayenne/tools/dbimport/DefaultDbImportAction.java | 7 +++++--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7884a8fa/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java
index 53c5265..cf7f7fb 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/MergerContext.java
@@ -116,10 +116,6 @@ public class MergerContext {
// init missing defaults ...
- if (context.entityMergeSupport == null) {
- nameGenerator(new DefaultObjectNameGenerator());
- }
-
if (context.delegate == null) {
delegate(new DefaultModelMergeDelegate());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7884a8fa/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
index 6fd4116..6ce01f9 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
@@ -158,7 +158,8 @@ public class DefaultDbImportAction implements DbImportAction {
hasChanges |= applyTokens(config.createMergeDelegate(),
targetDataMap,
log(sort(reverse(mergerTokenFactory, tokens))),
- config.getNameGenerator());
+ config.getNameGenerator(),
+ config.isUsePrimitives());
if (hasChanges) {
saveLoaded(targetDataMap);
@@ -237,7 +238,8 @@ public class DefaultDbImportAction implements DbImportAction {
private boolean applyTokens(ModelMergeDelegate mergeDelegate,
DataMap targetDataMap,
Collection<MergerToken> tokens,
- ObjectNameGenerator nameGenerator) {
+ ObjectNameGenerator nameGenerator,
+ boolean usingPrimitives) {
if (tokens.isEmpty()) {
logger.info("");
@@ -258,6 +260,7 @@ public class DefaultDbImportAction implements DbImportAction {
MergerContext mergerContext = MergerContext.builder(targetDataMap)
.delegate(mergeDelegate)
.nameGenerator(nameGenerator)
+ .usingPrimitives(usingPrimitives)
.build();
for (MergerToken token : tokens) {