From b35593850923b2320a55ed965a815488ec48eea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Freitas?= Date: Wed, 12 Sep 2012 04:32:54 +0900 Subject: [PATCH 1/5] define LONGLONG(64 bits) as BIGINT to the node-db layer above --- src/result.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/result.cc b/src/result.cc index 0f9f051..91a6b5f 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: From dcd3ac6f2068fb3add1012b37151c89b01a757ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Freitas?= Date: Wed, 12 Sep 2012 11:17:06 +0900 Subject: [PATCH 2/5] npm is not smart about git submodule update. node-db should have a package.json --- .gitmodules | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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/package.json b/package.json index b9826ff..9432f55 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ ] , "main" : "./db-mysql" , "scripts" : - { "install": "node-waf configure build" + { "preinstall": "git clone -b bigint_pre_libuv git://github.com/imkira/node-db.git lib/node-db" + , "install": "node-waf configure build" , "preuninstall": "rm -rf build/*" , "test" : "node-waf test" , "doc" : "node-waf doc" From e132b366708e8294e3da4be4cdfbdfc769197bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Freitas?= Date: Tue, 26 Mar 2013 23:21:18 +0900 Subject: [PATCH 3/5] fix: use conditionals in node-gyp for overriding compiler and cxxflags on the mac --- binding.gyp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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", From 7b54fe76de223dc8fb9afd9597f66aec23bfaf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Freitas?= Date: Tue, 26 Mar 2013 23:50:20 +0900 Subject: [PATCH 4/5] fix: use node-gyp for node 0.10 --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9432f55..f18d26c 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,14 +18,14 @@ ] , "main" : "./db-mysql" , "scripts" : - { "preinstall": "git clone -b bigint_pre_libuv git://github.com/imkira/node-db.git lib/node-db" - , "install": "node-waf configure build" + { "preinstall": "git clone git://github.com/imkira/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" : "*" } } From 5ecd9bd948cdf8dd7916c1aac925b91efc2303de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Freitas?= Date: Thu, 16 May 2013 00:27:20 +0900 Subject: [PATCH 5/5] modified: use mariano's node-db repo in pre-install (auto pull request) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f18d26c..4c201fd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ ] , "main" : "./db-mysql" , "scripts" : - { "preinstall": "git clone git://github.com/imkira/node-db.git lib/node-db" + { "preinstall": "git clone git://github.com/mariano/node-db.git lib/node-db" , "install": "node-gyp rebuild --release" , "preuninstall": "rm -rf build/*" , "test" : "nodeunit tests.js"