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/09/30 19:18:40 UTC
[4/4] cayenne git commit: CAY-2114 cdbimport: object layer settings
are not respected
CAY-2114 cdbimport: object layer settings are not respected
* first fruits of our refactoring - proper naming of new artifacts
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8ac060fc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8ac060fc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8ac060fc
Branch: refs/heads/master
Commit: 8ac060fce87751bd6fcac2c5bedb7001f9c06494
Parents: 5a03130
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Fri Sep 30 21:32:57 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Fri Sep 30 22:11:39 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/tools/DbImporterMojoTest.java | 4 ++--
.../tools/dbimport/testOneToOne.map.xml-result | 16 ++++++++--------
.../dbimport/testUnFlattensManyToMany.map.xml | 6 +++---
.../testUnFlattensManyToMany.map.xml-result | 18 +++++++++---------
4 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ac060fc/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index c2cdc6d..f611df9 100644
--- a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -182,11 +182,11 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
/**
* By default many-to-many are flattened during reverse engineering.
* But if a user un-flattens a given N:M manually, we\u2019d like this choice to be preserved on the next run
- *
- * @throws Exception
*/
@Test
public void testUnFlattensManyToMany() throws Exception {
+ // TODO: this should be "xYs" : <db-relationship name="xIes"
+ // TODO: this should be aBs : <db-relationship name="aBArray"
test("testUnFlattensManyToMany");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ac060fc/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
index 8c61540..713ad1e 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
@@ -39,20 +39,20 @@
</obj-entity>
<obj-entity name="PlayerInfo" className="PlayerInfo" dbEntityName="PLAYER_INFO">
</obj-entity>
- <db-relationship name="toPlayer" source="PICK_SCHEDULE" target="PLAYER" toMany="false">
+ <db-relationship name="selectedPlayer" source="PICK_SCHEDULE" target="PLAYER" toMany="false">
<db-attribute-pair source="SELECTED_PLAYER_ID" target="ID"/>
</db-relationship>
- <db-relationship name="pickScheduleArray" source="PLAYER" target="PICK_SCHEDULE" toMany="true">
+ <db-relationship name="pickSchedules" source="PLAYER" target="PICK_SCHEDULE" toMany="true">
<db-attribute-pair source="ID" target="SELECTED_PLAYER_ID"/>
</db-relationship>
- <db-relationship name="toPlayer" source="PLAYER" target="PLAYER_INFO" toDependentPK="true" toMany="false">
+ <db-relationship name="player" source="PLAYER" target="PLAYER_INFO" toDependentPK="true" toMany="false">
<db-attribute-pair source="ID" target="PLAYER_ID"/>
</db-relationship>
- <db-relationship name="toPlayer" source="PLAYER_INFO" target="PLAYER" toMany="false">
+ <db-relationship name="player" source="PLAYER_INFO" target="PLAYER" toMany="false">
<db-attribute-pair source="PLAYER_ID" target="ID"/>
</db-relationship>
- <obj-relationship name="toPlayer" source="PickSchedule" target="Player" deleteRule="Nullify" db-relationship-path="toPlayer"/>
- <obj-relationship name="pickScheduleArray" source="Player" target="PickSchedule" deleteRule="Deny" db-relationship-path="pickScheduleArray"/>
- <obj-relationship name="toPlayer" source="Player" target="PlayerInfo" deleteRule="Nullify" db-relationship-path="toPlayer"/>
- <obj-relationship name="toPlayer" source="PlayerInfo" target="Player" deleteRule="Nullify" db-relationship-path="toPlayer"/>
+ <obj-relationship name="selectedPlayer" source="PickSchedule" target="Player" deleteRule="Nullify" db-relationship-path="selectedPlayer"/>
+ <obj-relationship name="pickSchedules" source="Player" target="PickSchedule" deleteRule="Deny" db-relationship-path="pickSchedules"/>
+ <obj-relationship name="player" source="Player" target="PlayerInfo" deleteRule="Nullify" db-relationship-path="player"/>
+ <obj-relationship name="player" source="PlayerInfo" target="Player" deleteRule="Nullify" db-relationship-path="player"/>
</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ac060fc/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
index afb7e5f..569cad1 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
@@ -38,7 +38,7 @@
</obj-entity>
<obj-entity name="B" className="B" dbEntityName="B">
</obj-entity>
- <db-relationship name="aBArray" source="A" target="A_B" toDependentPK="true" toMany="true">
+ <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="A_ID"/>
</db-relationship>
<db-relationship name="toA" source="A_B" target="A" toMany="false">
@@ -47,9 +47,9 @@
<db-relationship name="toB" source="A_B" target="B" toMany="false">
<db-attribute-pair source="B_ID" target="ID"/>
</db-relationship>
- <db-relationship name="aBArray" source="B" target="A_B" toDependentPK="true" toMany="true">
+ <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="B_ID"/>
</db-relationship>
<obj-relationship name="toA" source="AB" target="A" deleteRule="Nullify" db-relationship-path="toA"/>
- <obj-relationship name="aBArray" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBArray"/>
+ <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBs"/>
</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ac060fc/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
index 5fa049f..349ebb9 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
@@ -57,7 +57,7 @@
</obj-entity>
<obj-entity name="Y" className="org.not.my.home.Y" dbEntityName="Y">
</obj-entity>
- <db-relationship name="aBArray" source="A" target="A_B" toDependentPK="true" toMany="true">
+ <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="A_ID"/>
</db-relationship>
<db-relationship name="toA" source="A_B" target="A" toMany="false">
@@ -66,23 +66,23 @@
<db-relationship name="toB" source="A_B" target="B" toMany="false">
<db-attribute-pair source="B_ID" target="ID"/>
</db-relationship>
- <db-relationship name="aBArray" source="B" target="A_B" toDependentPK="true" toMany="true">
+ <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="B_ID"/>
</db-relationship>
- <db-relationship name="xYArray" source="X" target="X_Y" toDependentPK="true" toMany="true">
+ <db-relationship name="xIes" source="X" target="X_Y" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="X_ID"/>
</db-relationship>
- <db-relationship name="toX" source="X_Y" target="X" toMany="false">
+ <db-relationship name="x" source="X_Y" target="X" toMany="false">
<db-attribute-pair source="X_ID" target="ID"/>
</db-relationship>
- <db-relationship name="toY" source="X_Y" target="Y" toMany="false">
+ <db-relationship name="y" source="X_Y" target="Y" toMany="false">
<db-attribute-pair source="Y_ID" target="ID"/>
</db-relationship>
- <db-relationship name="xYArray" source="Y" target="X_Y" toDependentPK="true" toMany="true">
+ <db-relationship name="xIes" source="Y" target="X_Y" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="Y_ID"/>
</db-relationship>
<obj-relationship name="toA" source="AB" target="A" deleteRule="Nullify" db-relationship-path="toA"/>
- <obj-relationship name="aBArray" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBArray"/>
- <obj-relationship name="yArray" source="X" target="Y" db-relationship-path="xYArray.toY"/>
- <obj-relationship name="xArray" source="Y" target="X" db-relationship-path="xYArray.toX"/>
+ <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny" db-relationship-path="aBs"/>
+ <obj-relationship name="ies" source="X" target="Y" db-relationship-path="xIes.y"/>
+ <obj-relationship name="xes" source="Y" target="X" db-relationship-path="xIes.x"/>
</data-map>