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 2019/03/07 10:53:58 UTC

[cayenne] 03/04: Merge PR #366

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

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

commit 5f2731873c6c5da0d54225db233b22e501a7e290
Merge: 9013e2e fe0fd8b
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Mar 7 13:53:22 2019 +0300

    Merge PR #366

 RELEASE-NOTES.txt                                  |   1 +
 .../translator/select/QueryAssemblerHelper.java    |  24 ++--
 .../java/org/apache/cayenne/query/CAY_2521IT.java  | 147 +++++++++++++++++++++
 .../org/apache/cayenne/testdo/cay_2521/Issue.java  |  28 ++++
 .../apache/cayenne/testdo/cay_2521/Location.java   |  28 ++++
 .../org/apache/cayenne/testdo/cay_2521/Team.java   |  28 ++++
 .../cayenne/testdo/cay_2521/auto/_Issue.java       | 103 +++++++++++++++
 .../cayenne/testdo/cay_2521/auto/_Location.java    | 145 ++++++++++++++++++++
 .../apache/cayenne/testdo/cay_2521/auto/_Team.java | 131 ++++++++++++++++++
 .../cayenne/unit/di/server/CayenneProjects.java    |   1 +
 .../cayenne/unit/di/server/SchemaBuilder.java      |  32 ++---
 cayenne-server/src/test/resources/cay-2521.map.xml |  80 +++++++++++
 .../src/test/resources/cayenne-cay-2521.xml        |   7 +
 13 files changed, 731 insertions(+), 24 deletions(-)

diff --cc RELEASE-NOTES.txt
index 6509a59,a463065..ead7f2d
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -57,13 -57,7 +57,14 @@@ CAY-2501 Modeler: DbImport ui not loadi
  CAY-2502 DataMap in DataNode tree view disappears after dbImport
  CAY-2504 Broken detection logic of NoopEventBridge in DataRowStoreFactory
  CAY-2505 EventBridge providers should be bound without scope
+ CAY-2521 Expression without Object ID disjoint issue
 +CAY-2530 DB Import and Class Generation from Project is performed for removed datamaps
 +CAY-2531 Importing same schema after Import Revert clears all entities in datamap
 +CAY-2533 Modeler: Exception on validating ObjRelationship without db path
 +CAY-2535 Imposible to import stored proceedure apart from db tables
 +CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden
 +CAY-2544 Possible name clash of ivar and property name in generated class
 +CAY-2547 CayenneDataObject serialization issue
  
  ----------------------------------
  Release: 4.1.M2