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

#946 - Treat primitive numbers (long, int, short, float, double) as NOT NULL wrt DDL generation

Browse Source
This commit is contained in:
rob bygrave
2017-05-14 01:31:28 +12:00
parent 0c49b6514c
commit 461c2aef60
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+13
View File
@@ -34,6 +34,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.sql.Types;
import java.util.HashSet;
import java.util.Set;
/**
* Description of a property of a bean. Includes its deployment information such
@@ -45,6 +47,14 @@ public class DeployBeanProperty {
private static final int UNIDIRECTIONAL_ORDER = 100000;
private static final int AUDITCOLUMN_ORDER = -1000000;
private static final int VERSIONCOLUMN_ORDER = -1000000;
private static final Set<Class<?>> PRIMITIVE_NUMBER_TYPES = new HashSet<>();
static {
PRIMITIVE_NUMBER_TYPES.add(float.class);
PRIMITIVE_NUMBER_TYPES.add(double.class);
PRIMITIVE_NUMBER_TYPES.add(long.class);
PRIMITIVE_NUMBER_TYPES.add(int.class);
PRIMITIVE_NUMBER_TYPES.add(short.class);
}
/**
* Flag to mark this at part of the unique id.
@@ -940,6 +950,9 @@ public class DeployBeanProperty {
if (boolean.class.equals(propertyType) && !softDelete) {
this.nullable = false;
this.dbColumnDefault = DbDefaultValue.FALSE;
} else if (!id && !versionColumn && PRIMITIVE_NUMBER_TYPES.contains(propertyType)) {
this.nullable = false;
}
}