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

#1915 - Regression with DiscriminatorValue since #1361

Browse Source
This commit is contained in:
rob bygrave
2020-01-28 10:21:29 +13:00
parent 07aa39c5de
commit df63eeaa8c
7 changed files with 134 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class DeployInherit {
if (dv != null) {
info.setDiscriminatorValue(dv.value());
} else {
info.setDiscriminatorValue(cls.getSimpleName());
info.setDiscriminatorDefaultValue(cls);
}
}
return info;
src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+10
View File
@@ -178,6 +178,16 @@ public class DeployInheritInfo {
return discriminatorStringValue;
}
public void setDiscriminatorDefaultValue(Class<?> cls) {
if (columnType == Types.INTEGER) {
discriminatorStringValue = "0";
discriminatorObjectValue = 0;
} else {
discriminatorStringValue = cls.getSimpleName();
discriminatorObjectValue = discriminatorStringValue;
}
}
/**
* Set the discriminator value for this node.
*/