fetchAll and fetchAllSync takes a boolean option, which if true returns array of results, instead of objects

Author: ssinghi

src/mysql_bindings_result.cc

@@ -350,11 +350,19 @@ int MysqlResult::EIO_After_FetchAll(eio_req *req) {
 
         i = 0;
         while ( (result_row = mysql_fetch_row(fetchAll_req->res->_res)) ) {
-            js_result_row = Object::New();
+            if(fetchAll_req->results_array) {
+              js_result_row = Array::New();
+            } else {
+              js_result_row = Object::New();
+            }
 
             for ( j = 0; j < fetchAll_req->num_fields; j++ ) {
                 js_field = GetFieldValue(fetchAll_req->fields[j], result_row[j]);
-                js_result_row->Set(V8STR(fetchAll_req->fields[j].name), js_field);
+                if(fetchAll_req->results_array) {
+                  js_result_row->Set(Integer::New(j), js_field);
+                } else {
+                  js_result_row->Set(V8STR(fetchAll_req->fields[j].name), js_field);
+                }
             }
 
             js_result->Set(Integer::New(i), js_result_row);
@@ -412,7 +420,13 @@ Handle<Value> MysqlResult::FetchAll(const Arguments& args) {
 #ifdef MYSQL_NON_THREADSAFE
     return THREXC(MYSQL_NON_THREADSAFE_ERRORSTRING);
 #else
-    REQ_FUN_ARG(0, callback);
+    int arg_pos = 0;
+    bool results_array = false;
+    if(args.Length() > arg_pos && args[arg_pos]->IsBoolean()) {
+      results_array = args[arg_pos]->BooleanValue();
+      arg_pos++;
+    }
+    REQ_FUN_ARG(arg_pos, callback)
 
     MysqlResult *res = OBJUNWRAP<MysqlResult>(args.This()); // NOLINT
 
@@ -428,6 +442,7 @@ Handle<Value> MysqlResult::FetchAll(const Arguments& args) {
 
     fetchAll_req->callback = Persistent<Function>::New(callback);
     fetchAll_req->res = res;
+    fetchAll_req->results_array = results_array;
 
     eio_custom(EIO_FetchAll, EIO_PRI_DEFAULT, EIO_After_FetchAll, fetchAll_req);
 
@@ -450,6 +465,8 @@ Handle<Value> MysqlResult::FetchAllSync(const Arguments& args) {
 
     MYSQLRES_MUSTBE_VALID;
 
+    bool results_array = (args.Length() > 0 && args[0]->IsBoolean()) ? args[0]->BooleanValue() : false;
+
     MYSQL_FIELD *fields = mysql_fetch_fields(res->_res);
     uint32_t num_fields = mysql_num_fields(res->_res);
     MYSQL_ROW result_row;
@@ -461,12 +478,19 @@ Handle<Value> MysqlResult::FetchAllSync(const Arguments& args) {
 
     i = 0;
     while ( (result_row = mysql_fetch_row(res->_res)) ) {
-        js_result_row = Object::New();
+        if(results_array) {
+          js_result_row = Array::New();
+        } else {
+          js_result_row = Object::New();
+        }
 
         for ( j = 0; j < num_fields; j++ ) {
-            js_field = GetFieldValue(fields[j], result_row[j]);
-
+          js_field = GetFieldValue(fields[j], result_row[j]);
+          if(results_array) {
+            js_result_row->Set(Integer::New(j), js_field);
+          } else {
             js_result_row->Set(V8STR(fields[j].name), js_field);
+          }
         }
 
         js_result->Set(Integer::New(i), js_result_row);

src/mysql_bindings_result.h

@@ -84,6 +84,7 @@ class MysqlResult : public node::EventEmitter {
 
         MYSQL_FIELD *fields;
         uint32_t num_fields;
+        bool results_array;
     };
     static int EIO_After_FetchAll(eio_req *req);
     static int EIO_FetchAll(eio_req *req);

tests/simple/test-class-mysqlresult.js

@@ -127,6 +127,26 @@ exports.FetchAll = function (test) {
   });
 };
 
+exports.FetchAllWithArrayOption = function (test) {
+  test.expect(5);
+  
+  var conn = mysql_libmysqlclient.createConnectionSync(cfg.host, cfg.user, cfg.password, cfg.database),
+    res;
+  test.ok(conn, "mysql_libmysqlclient.createConnectionSync(host, user, password, database)");
+  
+  res = conn.querySync("SHOW TABLES;");
+  test.ok(res, "conn.querySync('SHOW TABLES;')");
+  
+  res.fetchAll(true,function (err, tables) {
+    test.ok(err === null, "res.fetchAll() err===null");
+    test.ok(tables, "res.fetchAll() result");
+    test.ok(Array.isArray(tables[0]), "Result returns an array of array");
+    conn.closeSync();
+    
+    test.done();
+  });
+};
+
 exports.FetchAllSync = function (test) {
   test.expect(7);
 
@@ -168,6 +188,48 @@ exports.FetchAllSync = function (test) {
   test.done();
 };
 
+exports.FetchAllSyncWithArrayOption = function (test) {
+  test.expect(8);
+  
+  var conn = mysql_libmysqlclient.createConnectionSync(cfg.host, cfg.user, cfg.password, cfg.database),
+    res,
+    tables,
+    rows;
+  test.ok(conn, "mysql_libmysqlclient.createConnectionSync(host, user, password, database)");
+  
+  res = conn.querySync("SHOW TABLES;");
+  test.ok(res, "conn.querySync('SHOW TABLES;')");
+  tables = res.fetchAllSync();
+  test.ok(tables, "res.fetchAllSync()");
+  res = false;
+  tables.forEach(function (table) {
+    if (table.Tables_in_test === cfg.test_table) {
+      res = true;
+    }
+  });
+  test.ok(res, "res.fetchAllSync() show test table");
+  
+  res = conn.querySync("DELETE FROM " + cfg.test_table + ";");
+  res = conn.querySync("INSERT INTO " + cfg.test_table +
+                   " (random_number, random_boolean) VALUES ('1', '1');") && res;
+  res = conn.querySync("INSERT INTO " + cfg.test_table +
+                    " (random_number, random_boolean) VALUES ('2', '1');") && res;
+  res = conn.querySync("INSERT INTO " + cfg.test_table +
+                   " (random_number, random_boolean) VALUES ('3', '0');") && res;
+  test.ok(res, "INSERT");
+  
+  res = conn.querySync("SELECT random_number from " + cfg.test_table +
+                   " WHERE random_boolean='0';");
+  test.ok(res, "SELECT");
+  rows = res.fetchAllSync(true);
+  test.ok(Array.isArray(rows[0]), "Result returns an array of array");
+  test.same(rows, [[3]], "conn.querySync('SELECT ...').fetchAllSync()");
+  
+  conn.closeSync();
+  
+  test.done();
+};
+
 exports.FetchArraySync = function (test) {
   test.expect(5);
 

wscript

@@ -61,7 +61,7 @@ def test(tst):
         Utils.exec_command('node ./tools/nodeunit/bin/nodeunit tests/slow')
       else:
         if Options.options.ignored:
-          Utils.exec_command('node_g ./tools/nodeunit/bin/nodeunit tests/ignored')
+          Utils.exec_command('node ./tools/nodeunit/bin/nodeunit tests/ignored')
         else:
           if Options.options.all:
             Utils.exec_command('node ./tools/nodeunit/bin/nodeunit tests/simple tests/complex tests/slow')