- Fixed bug saving Models with Models and models with no data

pborissow · pborissow · commit f105bb7d2848 · 2020-01-25T21:37:43.000Z
- Improved error messages when saving and deleting Models
 - Added new JSONArray.set() method. Also updated the JSONArray.remove() method to return a JSONValue object.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1260 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/json/JSONArray.java b/src/javaxt/json/JSONArray.java
@@ -146,16 +146,34 @@ public void add(Object object) throws JSONException {
     }
 
 
+  //**************************************************************************
+  //** set
+  //**************************************************************************
+  /** Updates an object to the array. Returns the original value that was
+   *  associated with the index.
+   */
+    public JSONValue set(int index, Object object){
+
+        if (object instanceof Value){
+            object = ((Value) object).toObject();
+        }
+
+        JSONObject.testValidity(object);
+
+        Object obj = arr.set(index, object);
+        return new JSONValue(obj);
+    }
+
+
   //**************************************************************************
   //** remove
   //**************************************************************************
-  /** Remove entry. Returns the value that was associated with the index, or
-   *  null if there was no value.
+  /** Remove entry. Returns the value that was associated with the index.
    */
-    public Object remove(int index) {
+    public JSONValue remove(int index) {
         return index >= 0 && index < this.length()
-            ? arr.remove(index)
-            : null;
+            ? new JSONValue(arr.remove(index))
+            : new JSONValue(null);
     }
 
 
diff --git a/src/javaxt/sql/Model.java b/src/javaxt/sql/Model.java
@@ -239,8 +239,11 @@ protected final void init(long id, String...fieldNames) throws SQLException {
    */
     public void save() throws SQLException {
 
+      //Get class name
+        String className = this.getClass().getName();
 
-      //Get list if fields and thier associated values
+
+      //Get list of fields and thier associated values
         LinkedHashMap<java.lang.reflect.Field, Object> fields = getFields();
         Iterator<java.lang.reflect.Field> it;
 
@@ -267,28 +270,33 @@ public void save() throws SQLException {
 
 
       //Update values as needed
+        int numNulls = 0;
         for (Map.Entry<java.lang.reflect.Field, Object> entry : fields.entrySet()) {
             Object val = entry.getValue();
             if (val!=null){
                 if (val instanceof Model){
-                    entry.setValue(((Model) val).getID());
+                    Model model = (Model) val;
+                    model.save();
+                    entry.setValue(model.getID());
                 }
                 else if (val instanceof JSONObject){
                     JSONObject json = (JSONObject) val;
                     if (json.isEmpty()) entry.setValue(null);
                 }
             }
+            if (entry.getValue()==null) numNulls++;
         }
 
 
+      //Check if there's anything to save
+        if (numNulls==fields.size()) return;
 
 
 
         if (id==null){ //insert new record using prepared statement (faster than recordset)
 
 
           //Get database fields associated with the model
-            String className = this.getClass().getName();
             Field[] dbFields;
             synchronized(this.fields){ dbFields = this.fields.get(className); }
             if (dbFields==null) throw new SQLException(
@@ -424,8 +432,13 @@ else if (packageName.startsWith("javaxt.geospatial.geometry") ||
 
 
               //Insert record
-                Recordset.update(stmt, updates);
-                stmt.executeUpdate();
+                try{
+                    Recordset.update(stmt, updates);
+                    stmt.executeUpdate();
+                }
+                catch(SQLException e){
+                    throw Exception("Failed to save " + className + ". " + e.getMessage(), e);
+                }
 
 
               //Get id
@@ -479,7 +492,7 @@ else if (packageName.startsWith("javaxt.geospatial.geometry") ||
             }
             catch(SQLException e){
                 if (conn!=null) conn.close();
-                throw e;
+                throw Exception("Failed to update " + className + "#" + id + ". " + e.getMessage(), e);
             }
         }
     }
@@ -500,11 +513,33 @@ public void delete() throws SQLException {
         }
         catch(SQLException e){
             if (conn!=null) conn.close();
-            throw e;
+            String className = this.getClass().getName();
+            throw Exception("Failed to delete " + className + "#" + id + ". " + e.getMessage(), e);
         }
     }
 
 
+  //**************************************************************************
+  //** getException
+  //**************************************************************************
+  /** Used to build a custom exception when saving or deleting records.
+   */
+    private SQLException Exception(String err, SQLException e){
+        SQLException ex = new SQLException(err);
+        ArrayList<StackTraceElement> stackTrace = new ArrayList<StackTraceElement>();
+        boolean addElement = false;
+        StackTraceElement[] arr = ex.getStackTrace();
+        for (int i=2; i<arr.length; i++){
+            StackTraceElement el = arr[i];
+            if (!el.getClassName().contains("reflect")) addElement = true;
+            if (addElement) stackTrace.add(el);
+        }
+        ex.setStackTrace(stackTrace.toArray(new StackTraceElement[stackTrace.size()]));
+        ex.setNextException(e);
+        return ex;
+    }
+
+
   //**************************************************************************
   //** toJson
   //**************************************************************************
