Improved support for "defaults"

pborissow · pborissow · commit ea30b4c04f2b · 2024-10-09T13:28:24.000-04:00
diff --git a/src/javaxt/orm/Model.java b/src/javaxt/orm/Model.java
@@ -74,6 +74,8 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
               //Create field and update the fields array
                 Field field = new Field(name, type, this);
                 addConstraints(field, f.toJSONObject());
+                Object defaultValue = f.get("default").toObject();
+                field.setDefaultValue(defaultValue);
                 this.fields.add(field);
             }
         }
@@ -136,7 +138,8 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
         JSONArray defaultValues = modelInfo.get("defaults").toJSONArray();
         if (defaultValues!=null){
             for (JSONValue d : defaultValues){
-                String fieldName = d.get("name").toString();
+                String fieldName = d.get("field").toString();
+                if (fieldName==null) fieldName = d.get("name").toString();
 
                 for (Field field : fields){
                     if (field.getName().equals(fieldName)){
