Skip to content

Commit b3146d6

Browse files
committed
Changed implementation to isNotNull method
1 parent bffe472 commit b3146d6

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/main/java/org/javawebstack/orm/TableInfo.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,15 @@ public Object getDefault(String fieldName) {
289289
public boolean isNotNull(String fieldName) {
290290
if (idField.equals(fieldName))
291291
return true;
292+
293+
if (hasDates()) {
294+
if (fieldName.equals(getCreatedField()))
295+
return true;
296+
if (fieldName.equals(getUpdatedField()))
297+
return true;
298+
}
299+
300+
292301
return false;
293302
}
294303

src/main/java/org/javawebstack/orm/migration/AutoMigrator.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private static void migrateTable(SQLPool pool, TableInfo info, boolean tableExis
6363
sb.append('(')
6464
.append(parameterTypes)
6565
.append(')');
66-
sb.append(info.isNotNull(fieldName) || isDatesField(info, fieldName) ? " NOT NULL" : " NULL");
66+
sb.append(info.isNotNull(fieldName) ? " NOT NULL" : " NULL");
6767
if (info.isAutoIncrement() && info.getIdField().equals(fieldName))
6868
sb.append(" AUTO_INCREMENT");
6969
if (columnKeys.containsKey(columnName)) {
@@ -194,11 +194,4 @@ private static List<String> getTables(SQLPool pool) {
194194
}
195195
}
196196

197-
private static boolean isDatesField(TableInfo info, String fieldName) {
198-
if (!info.hasDates())
199-
return false;
200-
201-
return fieldName.equals(info.getCreatedField()) || fieldName.equals(info.getUpdatedField());
202-
}
203-
204197
}

0 commit comments

Comments
 (0)