dalbodeule/snap-admin
1
0
Fork 0
mirror of https://github.com/dalbodeule/snap-admin.git synced 2025-06-09 05:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of java.sql.Date field type

Browse Source
This commit is contained in:
Francesco 2023-10-27 12:15:17 +02:00
parent c205e4948c
commit ad95f2434c
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java vendored
View File

@ -496,6 +496,7 @@ public class DefaultDbAdminController {
attr.addFlashAttribute("validationErrors", new ValidationErrorsContainer(e)); attr.addFlashAttribute("validationErrors", new ValidationErrorsContainer(e));
attr.addFlashAttribute("params", params); attr.addFlashAttribute("params", params);
} catch (DbAdminException e) { } catch (DbAdminException e) {
e.getCause().printStackTrace();
attr.addFlashAttribute("errorTitle", "Error"); attr.addFlashAttribute("errorTitle", "Error");
attr.addFlashAttribute("error", e.getMessage()); attr.addFlashAttribute("error", e.getMessage());
attr.addFlashAttribute("params", params); attr.addFlashAttribute("params", params);

5
src/main/java/tech/ailef/dbadmin/external/dbmapping/DbObjectSchema.java vendored
View File

@ -386,7 +386,10 @@ public class DbObjectSchema {
Object parsedFieldValue = Object parsedFieldValue =
getFieldByName(param).getType().parseValue(params.get(param)); getFieldByName(param).getType().parseValue(params.get(param));
System.out.println(param);
System.out.println(parsedFieldValue);
if (parsedFieldValue != null)
System.out.println(parsedFieldValue.getClass());
if (parsedFieldValue != null && getFieldByName(param).isSettable()) { if (parsedFieldValue != null && getFieldByName(param).isSettable()) {
setter.invoke(instance, parsedFieldValue); setter.invoke(instance, parsedFieldValue);
} }

17
src/main/java/tech/ailef/dbadmin/external/dbmapping/fields/DateFieldType.java vendored
View File

@ -18,13 +18,13 @@
package tech.ailef.dbadmin.external.dbmapping.fields; package tech.ailef.dbadmin.external.dbmapping.fields;
import java.text.ParseException; import java.sql.Date;
import java.text.SimpleDateFormat; import java.time.LocalDate;
import java.util.Date; import java.time.format.DateTimeParseException;
import java.util.List; import java.util.List;
import java.util.Locale;
import tech.ailef.dbadmin.external.dto.CompareOperator; import tech.ailef.dbadmin.external.dto.CompareOperator;
import tech.ailef.dbadmin.external.exceptions.DbAdminException;
public class DateFieldType extends DbFieldType { public class DateFieldType extends DbFieldType {
@Override @Override
@ -35,11 +35,12 @@ public class DateFieldType extends DbFieldType {
@Override @Override
public Object parseValue(Object value) { public Object parseValue(Object value) {
if (value == null || value.toString().isBlank()) return null; if (value == null || value.toString().isBlank()) return null;
SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
try { try {
return format.parse(value.toString()); LocalDate localDate = LocalDate.parse(value.toString());
} catch (ParseException e) { return Date.valueOf(localDate);
throw new RuntimeException(e); } catch (DateTimeParseException e) {
throw new DbAdminException("Invalid date " + value, e);
} }
} }