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 34f537badf8563ea20cd4a142014169bf2271501
Merge: c81b013 8dd1c31
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Fri Sep 18 15:30:58 2020 +0300
Merge branch 'pr/424' into asf-master
.../resources/templates/v4_1/client-subclass.vm | 2 +-
.../src/main/resources/templates/v4_1/subclass.vm | 2 +-
.../main/resources/templates/v4_1/superclass.vm | 2 +-
.../cayenne/gen/BaseTemplatesGenerationTest.java | 158 +++++++++++++++++++++
.../cayenne/gen/ClassGenerationActionTest.java | 58 +++++++-
.../org/apache/cayenne/gen/DataMapUtilsTest.java | 91 ++++++++++++
.../src/test/resources/templateTest/ObjEntity.java | 10 ++
.../test/resources/templateTest/SQLTemplate.java | 18 +++
.../test/resources/templateTest/SelectQuery.java | 18 +++
.../resources/templateTest/auto/_ObjEntity.java | 65 +++++++++
.../resources/templateTest/auto/_SQLTemplate.java | 23 +++
.../resources/templateTest/auto/_SelectQuery.java | 24 ++++
12 files changed, 464 insertions(+), 7 deletions(-)
