github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1837 (#1740 and #1744) - Inheritance on both sides of @ManyToOne

Browse Source 
This change also relates back to #1740 and #1744 and changes the way that issue was fixed (by SqlTreeNodeBean on partially populated non-id inheritance bean).
This commit is contained in:
rob bygrave
2019-10-13 11:46:11 +13:00
parent a474880735
commit f24b4dba71
10 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+2 -2
View File
@@ -227,7 +227,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
@Override
void initBeanType() throws SQLException {
InheritInfo localInfo = inheritInfo.readType(ctx);
InheritInfo localInfo = readId ? inheritInfo.readType(ctx) : desc.getInheritInfo();
if (localInfo == null) {
// the bean must be null
localIdBinder = idBinder;
@@ -539,7 +539,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
}
if (readId) {
if (!subQuery && inheritInfo != null && inheritInfo.hasChildren()) {
if (!subQuery && inheritInfo != null) {
ctx.appendColumn(inheritInfo.getDiscriminatorColumn());
}
appendSelectId(ctx, idBinder.getBeanProperty());