cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kolonit...@apache.org
Subject [05/17] cayenne git commit: Merge remote-tracking branch 'upstream/master'
Date Thu, 23 Apr 2015 22:12:50 GMT
Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5438bce8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5438bce8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5438bce8

Branch: refs/heads/master
Commit: 5438bce8bee873a92c9c33be52db6e313c36c72b
Parents: a71e2ae 4b8b337
Author: Alex Kolonitsky <alexkolonitsky@Alexs-iMac.local>
Authored: Sun Sep 7 17:24:03 2014 +0300
Committer: Alex Kolonitsky <alexkolonitsky@Alexs-iMac.local>
Committed: Sun Sep 7 17:24:03 2014 +0300

----------------------------------------------------------------------
 build-tools/cayenne-coverage/pom.xml            | 106 +++++
 cayenne-server/pom.xml                          |   7 +-
 .../java/org/apache/cayenne/BaseContext.java    |   5 +
 .../java/org/apache/cayenne/ObjectContext.java  |   9 +
 .../org/apache/cayenne/access/DataNode.java     |   9 +-
 .../org/apache/cayenne/access/DbLoader.java     |  60 +--
 .../cayenne/access/DbLoaderConfiguration.java   |  48 ++
 .../apache/cayenne/access/DbLoaderDelegate.java |  10 +-
 .../cayenne/access/DefaultDbLoaderDelegate.java |  54 +++
 .../cayenne/dba/derby/DerbyMergerFactory.java   |  18 +-
 .../apache/cayenne/dba/derby/DerbySniffer.java  |   4 +-
 .../cayenne/dba/firebird/FirebirdAdapter.java   |   8 +-
 .../dba/firebird/FirebirdMergerFactory.java     |   6 +-
 .../cayenne/dba/firebird/FirebirdSniffer.java   |   4 +-
 .../cayenne/dba/frontbase/FrontBaseAdapter.java |  23 +-
 .../cayenne/dba/frontbase/FrontBaseSniffer.java |   4 +-
 .../apache/cayenne/dba/h2/H2MergerFactory.java  |  11 +-
 .../apache/cayenne/dba/h2/H2PkGenerator.java    |  12 +-
 .../org/apache/cayenne/dba/h2/H2Sniffer.java    |   5 +-
 .../cayenne/dba/hsqldb/HSQLDBAdapter.java       |   9 +-
 .../cayenne/dba/hsqldb/HSQLDBSniffer.java       |  25 +-
 .../cayenne/dba/hsqldb/HSQLMergerFactory.java   |   9 +-
 .../cayenne/dba/ingres/IngresAdapter.java       |   2 +-
 .../cayenne/dba/ingres/IngresPkGenerator.java   |   5 +-
 .../cayenne/dba/ingres/IngresSniffer.java       |   4 +-
 .../apache/cayenne/dba/mysql/MySQLAdapter.java  |   8 +-
 .../cayenne/dba/mysql/MySQLMergerFactory.java   |   9 +-
 .../cayenne/dba/mysql/MySQLPkGenerator.java     |   2 +-
 .../dba/openbase/OpenBaseMergerFactory.java     |  47 +-
 .../dba/openbase/OpenBasePkGenerator.java       |   6 +-
 .../openbase/OpenBaseQualifierTranslator.java   |   8 +-
 .../cayenne/dba/openbase/OpenBaseSniffer.java   |   4 +-
 .../dba/oracle/Oracle8LOBBatchQueryWrapper.java |   4 +-
 .../dba/oracle/Oracle8LOBBatchTranslator.java   |   2 +-
 .../cayenne/dba/oracle/OracleAdapter.java       |   4 +-
 .../cayenne/dba/oracle/OraclePkGenerator.java   |  17 +-
 .../cayenne/dba/oracle/OracleSniffer.java       |   8 +-
 .../cayenne/dba/postgres/PostgresAdapter.java   |  20 +-
 .../dba/postgres/PostgresPkGenerator.java       |  10 +-
 .../postgres/PostgresQualifierTranslator.java   |   8 +-
 .../cayenne/dba/postgres/PostgresSniffer.java   |   4 +-
 .../cayenne/dba/sqlite/SQLiteAdapter.java       |   2 +-
 .../dba/sqlite/SQLiteBigDecimalType.java        |   4 +-
 .../cayenne/dba/sqlite/SQLiteFloatType.java     |   4 +-
 .../cayenne/dba/sybase/SybasePkGenerator.java   |  34 +-
 .../cayenne/dba/sybase/SybaseSniffer.java       |   8 +-
 .../java/org/apache/cayenne/map/DataMap.java    |  12 +-
 .../java/org/apache/cayenne/map/DbEntity.java   |  26 +-
 .../java/org/apache/cayenne/map/DbJoin.java     |   2 +-
 .../apache/cayenne/merge/AbstractToDbToken.java |  26 +-
 .../cayenne/merge/AbstractToModelToken.java     |  70 ++-
 .../org/apache/cayenne/merge/AddColumnToDb.java |  19 +-
 .../apache/cayenne/merge/AddColumnToModel.java  |   8 +-
 .../cayenne/merge/AddRelationshipToDb.java      |  20 +-
 .../cayenne/merge/AddRelationshipToModel.java   |  14 +-
 .../apache/cayenne/merge/CreateTableToDb.java   |   6 +-
 .../cayenne/merge/CreateTableToModel.java       |   8 +-
 .../java/org/apache/cayenne/merge/DbMerger.java | 419 ++++++++---------
 .../merge/DefaultModelMergeDelegate.java        |   2 +-
 .../merge/DefaultValueForNullProvider.java      |  13 +-
 .../apache/cayenne/merge/DropColumnToDb.java    |   6 +-
 .../apache/cayenne/merge/DropColumnToModel.java |  11 +-
 .../cayenne/merge/DropRelationshipToDb.java     |  23 +-
 .../cayenne/merge/DropRelationshipToModel.java  |  16 +-
 .../org/apache/cayenne/merge/DropTableToDb.java |   6 +-
 .../apache/cayenne/merge/DropTableToModel.java  |   9 +-
 .../cayenne/merge/ExecutingMergerContext.java   |   1 -
 .../apache/cayenne/merge/MergeDirection.java    |  11 +-
 .../apache/cayenne/merge/SetAllowNullToDb.java  |   6 +-
 .../cayenne/merge/SetAllowNullToModel.java      |   7 +-
 .../apache/cayenne/merge/SetColumnTypeToDb.java |  16 +-
 .../cayenne/merge/SetColumnTypeToModel.java     |   6 +-
 .../apache/cayenne/merge/SetNotNullToDb.java    |  15 +-
 .../apache/cayenne/merge/SetNotNullToModel.java |   7 +-
 .../apache/cayenne/merge/SetPrimaryKeyToDb.java |   7 +-
 .../cayenne/merge/SetPrimaryKeyToModel.java     |   7 +-
 .../cayenne/merge/SetValueForNullToDb.java      |   6 +-
 .../cayenne/merge/ValueForNullProvider.java     |   4 +
 .../access/DataContextProcedureQueryTest.java   |   1 +
 .../cayenne/access/DbLoaderPartialTest.java     |  25 +-
 .../apache/cayenne/access/DeleteObjectTest.java |   2 +-
 .../org/apache/cayenne/merge/DbMergerTest.java  | 254 ++++++++++
 .../cayenne/merge/DropColumnToModelTest.java    |   6 +-
 .../merge/DropRelationshipToModelTest.java      |   9 +-
 .../org/apache/cayenne/merge/MergeCase.java     |  10 +-
 .../apache/cayenne/merge/TokensReversTest.java  |  88 ++++
 .../cayenne/merge/TokensToModelExecution.java   |  83 ++++
 .../apache/cayenne/merge/ValueForNullTest.java  |   8 +-
 .../apache/cayenne/merge/builders/Builder.java  |  38 ++
 .../cayenne/merge/builders/DataMapBuilder.java  | 128 +++++
 .../merge/builders/DbAttributeBuilder.java      | 102 ++++
 .../cayenne/merge/builders/DbEntityBuilder.java |  86 ++++
 .../merge/builders/DbRelationshipBuilder.java   |  85 ++++
 .../cayenne/merge/builders/DefaultBuilder.java  |  57 +++
 .../merge/builders/ObjAttributeBuilder.java     |  67 +++
 .../merge/builders/ObjEntityBuilder.java        |  98 ++++
 .../cayenne/merge/builders/ObjectMother.java    |  70 +++
 cayenne-tools/pom.xml                           |  16 +-
 .../apache/cayenne/tools/DbImporterTask.java    |  13 +-
 .../cayenne/tools/dbimport/DbImportAction.java  | 287 +++++-------
 .../tools/dbimport/DbImportConfiguration.java   | 417 +++++++++++++++++
 .../dbimport/DbImportDbLoaderDelegate.java      |  18 +-
 .../cayenne/tools/dbimport/DbImportModule.java  |   4 +
 .../tools/dbimport/DbImportParameters.java      | 259 -----------
 .../tools/dbimport/DbImportActionTest.java      | 464 +++++++++----------
 .../dbimport/DbImportConfigurationTest.java     | 274 +++++++++++
 .../dbimport/DbImportDbLoaderDelegateTest.java  |   2 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |   3 +-
 .../modeler/dialog/db/MergerOptions.java        |  14 +-
 plugins/maven-cayenne-plugin/pom.xml            |  13 +-
 .../apache/cayenne/tools/DbImporterMojo.java    |  31 +-
 .../cayenne/tools/DbImporterMojoTest.java       | 134 ++++--
 .../testImportAddTableAndColumn-pom.xml         |  39 ++
 .../testImportAddTableAndColumn.map.xml         |  37 ++
 .../testImportAddTableAndColumn.map.xml-result  |  50 ++
 .../dbimport/testImportAddTableAndColumn.sql    |  20 +
 .../tools/dbimport/testImportNewDataMap-pom.xml |  39 ++
 .../testImportNewDataMap.map.xml-result         |  37 ++
 .../tools/dbimport/testImportNewDataMap.sql     |  10 +
 .../dbimport/testImportWithoutChanges-pom.xml   |  39 ++
 .../dbimport/testImportWithoutChanges.map.xml   |  37 ++
 .../testImportWithoutChanges.map.xml-result     |  37 ++
 .../tools/dbimport/testImportWithoutChanges.sql |  10 +
 pom.xml                                         | 109 ++++-
 124 files changed, 3579 insertions(+), 1530 deletions(-)
----------------------------------------------------------------------



Mime
View raw message