- Fixed bug setting byte[] arrays in the JSONObject class that was introduced in the previous release

 - Updated constructor in the javaxt.sql.Function class to make it a little easier to parameterize values

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1585 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/json/JSONObject.java

@@ -229,12 +229,14 @@ public void set(String key, Object value) throws JSONException {
 
 
             if (value.getClass().isArray()){
-                JSONArray arr = new JSONArray();
-                for (int i=0; i<Array.getLength(value); i++) {
-                    Object o = Array.get(value, i);
-                    arr.add(o);
+                if (!(value instanceof byte[])){
+                    JSONArray arr = new JSONArray();
+                    for (int i=0; i<Array.getLength(value); i++) {
+                        Object o = Array.get(value, i);
+                        arr.add(o);
+                    }
+                    value = arr;
                 }
-                value = arr;
             }
 
 

src/javaxt/sql/Function.java

@@ -4,15 +4,23 @@
 //**  Function Class
 //******************************************************************************
 /**
- *  Used to encapsulate SQL functions for database inserts and updates. This
- *  class is used in conjunction with the Recordset class. Example:
- *  <pre>rs.setValue("LAST_UPDATE", new javaxt.sql.Function("NOW()"));</pre>
+ *  The Function class is used to encapsulate SQL functions when inserting or
+ *  updating records via the javaxt.sql.Recordset class. Example:
+ <pre>
+    rs.setValue("LAST_UPDATE", new javaxt.sql.Function("NOW()"));
+    rs.setValue("DATEDIFF_TEST", new javaxt.sql.Function("DATEDIFF(year, '2012/04/28', '2014/04/28')"));
+ </pre>
  *
- *  Functions can be parameterized for more efficient inserts and updates. This
- *  is especially important for batch inserts. For example, instead of this:
- *  <pre>rs.setValue("DATEDIFF_TEST", new javaxt.sql.Function("DATEDIFF(year, '2012/04/28', '2014/04/28')"));</pre>
- *  The function can be parameterized like this:
- *  <pre>rs.setValue("DATEDIFF_TEST", new javaxt.sql.Function("DATEDIFF(year, ?, ?)", new Object[]{"2012/04/28", "2014/04/28"}));</pre>
+ *  Note that functions can be parameterized using standard JDBC syntax using
+ *  question marks (? characters) like this:
+ <pre>
+    JSONObject json = new JSONObject();
+    rs.setValue("info", new javaxt.sql.Function("?::jsonb", json.toString()));
+ </pre>
+ *
+ *  Parameterizing values is especially useful when dealing with strings and
+ *  other values that may have invalid characters. It is also extremely useful
+ *  when performing batch inserts.
  *
  ******************************************************************************/
 
@@ -22,30 +30,74 @@ public class Function {
     private Object[] values;
 
 
-    public Function(String function, Object[] values){
+  //**************************************************************************
+  //** Constructor
+  //**************************************************************************
+  /** Creates a new instance of this class using a function (e.g. "NOW()")
+   */
+    public Function(String function){
         this.function = function;
-        this.values = values;
     }
 
-    public Function(String function){
+
+  //**************************************************************************
+  //** Constructor
+  //**************************************************************************
+  /** Creates a new instance of this class using a parameterized function.
+   */
+    public Function(String function, Object... values){
         this.function = function;
+
+        try{
+            if (values[0] instanceof Object[]){
+                values = (Object[]) values[0];
+            }
+        }
+        catch(Exception e){
+        }
+
+        this.values = values;
     }
 
+
+  //**************************************************************************
+  //** getFunction
+  //**************************************************************************
+  /** Returns the function supplied in the constructor
+   */
     public String getFunction(){
         return function;
     }
 
+
+  //**************************************************************************
+  //** hasValues
+  //**************************************************************************
+  /** Returns true if values were supplied to the constructor
+   */
     public boolean hasValues(){
         if (values!=null){
             return (values.length>0);
         }
         return false;
     }
 
+
+  //**************************************************************************
+  //** getValues
+  //**************************************************************************
+  /** Returns an array of values that were supplied in the constructor
+   */
     public Object[] getValues(){
         return values;
     }
+
 
+  //**************************************************************************
+  //** toString
+  //**************************************************************************
+  /** Returns the function supplied in the constructor
+   */
     public String toString(){
         return function;
     }