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/04 08:58:44 UTC
cayenne git commit: better var naming
Repository: cayenne
Updated Branches:
refs/heads/master ffa43caaf -> b297a076b
better var naming
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b297a076
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b297a076
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b297a076
Branch: refs/heads/master
Commit: b297a076b10fe51797771b78d06325164c3863e4
Parents: ffa43ca
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Fri Nov 4 11:58:29 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Fri Nov 4 11:58:29 2016 +0300
----------------------------------------------------------------------
.../cayenne/tools/dbimport/DefaultDbImportAction.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b297a076/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 1e681a9..abcd456 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
@@ -153,12 +153,12 @@ public class DefaultDbImportAction implements DbImportAction {
DataSource dataSource = dataSourceFactory.getDataSource(dataNodeDescriptor);
DbAdapter adapter = adapterFactory.createAdapter(dataNodeDescriptor, dataSource);
- DataMap loadedFomDb;
+ DataMap sourceDataMap;
try (Connection connection = dataSource.getConnection()) {
- loadedFomDb = load(config, adapter, connection);
+ sourceDataMap = load(config, adapter, connection);
}
- if (loadedFomDb == null) {
+ if (sourceDataMap == null) {
logger.info("Nothing was loaded from db.");
return;
}
@@ -181,7 +181,7 @@ public class DefaultDbImportAction implements DbImportAction {
.skipPKTokens(loaderConfig.isSkipPrimaryKeyLoading())
.skipRelationshipsTokens(loaderConfig.isSkipRelationshipsLoading())
.build()
- .createMergeTokens(targetDataMap, loadedFomDb);
+ .createMergeTokens(targetDataMap, sourceDataMap);
hasChanges |= syncDataMapProperties(targetDataMap, config);
hasChanges |= applyTokens(config.createMergeDelegate(),
@@ -190,7 +190,7 @@ public class DefaultDbImportAction implements DbImportAction {
config.getNameGenerator(),
config.getMeaningfulPKFilter(),
config.isUsePrimitives());
- hasChanges |= syncProcedures(targetDataMap, loadedFomDb, loaderConfig.getFiltersConfig());
+ hasChanges |= syncProcedures(targetDataMap, sourceDataMap, loaderConfig.getFiltersConfig());
if (hasChanges) {
saveLoaded(targetDataMap);