You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/03/10 12:57:09 UTC

[cayenne] 04/05: Merge branch 'pull/413' into asf-master

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 9dacc77a74250cde5f85ef4afe97e5b1fb5ecbc2
Merge: 4a724b8 3451da7
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Tue Mar 10 15:37:42 2020 +0300

    Merge branch 'pull/413' into asf-master

 RELEASE-NOTES.txt                                  |  1 +
 .../cayenne/access/DataDomainFlushObserver.java    | 91 ++++++++++-----------
 .../access/DataDomainLegacyQueryAction.java        |  4 +-
 .../cayenne/access/DataDomainQueryAction.java      |  2 +-
 .../apache/cayenne/access/DataNodeQueryAction.java |  4 +-
 .../apache/cayenne/access/OperationObserver.java   | 16 +++-
 .../apache/cayenne/access/flush/FlushObserver.java | 87 ++++++++++----------
 .../apache/cayenne/access/jdbc/BatchAction.java    | 95 ++++++++++++++++++----
 .../access/util/DefaultOperationObserver.java      |  2 +-
 .../access/util/DoNothingOperationObserver.java    |  2 +-
 .../java/org/apache/cayenne/dba/DbAdapter.java     |  7 ++
 .../org/apache/cayenne/dba/JdbcPkGenerator.java    |  2 +-
 .../org/apache/cayenne/dba/derby/DerbyAdapter.java |  8 ++
 .../cayenne/dba/sqlserver/SQLServerAdapter.java    |  8 ++
 .../dba/sqlserver/SQLServerProcedureAction.java    |  4 +-
 .../cayenne/access/MockOperationObserver.java      |  2 +-
 .../access/jdbc/BatchActionGeneratedIT.java        |  4 +-
 17 files changed, 219 insertions(+), 120 deletions(-)