Merge branch '168'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b2460d6c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b2460d6c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b2460d6c Branch: refs/heads/master Commit: b2460d6cb6f98fdfe6adf7b8b8fb819595d2a505 Parents: c32288d 4d14b71 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Thu Dec 22 16:18:05 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Thu Dec 22 16:18:05 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/merge/AbstractMerger.java | 14 ++-- .../cayenne/dbsync/merge/ChainMerger.java | 6 +- .../cayenne/dbsync/merge/DataMapMerger.java | 16 ++--- .../cayenne/dbsync/merge/DbAttributeMerger.java | 11 ++- .../cayenne/dbsync/merge/DbEntityMerger.java | 13 +++- .../dbsync/merge/DbRelationshipMerger.java | 19 ++--- .../dbsync/merge/MergerDictionaryDiff.java | 31 ++++---- .../merge/token/db/SetColumnTypeToDb.java | 8 +++ .../dbsync/reverse/dbload/DbLoadDataStore.java | 8 +++ .../cayenne/dbsync/merge/DataMapMergerTest.java | 74 ++++++++++++++++++++ .../apache/cayenne/dbsync/merge/MergeCase.java | 43 +++++++++++- .../merge/builders/DbAttributeBuilder.java | 5 ++ .../dbsync/reverse/dbload/BaseLoaderIT.java | 10 ++- .../dbsync/reverse/dbload/DbLoaderIT.java | 17 +++-- .../reverse/dbload/ExportedKeyLoaderIT.java | 19 +++-- .../reverse/dbload/PrimaryKeyLoaderIT.java | 8 +-- .../cayenne/unit/OracleUnitDbAdapter.java | 10 +++ .../cayenne/unit/PostgresUnitDbAdapter.java | 4 ++ .../cayenne/unit/SQLServerUnitDbAdapter.java | 5 ++ .../org/apache/cayenne/unit/UnitDbAdapter.java | 12 ++++ .../cayenne/tools/DbImporterMojoTest.java | 5 ++ .../dbimport/testDbAttributeChange-pom.xml | 45 ++++++++++++ .../dbimport/testDbAttributeChange.map.xml | 62 ++++++++++++++++ .../testDbAttributeChange.map.xml-result | 62 ++++++++++++++++ .../tools/dbimport/testDbAttributeChange.sql | 46 ++++++++++++ 25 files changed, 488 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
