Implementing buffered/not buffered support

Author: mariano

README.md

@@ -7,14 +7,16 @@ database bindings visit the [Node.js db-mysql homepage] [homepage].
 
 Before proceeding with installation, you need to have the libmysql
 development libraries and include files. Access to the mysql_config 
-binary is mandatory, and has to be part of the path prior to 
-installation. If the path to your mysql_config is
-/usr/local/bin/mysql_config make sure to do the following (Ubuntu
-users need to install the libmysqlclient-dev package):
+binary is mandatory, and its path has to be specified prior to 
+installation (if its not within the system's path). For example, if 
+the path to your mysql_config is /usr/local/bin/mysql_config make 
+sure to do the following (Ubuntu users need to install the 
+libmysqlclient-dev package):
 
-    $ export PATH=/usr/local/bin:$PATH
+    $ export MYSQL_CONFIG=/usr/local/bin/mysql_config
 
-Once you are sure mysql_config is part of the path, install with npm:
+Once you are sure that either mysql_config is part of the path or that
+you specified the MYSQL_CONFIG environment var, install with npm:
 
     $ npm install db-mysql
 

lib/node-db

@@ -2,7 +2,7 @@
 , "description" : "MySQL database bindings for Node.JS"
 , "keywords": ["database","db","native","binding","library","plugin","client","mysql","libmysql"]
 , "homepage" : "http://nodejsdb.org/db-mysql"
-, "version" : "0.5.3"
+, "version" : "0.5.4"
 , "engines" : { "node" : ">=0.4.1" }
 , "maintainers" :
   [ { "name": "Mariano Iglesias"

package.json

@@ -70,7 +70,6 @@ node_db::Result::Column::type_t node_db_mysql::Result::Column::getType() const {
 node_db_mysql::Result::Result(MYSQL* connection, MYSQL_RES* result) throw(node_db::Exception&)
     : columns(NULL),
     totalColumns(0),
-    totalRows(0),
     rowNumber(0),
     connection(connection),
     result(result),
@@ -85,7 +84,6 @@ node_db_mysql::Result::Result(MYSQL* connection, MYSQL_RES* result) throw(node_d
         throw node_db::Exception("Could not buffer columns");
     }
 
-    this->totalRows = mysql_num_rows(this->result);
     this->totalColumns = mysql_num_fields(this->result);
     if (this->totalColumns > 0) {
         this->columns = new Column*[this->totalColumns];
@@ -117,7 +115,7 @@ bool node_db_mysql::Result::hasNext() const {
     return (this->nextRow != NULL);
 }
 
-const char** node_db_mysql::Result::next() throw(node_db::Exception&) {
+char** node_db_mysql::Result::next() throw(node_db::Exception&) {
     if (this->nextRow == NULL) {
         return NULL;
     }
@@ -126,7 +124,7 @@ const char** node_db_mysql::Result::next() throw(node_db::Exception&) {
     this->previousRow = this->nextRow;
     this->nextRow = this->row();
 
-    return (const char**) this->previousRow;
+    return this->previousRow;
 }
 
 unsigned long* node_db_mysql::Result::columnLengths() throw(node_db::Exception&) {
@@ -167,6 +165,13 @@ uint16_t node_db_mysql::Result::columnCount() const {
     return this->totalColumns;
 }
 
-uint64_t node_db_mysql::Result::count() const throw() {
-    return this->totalRows;
+uint64_t node_db_mysql::Result::count() const throw(node_db::Exception&) {
+    if (!this->isBuffered()) {
+        throw node_db::Exception("Result is not buffered");
+    }
+    return mysql_num_rows(this->result);
+}
+
+bool node_db_mysql::Result::isBuffered() const throw() {
+    return (!this->result->handle || this->result->handle->status != MYSQL_STATUS_USE_RESULT);
 }

src/result.cc

@@ -28,23 +28,23 @@ class Result : public node_db::Result {
         explicit Result(MYSQL* connection, MYSQL_RES* result) throw(node_db::Exception&);
         ~Result();
         bool hasNext() const;
-        const char** next() throw(node_db::Exception&);
+        char** next() throw(node_db::Exception&);
         unsigned long* columnLengths() throw(node_db::Exception&);
         uint64_t index() const throw(std::out_of_range&);
         Column* column(uint16_t i) const throw(std::out_of_range&);
         uint64_t insertId() const;
         uint16_t columnCount() const;
         uint64_t affectedCount() const;
         uint16_t warningCount() const;
-        uint64_t count() const throw();
+        uint64_t count() const throw(node_db::Exception&);
+        bool isBuffered() const throw();
 
     protected:
-        Column **columns;
+        Column** columns;
         uint16_t totalColumns;
-        uint64_t totalRows;
         uint64_t rowNumber;
 
-        char **row() throw(node_db::Exception&);
+        char** row() throw(node_db::Exception&);
 
     private:
         MYSQL* connection;

src/result.h

@@ -11,11 +11,10 @@ from os.path import exists
 
 srcdir = "."
 blddir = "build"
-VERSION = "0.5.3"
+VERSION = "0.5.4"
 
 def set_options(opt):
   opt.tool_options("compiler_cxx")
-  opt.add_option('--mysql-config', action='store', default='mysql_config', help='Path to mysql_config, e.g. /usr/bin/mysql_config')
   opt.add_option('--debug', action='store_true', help='Run tests with nodeunit_g')
   opt.add_option('--warn', action='store_true', help='Enable extra -W* compiler flags')
 
@@ -32,17 +31,11 @@ def configure(conf):
     conf.env.append_unique('CXXFLAGS', ["-Wconversion", "-Wshadow", "-Wsign-conversion", "-Wunreachable-code", "-Wredundant-decls", "-Wcast-qual"])
 
   # MySQL flags and libraries
-  mysql_config = conf.find_program(Options.options.mysql_config, mandatory=True)
+  mysql_config = conf.find_program('mysql_config', var='MYSQL_CONFIG', mandatory=True)
+
   conf.env.append_unique('CXXFLAGS', Utils.cmd_output(mysql_config + ' --include').split())
   conf.env.append_unique('LINKFLAGS', Utils.cmd_output(mysql_config + ' --libs_r').split())
-
-  if not conf.check_cxx(lib="mysqlclient_r", errmsg="not found, try to find nonthreadsafe libmysqlclient"):
-    # link flags are needed to find the libraries
-    conf.env.append_unique('LINKFLAGS', Utils.cmd_output(mysql_config + ' --libs').split())
-    if conf.check_cxx(lib="mysqlclient"):
-      conf.env.append_unique('CXXDEFINES', ["MYSQL_NON_THREADSAFE"])
-    else:
-      conf.fatal("Missing both libmysqlclient_r and libmysqlclient from libmysqlclient-devel or mysql-devel package")
+  conf.check_cxx(lib="mysqlclient_r", errmsg="Missing libmysqlclient_r")
 
 def build(bld):
   obj = bld.new_task_gen("cxx", "shlib", "node_addon")