Repository: cayenne Updated Branches: refs/heads/master 437bc348e -> 1fd28cb46
Fix integration test after merging pull requests Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d9f916b0 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d9f916b0 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d9f916b0 Branch: refs/heads/master Commit: d9f916b0167769a56e48637ddbaa5e1b12567688 Parents: 437bc34 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Dec 19 15:23:44 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Dec 19 15:23:44 2016 +0300 ---------------------------------------------------------------------- .../cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d9f916b0/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result index 95c3495..d68faf1 100644 --- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result +++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result @@ -38,7 +38,6 @@ <obj-attribute name="addrstr" type="java.lang.String" db-attribute-path="ADDRSTR"/> </obj-entity> <obj-entity name="Child" className="Child" dbEntityName="CHILD"> - <obj-attribute name="addressId" type="java.lang.Integer" db-attribute-path="ADDRESS_ID"/> <obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/> <obj-attribute name="name" type="java.lang.String"/> </obj-entity>
