hot fix for many-to-many relationships revers engineering
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/01d29ecd Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/01d29ecd Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/01d29ecd Branch: refs/heads/master Commit: 01d29ecd7011a107957e57d67b51943eac857fc3 Parents: 54997aa c8ff435 Author: alexkolonitsky <[email protected]> Authored: Mon Jan 19 17:10:51 2015 +0300 Committer: alexkolonitsky <[email protected]> Committed: Mon Jan 19 17:10:51 2015 +0300 ---------------------------------------------------------------------- .../access/loader/LoggingDbLoaderDelegate.java | 20 +-- .../org/apache/cayenne/map/Relationship.java | 6 +- .../apache/cayenne/map/naming/ExportedKey.java | 18 ++- .../org/apache/cayenne/query/SQLSelect.java | 2 +- .../cayenne/query/SQLTemplateMetadata.java | 117 ++++++++-------- .../org/apache/cayenne/query/SQLSelectIT.java | 46 +++--- .../org/apache/cayenne/query/SQLSelectTest.java | 53 ++++++- .../cayenne/tools/CayenneGeneratorTask.java | 11 +- .../cayenne/tools/dbimport/DbImportAction.java | 30 ++-- .../dbimport/DbImportDbLoaderDelegate.java | 1 - .../src/main/resources/reverseEngineering.xsd | 139 +++++++++++++++++++ .../cayenne/tools/DbImporterMojoTest.java | 4 + .../cayenne/tools/dbimport/testOneToOne-pom.xml | 39 ++++++ .../tools/dbimport/testOneToOne.map.xml-result | 58 ++++++++ .../cayenne/tools/dbimport/testOneToOne.sql | 24 ++++ 15 files changed, 451 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/01d29ecd/cayenne-server/src/main/java/org/apache/cayenne/map/Relationship.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/01d29ecd/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java ----------------------------------------------------------------------
