Merge branch '137'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b2173133 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b2173133 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b2173133 Branch: refs/heads/master Commit: b21731338ae3812db1e0906be9c9c604474a5729 Parents: 1b56fe6 7fbcc01 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Sun Nov 27 16:03:11 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Sun Nov 27 16:03:11 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/CayenneDataObject.java | 42 +++--- .../cayenne/access/VerticalInheritanceIT.java | 41 +++++ .../testdo/inheritance_vertical/IvSub3.java | 15 ++ .../inheritance_vertical/auto/_IvSub3.java | 30 ++++ .../test/resources/inheritance-vertical.map.xml | 150 +++++++++++-------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 6 files changed, 194 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/b2173133/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index 5dbdc64,b07f826..5cf1320 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -69,10 -69,7 +69,11 @@@ CAY-2131 Modeler NullPointerException i CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml CAY-2143 NPE in BaseSchemaUpdateStrategy CAY-2144 cdbimport always fails for databases which don't support catalogs + CAY-2146 Vertical inheritance: record still inserted into parent db table when child validation fails +CAY-2148 Failure upgrading from 3.1 to M4 +CAY-2150 UI bug: PK generation custom sequence is getting reset +CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema +CAY-2154 Migrate db: queries order ---------------------------------- Release: 4.0.M3
