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/16 18:46:00 UTC
[5/9] cayenne git commit: Some clean up
Some clean up
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cb41151f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cb41151f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cb41151f
Branch: refs/heads/master
Commit: cb41151fda1fe7e4f6f0af7f548a034e53491c04
Parents: 29d6439
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Nov 14 21:03:48 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Nov 14 21:03:48 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/merge/AddRelationshipToDb.java | 18 ++++++++----------
.../dbsync/merge/DropRelationshipToDb.java | 7 +++----
.../dialog/db/MergerTokenSelectorController.java | 6 +-----
3 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cb41151f/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddRelationshipToDb.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddRelationshipToDb.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddRelationshipToDb.java
index 90d92b0..8712613 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddRelationshipToDb.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AddRelationshipToDb.java
@@ -42,8 +42,7 @@ public class AddRelationshipToDb extends AbstractToDbToken.Entity {
@Override
public List<String> createSql(DbAdapter adapter) {
// TODO: skip FK to a different DB
-
- if (this.shouldGenerateFkConstraint()) {
+ if (!this.isEmpty()) {
String fksql = adapter.createFkConstraint(relationship);
if (fksql != null) {
return Collections.singletonList(fksql);
@@ -52,12 +51,6 @@ public class AddRelationshipToDb extends AbstractToDbToken.Entity {
return Collections.emptyList();
}
- public boolean shouldGenerateFkConstraint() {
- return !relationship.isToMany()
- && relationship.isToPK() // TODO it is not necessary primary key it can be unique index
- && !relationship.isToDependentPK();
- }
-
@Override
public MergerToken createReverse(MergerTokenFactory factory) {
return factory.createDropRelationshipToModel(getEntity(), relationship);
@@ -65,7 +58,7 @@ public class AddRelationshipToDb extends AbstractToDbToken.Entity {
@Override
public String getTokenValue() {
- if (this.shouldGenerateFkConstraint()) {
+ if (!this.isEmpty()) {
return relationship.getSourceEntity().getName() + "->" + relationship.getTargetEntityName();
} else {
return "Skip. No sql representation.";
@@ -74,7 +67,12 @@ public class AddRelationshipToDb extends AbstractToDbToken.Entity {
@Override
public boolean isEmpty() {
- return !shouldGenerateFkConstraint();
+ // Method DbRelationship.isSourceIndependentFromTargetChange() looks same
+ return relationship.isSourceIndependentFromTargetChange();
+ /*return relationship.isToMany()
+ || relationship.isToDependentPK()
+ || !relationship.isToPK(); // TODO it is not necessary primary key it can be unique index
+ */
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cb41151f/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 0bc74c6..ec939ef 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
@@ -46,14 +46,13 @@ public class DropRelationshipToDb extends AbstractToDbToken.Entity {
@Override
public List<String> createSql(DbAdapter adapter) {
- String fkName = getFkName();
- if (fkName == null || relationship.isToMany()) {
+ if (isEmpty()) {
return Collections.emptyList();
}
QuotingStrategy context = adapter.getQuotingStrategy();
return Collections.singletonList(
- "ALTER TABLE " + context.quotedFullyQualifiedName(getEntity()) + " DROP CONSTRAINT " + fkName);
+ "ALTER TABLE " + context.quotedFullyQualifiedName(getEntity()) + " DROP CONSTRAINT " + getFkName());
}
public MergerToken createReverse(MergerTokenFactory factory) {
@@ -62,7 +61,7 @@ public class DropRelationshipToDb extends AbstractToDbToken.Entity {
@Override
public boolean isEmpty() {
- return relationship.isToMany();
+ return getFkName() == null || relationship.isToMany();
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cb41151f/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
index e23f780..cfb1af1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
@@ -168,9 +168,7 @@ public class MergerTokenSelectorController extends CayenneController {
TableColumn directionColumn = columnModel.getColumn(
MergerTokenTableModel.COL_DIRECTION);
directionColumn.setCellEditor(new DefaultCellEditor(directionCombo));
-
- // TODO: correct width for the different columns
- //view.getTokens().setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
columnModel.getColumn(MergerTokenTableModel.COL_SELECT).setPreferredWidth(50);
columnModel.getColumn(MergerTokenTableModel.COL_DIRECTION).setPreferredWidth(100);
columnModel.getColumn(MergerTokenTableModel.COL_SELECT).setMaxWidth(50);
@@ -195,7 +193,6 @@ public class MergerTokenSelectorController extends CayenneController {
return;
}
int i = selectableTokensList.indexOf(token);
- // TODO change to collection iteration
MergerToken reverse = token.createReverse(mergerTokenFactory);
selectableTokensList.set(i, reverse);
if (excludedTokens.remove(token)) {
@@ -227,7 +224,6 @@ public class MergerTokenSelectorController extends CayenneController {
for (int i = 0; i < selectableTokensList.size(); i++) {
MergerToken token = selectableTokensList.get(i);
- // TODO change to collection iteration
MergerToken reverse = token.createReverse(mergerTokenFactory);
selectableTokensList.set(i, reverse);
if (excludedTokens.remove(token)) {