Merge pull request #386 from mapbox/iojs

Upgrade to nan@1.5.0 / Fix compile against io.js
TryGhost · Jan 16, 2015 · 0493c06 · 0493c06
2 parents 78a134b + 44d8b7a
commit 0493c06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
         "url": "git://github.com/mapbox/node-sqlite3.git"
     },
     "dependencies": {
-        "nan": "~1.4.1",
+        "nan": "~1.5.0",
         "node-pre-gyp": "~0.6.1"
     },
     "bundledDependencies": [

diff --git a/src/database.cc b/src/database.cc
@@ -437,7 +437,7 @@ void Database::ProfileCallback(Database *db, ProfileInfo* info) {
     Local<Value> argv[] = {
         NanNew("profile"),
         NanNew<String>(info->sql.c_str()),
-        NanNew<Integer>((double)info->nsecs / 1000000.0)
+        NanNew<Number>((double)info->nsecs / 1000000.0)
     };
     EMIT_EVENT(NanObjectWrapHandle(db), 3, argv);
     delete info;
@@ -482,7 +482,7 @@ void Database::UpdateCallback(Database *db, UpdateInfo* info) {
         NanNew(sqlite_authorizer_string(info->type)),
         NanNew<String>(info->database.c_str()),
         NanNew<String>(info->table.c_str()),
-        NanNew<Integer>(info->rowid),
+        NanNew<Number>(info->rowid),
     };
     EMIT_EVENT(NanObjectWrapHandle(db), 4, argv);
     delete info;

diff --git a/src/statement.cc b/src/statement.cc
@@ -477,7 +477,7 @@ void Statement::Work_AfterRun(uv_work_t* req) {
         // Fire callbacks.
         Local<Function> cb = NanNew(baton->callback);
         if (!cb.IsEmpty() && cb->IsFunction()) {
-            NanObjectWrapHandle(stmt)->Set(NanNew("lastID"), NanNew<Integer>(baton->inserted_id));
+            NanObjectWrapHandle(stmt)->Set(NanNew("lastID"), NanNew<Number>(baton->inserted_id));
             NanObjectWrapHandle(stmt)->Set(NanNew("changes"), NanNew<Integer>(baton->changes));
 
             Local<Value> argv[] = { NanNew(NanNull()) };