You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/19 12:28:13 UTC
[4/5] cayenne git commit: CAY-2395 cdbimport: add option to skip
user-defined relationships minor cleanup
CAY-2395 cdbimport: add option to skip user-defined relationships
minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8d66f55b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8d66f55b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8d66f55b
Branch: refs/heads/master
Commit: 8d66f55b4ef919ca1ad937d43b535011c7dbf5c8
Parents: 3fa6818
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jan 19 15:23:55 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jan 19 15:23:55 2018 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/reverse/dbimport/FilterContainer.java | 2 +-
.../cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java | 6 +++---
docs/doc/src/main/resources/RELEASE-NOTES.txt | 2 +-
docs/doc/src/main/resources/UPGRADE.txt | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
index f548863..552b6e7 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/FilterContainer.java
@@ -132,7 +132,7 @@ public abstract class FilterContainer {
/**
* @since 4.1
*/
- public void clearExcludeRelationship() {
+ public void clearExcludeRelationships() {
excludeRelationshipCollection.clear();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
index 73e938a..dbc2111 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilder.java
@@ -343,12 +343,12 @@ public final class FiltersConfigBuilder {
catalog.clearExcludeProcedures();
catalog.clearIncludeColumns();
catalog.clearExcludeColumns();
- catalog.clearExcludeRelationship();
+ catalog.clearExcludeRelationships();
for (Schema schema : catalog.getSchemas()) {
schema.clearIncludeColumns();
schema.clearExcludeColumns();
- schema.clearExcludeRelationship();
+ schema.clearExcludeRelationships();
}
}
@@ -358,7 +358,7 @@ public final class FiltersConfigBuilder {
engineering.clearExcludeProcedures();
engineering.clearIncludeColumns();
engineering.clearExcludeColumns();
- engineering.clearExcludeRelationship();
+ engineering.clearExcludeRelationships();
engineering.getSchemas().clear();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 053c8f7..f64ec84 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@ Changes/New Features:
CAY-2372 Extract new modules from cayenne-server
CAY-2377 Cleanup deprecated code.
-CAY-2391 Add excludeRelationship in dbImport
+CAY-2391 cdbimport: add option to skip user-defined relationships
CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8d66f55b/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 3086988..0c9fc00 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -16,8 +16,6 @@ UPGRADING TO 4.1.M2
- cayenne-osgi module contains OSGi related functionality.
- cayenne-rop-server ROP server part.
-* Per CAY-2391 added new excludeRelationship option in dbImport.
-
UPGRADING TO 4.1.M1
* Per CAY-2351 Minimum supported Java version is now Java 8. There is no options to use Cayenne 4.1 with earlier