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/12/14 18:29:57 UTC
[8/9] cayenne git commit: Merge branch '154'
Merge branch '154'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/62029df7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/62029df7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/62029df7
Branch: refs/heads/master
Commit: 62029df7fa4fefe1babb39a7e447979d7e7a9301
Parents: 1f6100d 7cd1b20
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Wed Dec 14 21:11:56 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Wed Dec 14 21:11:56 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/dbsync/merge/DbMerger.java | 2 +-
.../dbsync/merge/DropRelationshipToDb.java | 2 +-
.../reverse/db/DbAttributesBaseLoader.java | 107 ----
.../dbsync/reverse/db/DbAttributesLoader.java | 43 --
.../reverse/db/DbAttributesPerSchemaLoader.java | 131 -----
.../cayenne/dbsync/reverse/db/DbLoader.java | 534 -------------------
.../reverse/db/DbLoaderConfiguration.java | 84 ---
.../dbsync/reverse/db/DbLoaderDelegate.java | 63 ---
.../reverse/db/DbRelationshipDetected.java | 53 --
.../dbsync/reverse/db/DbTableLoader.java | 183 -------
.../reverse/db/DefaultDbLoaderDelegate.java | 63 ---
.../cayenne/dbsync/reverse/db/ExportedKey.java | 233 --------
.../reverse/db/LoggingDbLoaderDelegate.java | 61 ---
.../dbsync/reverse/dbload/AbstractLoader.java | 43 ++
.../dbsync/reverse/dbload/AttributeLoader.java | 137 +++++
.../dbsync/reverse/dbload/DbLoadDataStore.java | 90 ++++
.../cayenne/dbsync/reverse/dbload/DbLoader.java | 118 ++++
.../reverse/dbload/DbLoaderConfiguration.java | 85 +++
.../dbsync/reverse/dbload/DbLoaderDelegate.java | 63 +++
.../reverse/dbload/DbRelationshipDetected.java | 54 ++
.../reverse/dbload/DefaultDbLoaderDelegate.java | 64 +++
.../dbsync/reverse/dbload/EntityLoader.java | 106 ++++
.../dbsync/reverse/dbload/ExportedKey.java | 220 ++++++++
.../reverse/dbload/ExportedKeyLoader.java | 74 +++
.../reverse/dbload/LoggingDbLoaderDelegate.java | 61 +++
.../dbload/PerCatalogAndSchemaLoader.java | 58 ++
.../dbsync/reverse/dbload/PerEntityLoader.java | 64 +++
.../dbsync/reverse/dbload/PrimaryKeyLoader.java | 60 +++
.../reverse/dbload/ProcedureColumnLoader.java | 127 +++++
.../dbsync/reverse/dbload/ProcedureLoader.java | 77 +++
.../reverse/dbload/RelationshipLoader.java | 168 ++++++
.../dbsync/reverse/filters/TableFilter.java | 7 +-
.../apache/cayenne/dbsync/merge/MergeCase.java | 14 +-
.../cayenne/dbsync/reverse/db/DbLoaderIT.java | 408 --------------
.../reverse/dbload/AttributeLoaderIT.java | 154 ++++++
.../dbsync/reverse/dbload/BaseLoaderIT.java | 91 ++++
.../dbsync/reverse/dbload/DbLoaderIT.java | 122 +++++
.../dbsync/reverse/dbload/EntityLoaderIT.java | 98 ++++
.../reverse/dbload/ExportedKeyLoaderIT.java | 85 +++
.../reverse/dbload/PrimaryKeyLoaderIT.java | 60 +++
.../reverse/dbload/RelationshipsLoaderIT.java | 98 ++++
.../dbsync/reverse/filters/TableFilterTest.java | 81 ++-
.../tools/dbimport/DbImportConfiguration.java | 8 +-
.../tools/dbimport/DefaultDbImportAction.java | 26 +-
.../dbimport/DefaultDbImportActionTest.java | 139 ++---
.../cayenne/modeler/action/MigrateAction.java | 2 +-
.../modeler/dialog/db/DbLoaderHelper.java | 10 +-
.../modeler/dialog/db/MergerOptions.java | 15 +-
.../dialog/db/ModelerDbImportAction.java | 12 +-
49 files changed, 2550 insertions(+), 2108 deletions(-)
----------------------------------------------------------------------