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

Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/06/28 12:53:54 UTC

[cayenne] 02/02: Merge PR #387

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

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

commit 8d5f37cf1b73bcb7800dcf81b278b8a77a286201
Merge: bccd538 e617af6
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Fri Jun 28 15:52:15 2019 +0300

    Merge PR #387

 RELEASE-NOTES.txt                                  |  1 +
 UPGRADE.txt                                        |  5 ++
 .../java/org/apache/cayenne/query/SQLSelect.java   | 73 +++++++++++++++++++++-
 .../java/org/apache/cayenne/query/SQLSelectIT.java | 36 +++++------
 4 files changed, 94 insertions(+), 21 deletions(-)

diff --cc RELEASE-NOTES.txt
index 89bf59d,52d4875..6f45986
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -34,7 -34,7 +34,8 @@@ CAY-2563 Deprecate old scalarQuery meth
  CAY-2568 Class Generation: Superclass Package setting persistence
  CAY-2569 Custom 'Naming Strategy' in Cayenne Modeler
  CAY-2570 Use MySQL adapter for latest versions of MariaDB
 +CAY-2579 Review and possibly relax usage of readonly flag of ObjRelationship
+ CAY-2585 Rename scalarQuery and params methods in SQLSelect
  
  Bug Fixes: