Allow logical expressions more than one operand

Reinstate where(String)

src/com/roscopeco/ormdroid/Query.java

@@ -70,17 +70,27 @@ public String generate() {
 
   static class LogicalExpr implements SQLExpression {
     final String op;
-    final SQLExpression lhs, rhs;
+    final SQLExpression[] operands;
 
-    public LogicalExpr(String op, SQLExpression lhs, SQLExpression rhs) {
+    public LogicalExpr(String op, SQLExpression... operands) {
       this.op = op;
-      this.lhs = lhs;
-      this.rhs = rhs;
+      if (operands.length < 2) {
+        throw new IllegalArgumentException("Cannot create logical expression with < 2 operands");
+      }
+      this.operands = operands;
     }
 
     public String generate() {
       StringBuilder sb = new StringBuilder();
-      sb.append("(").append(lhs.generate()).append(" ").append(op).append(" ").append(rhs.generate()).append(")");      
+
+      sb.append("(");
+
+      for (int i = 0; i < operands.length - 1; i++) {
+        sb.append(operands[i].generate()).append(" ").append(op).append(" ");      
+      }
+
+      sb.append(operands[operands.length - 1].generate()).append(")");
+
       return sb.toString();
     }
   }
@@ -136,12 +146,12 @@ public static SQLExpression geq(String column, Object value) {
     return new BinExpr(BinExpr.GEQ, column, TypeMapper.encodeValue(null, value));    
   }
 
-  public static SQLExpression and(SQLExpression lhs, SQLExpression rhs) {
-    return new LogicalExpr("AND", lhs, rhs);
+  public static SQLExpression and(SQLExpression... operands) {
+    return new LogicalExpr("AND", operands);
   }
 
-  public static SQLExpression or(SQLExpression lhs, SQLExpression rhs) {
-    return new LogicalExpr("OR", lhs, rhs);
+  public static SQLExpression or(SQLExpression... operands) {
+    return new LogicalExpr("OR", operands);
   }
 
   public Query<T> where(SQLExpression expr) {
@@ -151,6 +161,13 @@ public Query<T> where(SQLExpression expr) {
     return this;    
   }
 
+  public Query<T> where(String sql) {
+    sqlCache = sql;
+    sqlCache1 = sql;
+    whereExpr = null;
+    return this;    
+  }
+
   public Query<T> orderBy(String... columns) {
     sqlCache = null;
     sqlCache1 = null;