Changeset 37 for trunk/fmgVen/src/com/fmguler/ven/Criteria.java

Timestamp:

Mar 20, 2012, 2:40:52 PM (12 years ago)

Author:

fmguler

Message:

Refs #7 - Implemented orderAsc and orderDesc methods of Criteria. Have been testing these for a while, no problem so far. Added BigDecimal to db classes (Numeric db type). If the column name is "order" it is escaped while insert/update. (This should be done for all db keywords). Fixed missing mapping of one to many assc. (lists) of many to one (object) assc (obj.obj.list).

File:

• trunk/fmgVen/src/com/fmguler/ven/Criteria.java (modified) (6 diffs)

trunk/fmgVen/src/com/fmguler/ven/Criteria.java

@@ -43 +43 @@
 public class Criteria {
     private StringBuffer criteriaStringBuffer = new StringBuffer(); //for string criteria
+    private StringBuffer orderStringBuffer = new StringBuffer(); //for ordering
     private LinkedList criterionList = new LinkedList(); //for typed criteria
     private Map parameters = new HashMap(); //the parameters used in criteria string
@@ -99 +100 @@
     }
 
+    /**
+     * Return order string to SQL
+     */
+    public String orderStringToSQL() {
+        if (orderStringBuffer.length() == 0) return "";
+        orderStringBuffer.insert(0, " order by");
+        return orderStringBuffer.toString();
+    }
+
     //--------------------------------------------------------------------------
     //Typed Criteria Methods
@@ -153 +163 @@
      */
     public Criteria orderAsc(String attribute) {
-        //Not implemented yet.
+        if (this.orderStringBuffer.length() != 0) this.orderStringBuffer.append(",");
+        this.orderStringBuffer.append(" ").append(convertAttributeToAlias(attribute)).append(" asc");
         return this;
     }
@@ -161 +172 @@
      */
     public Criteria orderDesc(String attribute) {
-        //Not implemented yet.
+        if (this.orderStringBuffer.length() != 0) this.orderStringBuffer.append(",");
+        this.orderStringBuffer.append(" ").append(convertAttributeToAlias(attribute)).append(" desc");
         return this;
     }
@@ -223 +235 @@
                     stack.push(sr);
                 } else if (conn.equals(Criterion.CONN_OR)) {
-                        String s1 = (String)stack.pop();
-                        String s2 = (String)stack.pop();
-                        String sr = "(" + s1 + " or " + s2 + ")";
-                        stack.push(sr);
-                    } else if (conn.equals(Criterion.CONN_NOT)) {
-                            String s = (String)stack.pop();
-                            String sr = "not (" + s + ")";
-                            stack.push(sr);
-                        }
+                    String s1 = (String)stack.pop();
+                    String s2 = (String)stack.pop();
+                    String sr = "(" + s1 + " or " + s2 + ")";
+                    stack.push(sr);
+                } else if (conn.equals(Criterion.CONN_NOT)) {
+                    String s = (String)stack.pop();
+                    String sr = "not (" + s + ")";
+                    stack.push(sr);
+                }
             }
         }
@@ -284 +296 @@
                 .and() //connect previous criteria with and
                 .isNull("SomeDomainObject.description") //attribute is null
-                .or(); //connect previous criteria with and
+                .or() //connect previous criteria with or
+                .orderDesc("SomeDomainObject.name"); //order by some attribute
 
         //print the resulting where clause SQL
         System.out.println(criteria.criteriaToSQL());
+
+        //print the resulting order clause SQL
+        System.out.println(criteria.orderStringToSQL());
 
         //the result is;