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/09/02 10:37:58 UTC
[cayenne] 02/04: Merge PR #403
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 6233d03052346700a996d05e3e0766814a3711f6
Merge: 51958e1 2debe8e
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Sep 2 13:19:54 2019 +0300
Merge PR #403
.../java/org/apache/cayenne/gen/PropertyUtils.java | 33 +-
.../main/resources/templates/v4_1/singleclass.vm | 2 +-
.../main/resources/templates/v4_1/superclass.vm | 2 +-
.../select/DbIdPathTranslationResult.java | 62 ++
.../access/translator/select/PathTranslator.java | 36 +
.../translator/select/QualifierTranslator.java | 14 +-
.../java/org/apache/cayenne/exp/Expression.java | 5 +
.../org/apache/cayenne/exp/ExpressionFactory.java | 76 +++
.../org/apache/cayenne/exp/parser/ASTDbIdPath.java | 169 +++++
.../cayenne/exp/parser/ExpressionParser.java | 32 +-
.../exp/parser/ExpressionParserConstants.java | 35 +-
.../exp/parser/ExpressionParserTokenManager.java | 740 +++++++++++----------
.../exp/parser/ExpressionParserTreeConstants.java | 4 +-
.../cayenne/exp/property/BaseIdProperty.java | 59 ++
.../apache/cayenne/exp/property/IdProperty.java | 58 ++
.../cayenne/exp/property/NumericIdProperty.java | 59 ++
.../cayenne/exp/property/PropertyFactory.java | 16 +
.../cayenne/exp/property/RelationshipProperty.java | 8 +
.../apache/cayenne/exp/parser/ExpressionParser.jjt | 2 +
.../apache/cayenne/exp/ExpressionFactoryTest.java | 40 ++
.../apache/cayenne/exp/parser/ASTDbIdPathTest.java | 77 +++
.../apache/cayenne/exp/property/IdPropertyIT.java | 244 +++++++
.../cayenne/exp/property/IdPropertyTest.java | 81 +++
.../cayenne/testdo/testmap/auto/_ArtGroup.java | 5 +-
.../cayenne/testdo/testmap/auto/_Artist.java | 5 +-
.../testdo/testmap/auto/_ArtistCallback.java | 5 +-
.../testdo/testmap/auto/_ArtistExhibit.java | 7 +-
.../testdo/testmap/auto/_CompoundPainting.java | 4 +-
.../testmap/auto/_CompoundPaintingLongNames.java | 4 +-
.../cayenne/testdo/testmap/auto/_Exhibit.java | 5 +-
.../cayenne/testdo/testmap/auto/_Gallery.java | 5 +-
.../auto/_MeaningfulGeneratedColumnTestEntity.java | 1 -
.../testdo/testmap/auto/_NullTestEntity.java | 5 +-
.../cayenne/testdo/testmap/auto/_Painting.java | 4 +-
.../cayenne/testdo/testmap/auto/_Painting1.java | 4 +-
.../cayenne/testdo/testmap/auto/_PaintingInfo.java | 5 +-
.../cayenne/testdo/testmap/auto/_ROArtist.java | 5 +-
.../cayenne/testdo/testmap/auto/_ROPainting.java | 4 +-
.../testdo/testmap/auto/_RWCompoundPainting.java | 4 +-
.../cayenne/testdo/testmap/auto/_SubPainting.java | 5 +-
cayenne-server/src/test/resources/testmap.map.xml | 50 +-
41 files changed, 1497 insertions(+), 484 deletions(-)