Merge branch '167'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c32288d5 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c32288d5 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c32288d5 Branch: refs/heads/master Commit: c32288d510935fa4ae54b5c325125dd3b9b40b0c Parents: d01cc37 89d37a5 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Thu Dec 22 14:04:32 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Thu Dec 22 14:04:32 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/merge/DbAttributeMerger.java | 2 +- .../merge/factory/DB2MergerTokenFactory.java | 22 +++ .../factory/DefaultMergerTokenFactory.java | 12 ++ .../merge/factory/DerbyMergerTokenFactory.java | 20 +++ .../merge/factory/H2MergerTokenFactory.java | 25 +++ .../merge/factory/HSQLMergerTokenFactory.java | 20 +++ .../merge/factory/IngresMergerTokenFactory.java | 21 +++ .../merge/factory/MergerTokenFactory.java | 4 + .../merge/factory/MySQLMergerTokenFactory.java | 28 ++++ .../factory/PostgresMergerTokenFactory.java | 21 +++ .../factory/SQLServerMergerTokenFactory.java | 21 +++ .../merge/token/db/AddRelationshipToDb.java | 2 +- .../merge/token/db/SetGeneratedFlagToDb.java | 88 ++++++++++ .../token/model/AddRelationshipToModel.java | 2 +- .../token/model/SetGeneratedFlagToModel.java | 51 ++++++ .../merge/token/db/SetGeneratedFlagToDbIT.java | 161 +++++++++++++++++++ .../token/model/SetGeneratedFlagToModelIT.java | 67 ++++++++ .../cayenne/dba/hsqldb/HSQLDBAdapter.java | 5 + .../apache/cayenne/unit/DB2UnitDbAdapter.java | 10 ++ .../apache/cayenne/unit/H2UnitDbAdapter.java | 4 + .../cayenne/unit/HSQLDBUnitDbAdapter.java | 10 ++ .../apache/cayenne/unit/MySQLUnitDbAdapter.java | 10 ++ .../cayenne/unit/PostgresUnitDbAdapter.java | 5 + .../org/apache/cayenne/unit/UnitDbAdapter.java | 14 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + pom.xml | 2 +- 26 files changed, 623 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
