diff --git a/.gitmodules b/.gitmodules index 558c319..0804483 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lib/node-db"] path = lib/node-db - url = git://github.com/mariano/node-db.git + url = git://github.com/imkira/node-db.git diff --git a/binding.gyp b/binding.gyp index 5c1e052..416cd13 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,4 +1,11 @@ { + 'conditions': [ + ['OS=="mac"', { + 'make_global_settings': [ + ['CC', '/usr/bin/gcc'], + ['CXX', '/usr/bin/g++'] + ] + }]], "targets": [ { "target_name": "mysql_bindings", @@ -16,6 +23,13 @@ 'cflags_cc!': [ '-fno-exceptions' ], + 'conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', + 'GCC_ENABLE_CPP_RTTI': 'YES' + } + }]], "sources": [ "lib/node-db/exception.cc", "lib/node-db/binding.cc", diff --git a/package.json b/package.json index b9826ff..4c201fd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ , "keywords": ["database","db","native","binding","library","plugin","client","mysql","libmysql"] , "homepage" : "http://nodejsdb.org/db-mysql" , "version" : "0.7.6" -, "engines" : { "node" : ">=0.4.1" } +, "engines" : { "node" : ">=0.8.0" } , "maintainers" : [ { "name": "Mariano Iglesias" , "email": "mgiglesias@gmail.com" @@ -18,13 +18,14 @@ ] , "main" : "./db-mysql" , "scripts" : - { "install": "node-waf configure build" + { "preinstall": "git clone git://github.com/mariano/node-db.git lib/node-db" + , "install": "node-gyp rebuild --release" , "preuninstall": "rm -rf build/*" - , "test" : "node-waf test" - , "doc" : "node-waf doc" + , "test" : "nodeunit tests.js" } , "devDependencies" : { "nodeunit" : "*" , "nodelint" : "*" + , "node-gyp" : "*" } } diff --git a/src/result.cc b/src/result.cc index ac3d03f..0e1cbca 100644 --- a/src/result.cc +++ b/src/result.cc @@ -14,9 +14,11 @@ node_db_mysql::Result::Column::Column(const MYSQL_FIELD& column) { case MYSQL_TYPE_YEAR: case MYSQL_TYPE_INT24: case MYSQL_TYPE_LONG: - case MYSQL_TYPE_LONGLONG: this->type = INT; break; + case MYSQL_TYPE_LONGLONG: + this->type = BIGINT; + break; case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_DECIMAL: