You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/24 15:03:30 UTC
[1/2] cayenne git commit: CAY-2154 Migrate db: queries order Fix
ensure this ordering: - Add column before add foreign key - Drop foreign key
before drop column
Repository: cayenne
Updated Branches:
refs/heads/master 31f828258 -> 1b56fe6f6
CAY-2154 Migrate db: queries order
Fix ensure this ordering:
- Add column before add foreign key
- Drop foreign key before drop column
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8e5dab57
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8e5dab57
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8e5dab57
Branch: refs/heads/master
Commit: 8e5dab5763f68ff762d175a76511c3dfc0a83084
Parents: f527275
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 24 16:05:30 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 24 16:05:30 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java | 9 +++++++++
.../org/apache/cayenne/dbsync/merge/DropColumnToDb.java | 9 +++++++++
.../apache/cayenne/dbsync/merge/DropRelationshipToDb.java | 9 +++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
4 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e5dab57/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java
index 2a87b98..6fdca2f 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java
@@ -62,4 +62,13 @@ public class AddColumnToDb extends AbstractToDbToken.EntityAndColumn {
public MergerToken createReverse(MergerTokenFactory factory) {
return factory.createDropColumnToModel(getEntity(), getColumn());
}
+
+ @Override
+ public int compareTo(MergerToken o) {
+ // add all AddRelationshipToDb to the end.
+ if (o instanceof AddRelationshipToDb) {
+ return -1;
+ }
+ return super.compareTo(o);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e5dab57/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropColumnToDb.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropColumnToDb.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropColumnToDb.java
index 19914f0..dec3297 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropColumnToDb.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropColumnToDb.java
@@ -49,4 +49,13 @@ public class DropColumnToDb extends AbstractToDbToken.EntityAndColumn {
return factory.createAddColumnToModel(getEntity(), getColumn());
}
+ @Override
+ public int compareTo(MergerToken o) {
+ // add all AddRelationshipToDb to the end.
+ if (o instanceof DropRelationshipToDb) {
+ return 1;
+ }
+ return super.compareTo(o);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e5dab57/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropRelationshipToDb.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropRelationshipToDb.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropRelationshipToDb.java
index ec939ef..612c4a6 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropRelationshipToDb.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DropRelationshipToDb.java
@@ -71,4 +71,13 @@ public class DropRelationshipToDb extends AbstractToDbToken.Entity {
}
return relationship.getSourceEntity().getName() + "->" + relationship.getTargetEntityName();
}
+
+ @Override
+ public int compareTo(MergerToken o) {
+ // add all AddRelationshipToDb to the end.
+ if (o instanceof DropRelationshipToDb) {
+ return super.compareTo(o);
+ }
+ return -1;
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e5dab57/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 b6e2f8b..c323880 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -69,6 +69,7 @@ CAY-2131 Modeler NullPointerException in reverse engineering when importing diff
CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
CAY-2143 NPE in BaseSchemaUpdateStrategy
CAY-2144 cdbimport always fails for databases which don't support catalogs
+CAY-2154 Migrate db: queries order
----------------------------------
Release: 4.0.M3
[2/2] cayenne git commit: Merge branch '142'
Posted by sk...@apache.org.
Merge branch '142'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1b56fe6f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1b56fe6f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1b56fe6f
Branch: refs/heads/master
Commit: 1b56fe6f6781889691852d68314d80a5d9af8d32
Parents: 31f8282 8e5dab5
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Nov 24 18:03:20 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 24 18:03:20 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java | 9 +++++++++
.../org/apache/cayenne/dbsync/merge/DropColumnToDb.java | 9 +++++++++
.../apache/cayenne/dbsync/merge/DropRelationshipToDb.java | 9 +++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
4 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b56fe6f/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 3fdd625,c323880..5dbdc64
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -69,9 -69,7 +69,10 @@@ CAY-2131 Modeler NullPointerException i
CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
CAY-2143 NPE in BaseSchemaUpdateStrategy
CAY-2144 cdbimport always fails for databases which don't support catalogs
+CAY-2148 Failure upgrading from 3.1 to M4
+CAY-2150 UI bug: PK generation custom sequence is getting reset
+CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema
+ CAY-2154 Migrate db: queries order
----------------------------------
Release: 4.0.M3