Merge pull request #11 from nicjansma/master

Two changes: where() function values of 0, and query .as() function
xavierlacot · Nov 2, 2011 · 5052576 · 5052576
2 parents 8d4e4c9 + cdbcf58
commit 5052576
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/joli.js b/joli.js
@@ -433,7 +433,8 @@ joli.query = function() {
     select_columns:  '*',
     set:             [],
     values:          [],
-    where:           null
+    where:           null,
+    as:              null
   };
 };
 
@@ -479,6 +480,11 @@ joli.query.prototype = {
     return this;
   },
 
+  as: function(table) {
+    this.data.as = table;
+    return this;
+  },
+
   getCount: function(rows) {
     var result;
 
@@ -616,7 +622,9 @@ joli.query.prototype = {
     var i;
     var record;
     var rowData;
-    var model = joli.models.get(this.data.from);
+
+    // use the model specified by as() first, then from()
+    var model = joli.models.get(this.data.as || this.data.from);
 
     while (rows.isValidRow()) {
       i = 0;
@@ -707,7 +715,7 @@ joli.query.prototype = {
       var i = 0;
 
       // replace question marks one at a time from the array
-      while (expression.indexOf('?') != -1 && value[i]) {
+      while (expression.indexOf('?') != -1 && value[i] !== undefined) {
         expression = expression.replace(/\?/i, '"' + value[i] + '"');
         i++;
       }