[cayenne] 02/02: Merge PR #370

[nt...@apache.org]

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 5ac4bdf8f98a8b20b924dbb2eb49e5ac7dd069ad
Merge: 0e9145d e6649cb
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Apr 11 11:38:49 2019 +0300

    Merge PR #370

 RELEASE-NOTES.txt                                  |   1 +
 .../main/java/org/apache/cayenne/map/DbEntity.java | 131 +++--------------
 .../apache/cayenne/exp/TranslateExpressionIT.java  | 159 +++++++++++++++++++++
 .../java/org/apache/cayenne/map/DbEntityIT.java    |   6 +-
 4 files changed, 179 insertions(+), 118 deletions(-)

diff --cc RELEASE-NOTES.txt
index df5df34,d920ec2..64abe28
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -32,19 -31,18 +32,20 @@@ Bug Fixes
  
  CAY-2332 Property API: unable to use eq() and in() methods for toMany relationships
  CAY-2509 Result of resolving lazily faulted relationships can be out-of-date
 -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-2530 Modeler: DB Import and Class Generation from Project is performed for removed datamaps
 +CAY-2531 Modeler: 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-2535 Modeler: Impossible to import stored procedure apart from db tables
 +CAY-2537 Modeler: 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
+ CAY-2553 Wrong disjoint prefetch query qualifier
 +CAY-2559 Modeler: Warning dialog shows wrong information after changing target entity in dbRelationship
 +CAY-2561 Modeler: cgen type combobox doesn't set templates
  
  ----------------------------------
 -Release: 4.1.M3
 -Date:
 +Release: 4.1.B1
 +Date: March 7, 2019
  ----------------------------------
  Changes/New Features: