diff --git a/binding.gyp b/binding.gyp index 325e6b65..a7487e5e 100644 --- a/binding.gyp +++ b/binding.gyp @@ -79,36 +79,87 @@ } } ], - ["OS=='win'", { - "variables" : { - "oci_lib_dir%": "Error: " + text + "

"); diff --git a/package.json b/package.json index 70577bd5..5f16b6e1 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,50 @@ { - "name" : "oracledb", - "version" : "0.5.0", - "description" : "Oracle Database driver by Oracle Corp.", - "license" : "Apache 2.0", - "homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html", - "keywords" : [ - "oracledb", "dboracle", "Node.js", "SQL", "PL/SQL", "connection", "connectivity", "OCI", "client", "plugin", "library", "driver", "extension", "binding", "interface", "adapter", "module", "DB", "official", "Database", "Oracle" - ], - "repository" : { - "type" : "git", - "url" : "git://github.com/oracle/node-oracledb.git" - }, - "dependencies" : { - }, - "engines" : { - "node" : ">=0.10.28 <0.11" - }, - "engineStrict": true, - "maintainers" : [ - { - "name" : "Oracle Corp." - } - ], - "bugs" : { - "url" : "https://github.com/oracle/node-oracledb/issues" - }, - "main" : "./index.js" + "name": "oracledb", + "version": "0.5.0", + "description": "Oracle Database driver by Oracle Corp.", + "license": "Apache 2.0", + "homepage": "http://www.oracle.com/technetwork/database/database-technologies/node_js/index.html", + "keywords": [ + "oracledb", + "dboracle", + "Node.js", + "SQL", + "PL/SQL", + "connection", + "connectivity", + "OCI", + "client", + "plugin", + "library", + "driver", + "extension", + "binding", + "interface", + "adapter", + "module", + "DB", + "official", + "Database", + "Oracle" + ], + "repository": { + "type": "git", + "url": "git://github.com/oracle/node-oracledb.git" + }, + "dependencies": { + "nan": "^1.8.4" + }, + "engines": { + "node": ">=0.10.28" + }, + "engineStrict": true, + "maintainers": [ + { + "name": "Oracle Corp." + } + ], + "bugs": { + "url": "https://github.com/oracle/node-oracledb/issues" + }, + "main": "./index.js" } diff --git a/src/njs/src/njsConnection.cpp b/src/njs/src/njsConnection.cpp index 0d9076c6..303249c8 100644 --- a/src/njs/src/njsConnection.cpp +++ b/src/njs/src/njsConnection.cpp @@ -77,37 +77,37 @@ void Connection::setConnection(dpi::Conn* dpiconn, Oracledb* oracledb) */ void Connection::Init(Handle target) { - HandleScope scope; + NanScope(); - Local tpl = FunctionTemplate::New(New); - connectionTemplate_s = Persistent::New(tpl); - connectionTemplate_s->InstanceTemplate()->SetInternalFieldCount(1); - connectionTemplate_s->SetClassName(String::New("Connection")); + Local tpl = NanNew(New); + tpl->InstanceTemplate()->SetInternalFieldCount(1); + tpl->SetClassName(NanNew("Connection")); - NODE_SET_PROTOTYPE_METHOD(connectionTemplate_s, "execute", Execute); - NODE_SET_PROTOTYPE_METHOD(connectionTemplate_s, "release", Release); - NODE_SET_PROTOTYPE_METHOD(connectionTemplate_s, "commit", Commit); - NODE_SET_PROTOTYPE_METHOD(connectionTemplate_s, "rollback", Rollback); - NODE_SET_PROTOTYPE_METHOD(connectionTemplate_s, "break", Break); + NODE_SET_PROTOTYPE_METHOD(tpl, "execute", Execute); + NODE_SET_PROTOTYPE_METHOD(tpl, "release", Release); + NODE_SET_PROTOTYPE_METHOD(tpl, "commit", Commit); + NODE_SET_PROTOTYPE_METHOD(tpl, "rollback", Rollback); + NODE_SET_PROTOTYPE_METHOD(tpl, "break", Break); - connectionTemplate_s->InstanceTemplate()->SetAccessor( - String::New("stmtCacheSize"), + tpl->InstanceTemplate()->SetAccessor( + NanNew("stmtCacheSize"), Connection::GetStmtCacheSize, Connection::SetStmtCacheSize ); - connectionTemplate_s->InstanceTemplate()->SetAccessor( - String::New("clientId"), + tpl->InstanceTemplate()->SetAccessor( + NanNew("clientId"), Connection::GetClientId, Connection::SetClientId ); - connectionTemplate_s->InstanceTemplate()->SetAccessor( - String::New("module"), + tpl->InstanceTemplate()->SetAccessor( + NanNew("module"), Connection::GetModule, Connection::SetModule ); - connectionTemplate_s->InstanceTemplate()->SetAccessor( - String::New("action"), + tpl->InstanceTemplate()->SetAccessor( + NanNew("action"), Connection::GetAction, Connection::SetAction ); - target->Set(String::New("Connection"),connectionTemplate_s->GetFunction()); + NanAssignPersistent( connectionTemplate_s, tpl); + target->Set(NanNew("Connection"),tpl->GetFunction()); } /*****************************************************************************/ @@ -115,14 +115,14 @@ void Connection::Init(Handle target) DESCRIPTION Invoked when new of connection is called from JS */ -Handle Connection::New(const Arguments& args) +NAN_METHOD(Connection::New) { - HandleScope scope; + NanScope(); Connection *connection = new Connection(); connection->Wrap(args.This()); - return args.This(); + NanReturnValue(args.This()); } /*****************************************************************************/ @@ -130,12 +130,11 @@ Handle Connection::New(const Arguments& args) DESCRIPTION Abstraction for exception on accessing connection properties */ -void Connection::connectionPropertyException(const AccessorInfo& info, +void Connection::connectionPropertyException(Connection* njsConn, NJSErrorType errType, string property) { - HandleScope scope; - Connection* njsConn = ObjectWrap::Unwrap(info.Holder()); + NanScope(); string msg; if(!njsConn->isValid_) msg = NJSMessages::getErrorMsg(errInvalidConnection); @@ -149,28 +148,27 @@ void Connection::connectionPropertyException(const AccessorInfo& info, DESCRIPTION Get Accessor of stmtCacheSize property */ -Handle Connection::GetStmtCacheSize (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Connection::GetStmtCacheSize) { - HandleScope scope; - Connection* njsConn = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Connection* njsConn = ObjectWrap::Unwrap(args.Holder()); if(!njsConn->isValid_) { string error = NJSMessages::getErrorMsg ( errInvalidConnection ); NJS_SET_EXCEPTION(error.c_str(), error.length()); - return scope.Close(Undefined()); + NanReturnUndefined(); } try { - Local value = v8::Integer::New(njsConn->dpiconn_->stmtCacheSize()); - return scope.Close(value); + Local value = NanNew(njsConn->dpiconn_->stmtCacheSize()); + NanReturnValue(value); } catch(dpi::Exception &e) { NJS_SET_EXCEPTION(e.what(), strlen(e.what())); - return Undefined(); + NanReturnUndefined(); } - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -178,10 +176,9 @@ Handle Connection::GetStmtCacheSize (Local property, DESCRIPTION Set Accessor of stmtCacheSize property - throws error */ -void Connection::SetStmtCacheSize(Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Connection::SetStmtCacheSize) { - connectionPropertyException(info, errReadOnly, "stmtCacheSize"); + connectionPropertyException(ObjectWrap::Unwrap(args.Holder()), errReadOnly, "stmtCacheSize"); } /*****************************************************************************/ @@ -189,11 +186,10 @@ void Connection::SetStmtCacheSize(Local property, Local value, DESCRIPTION Get Accessor of clientId property - throws error */ -Handle Connection::GetClientId(Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Connection::GetClientId) { - connectionPropertyException(info, errWriteOnly, "clientId"); - return Undefined(); + connectionPropertyException(ObjectWrap::Unwrap(args.Holder()), errWriteOnly, "clientId"); + NanReturnUndefined(); } /*****************************************************************************/ @@ -201,11 +197,10 @@ Handle Connection::GetClientId(Local property, DESCRIPTION Set Accessor of clientId property */ -void Connection::SetClientId(Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Connection::SetClientId) { - HandleScope scope; - Connection* njsConn = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Connection* njsConn = ObjectWrap::Unwrap(args.Holder()); if(!njsConn->isValid_) { string msg = NJSMessages::getErrorMsg(errInvalidConnection); @@ -225,11 +220,10 @@ void Connection::SetClientId(Local property, Local value, DESCRIPTION Get Accessor of module property - throws error */ -Handle Connection::GetModule (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Connection::GetModule) { - connectionPropertyException(info, errWriteOnly, "module"); - return Undefined(); + connectionPropertyException(ObjectWrap::Unwrap(args.Holder()), errWriteOnly, "module"); + NanReturnUndefined(); } /*****************************************************************************/ @@ -237,11 +231,10 @@ Handle Connection::GetModule (Local property, DESCRIPTION Set Accessor of stmtCacheSize property */ -void Connection::SetModule (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Connection::SetModule) { - HandleScope scope; - Connection *njsConn = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Connection *njsConn = ObjectWrap::Unwrap(args.Holder()); if(!njsConn->isValid_) { string msg = NJSMessages::getErrorMsg(errInvalidConnection); @@ -261,11 +254,10 @@ void Connection::SetModule (Local property, Local value, DESCRIPTION Get Accessor of action property - throws error */ -Handle Connection::GetAction (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Connection::GetAction) { - connectionPropertyException(info, errWriteOnly, "action"); - return Undefined(); + connectionPropertyException(ObjectWrap::Unwrap(args.Holder()), errWriteOnly, "action"); + NanReturnUndefined(); } /*****************************************************************************/ @@ -273,11 +265,10 @@ Handle Connection::GetAction (Local property, DESCRIPTION Set Accessor of action property */ -void Connection::SetAction(Local property,Local value, - const AccessorInfo& info) +NAN_SETTER(Connection::SetAction) { - HandleScope scope; - Connection *njsConn = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Connection *njsConn = ObjectWrap::Unwrap(args.Holder()); if(!njsConn->isValid_) { string msg = NJSMessages::getErrorMsg(errInvalidConnection); @@ -302,16 +293,16 @@ void Connection::SetAction(Local property,Local value, Options Object (Optional), Callback */ -Handle Connection::Execute(const Arguments& args) +NAN_METHOD(Connection::Execute) { - HandleScope scope; + NanScope(); Local callback; Local sql; Connection *connection; NJS_GET_CALLBACK ( callback, args ); eBaton *executeBaton = new eBaton; - executeBaton->cb = Persistent::New( callback ); + NanAssignPersistent( executeBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( executeBaton->error, args, 2, 4, exitExecute ); connection = ObjectWrap::Unwrap(args.This()); @@ -345,7 +336,7 @@ Handle Connection::Execute(const Arguments& args) uv_queue_work(uv_default_loop(), &executeBaton->req, Async_Execute, (uv_after_work_cb)Async_AfterExecute); - return scope.Close(Undefined()); + NanReturnUndefined(); } /*****************************************************************************/ @@ -358,10 +349,10 @@ Handle Connection::Execute(const Arguments& args) index- index of binds in args, executeBaton */ -void Connection::ProcessBinds (const Arguments& args, unsigned int index, +void Connection::ProcessBinds (_NAN_METHOD_ARGS, unsigned int index, eBaton* executeBaton) { - HandleScope scope; + NanScope(); if(args[index]->IsArray() ) { Local bindsArray = Local::Cast(args[index]); @@ -386,7 +377,7 @@ void Connection::ProcessBinds (const Arguments& args, unsigned int index, index- index of options in args, executeBaton */ -void Connection::ProcessOptions (const Arguments& args, unsigned int index, +void Connection::ProcessOptions (_NAN_METHOD_ARGS, unsigned int index, eBaton* executeBaton) { Local options; @@ -422,7 +413,7 @@ void Connection::ProcessOptions (const Arguments& args, unsigned int index, */ void Connection::GetBinds (Handle bindobj, eBaton* executeBaton) { - HandleScope scope; + NanScope(); std::string str; Local array = bindobj->GetOwnPropertyNames(); @@ -432,7 +423,7 @@ void Connection::GetBinds (Handle bindobj, eBaton* executeBaton) Handle temp = array->Get(index).As(); NJSString(str, temp); bind->key = ":"+std::string(str); - Handle val__ = bindobj->Get(String::New((char*)str.c_str(), + Handle val__ = bindobj->Get(NanNew((char*)str.c_str(), (int) str.length())); Connection::GetBindUnit(val__, bind, executeBaton); if(!executeBaton->error.empty()) @@ -455,7 +446,7 @@ void Connection::GetBinds (Handle bindobj, eBaton* executeBaton) */ void Connection::GetBinds (Handle binds, eBaton* executeBaton) { - HandleScope scope; + NanScope(); for(unsigned int index = 0; index < binds->Length(); index++) { @@ -479,7 +470,7 @@ void Connection::GetBinds (Handle binds, eBaton* executeBaton) void Connection::GetBindUnit (Handle val, Bind* bind, eBaton* executeBaton) { - HandleScope scope; + NanScope(); unsigned int dir = BIND_IN; if(val->IsObject() && !val->IsDate()) @@ -500,7 +491,7 @@ void Connection::GetBindUnit (Handle val, Bind* bind, goto exitGetBindUnit; } - Local element = bind_unit->Get(String::New("val")); + Local element = bind_unit->Get(NanNew("val")); switch(dir) { case BIND_IN : @@ -547,7 +538,7 @@ void Connection::GetBindUnit (Handle val, Bind* bind, void Connection::GetOutBindParams (unsigned short dataType, Bind* bind, eBaton *executeBaton) { - HandleScope scope; + NanScope(); switch(dataType) { case DATA_STR : @@ -1014,20 +1005,20 @@ void Connection::GetDefines (eBaton* executeBaton) */ void Connection::Async_AfterExecute(uv_work_t *req) { - HandleScope scope; + NanScope(); eBaton *executeBaton = (eBaton*)req->data; v8::TryCatch tc; Handle argv[2]; if(!(executeBaton->error).empty()) { - argv[0] = v8::Exception::Error(String::New((executeBaton->error).c_str())); - argv[1] = Undefined(); + argv[0] = v8::Exception::Error(NanNew((executeBaton->error).c_str())); + argv[1] = NanUndefined(); } else { - argv[0] = Undefined(); - Local result = Object::New(); + argv[0] = NanUndefined(); + Local result = NanNew(); Handle rowArray; switch(executeBaton->st) { @@ -1035,49 +1026,46 @@ void Connection::Async_AfterExecute(uv_work_t *req) rowArray = Connection::GetRows(executeBaton); if(!(executeBaton->error).empty()) { - argv[0] = v8::Exception::Error(String::New((executeBaton->error).c_str())); - argv[1] = Undefined(); + argv[0] = v8::Exception::Error(NanNew((executeBaton->error).c_str())); + argv[1] = NanUndefined(); goto exitAsyncAfterExecute; } - result->Set(String::New("rows"), rowArray, v8::ReadOnly); - result->Set(String::New("outBinds"),Undefined()); - result->Set(String::New("rowsAffected"), Undefined()); - result->Set(String::New("metaData"), Connection::GetMetaData( - executeBaton->columnNames, - executeBaton->numCols)); + result->Set(NanNew("rows"), rowArray);//, v8::ReadOnly); + result->Set(NanNew("outBinds"),NanUndefined()); + result->Set(NanNew("rowsAffected"), NanUndefined()); + result->Set(NanNew("metaData"), Connection::GetMetaData( + executeBaton->columnNames, + executeBaton->numCols)); break; case DpiStmtBegin : case DpiStmtDeclare : case DpiStmtCall : - result->Set(String::New("rowsAffected"), Undefined()); - result->Set(String::New("outBinds"),Connection::GetOutBinds(executeBaton), - v8::ReadOnly); - result->Set(String::New("rows"), Undefined()); - result->Set(String::New("metaData"), Undefined()); + result->Set(NanNew("rowsAffected"), NanUndefined()); + result->Set(NanNew("outBinds"),Connection::GetOutBinds(executeBaton));//, v8::ReadOnly); + result->Set(NanNew("rows"), NanUndefined()); + result->Set(NanNew("metaData"), NanUndefined()); break; default : - result->Set(String::New("rowsAffected"), - Integer::New((unsigned int) executeBaton->rowsAffected), - v8::ReadOnly); - if ( executeBaton->numOutBinds ) + result->Set(NanNew("rowsAffected"), + NanNew((unsigned int) executeBaton->rowsAffected));//, v8::ReadOnly); + if( executeBaton->numOutBinds ) { - result->Set (String::New("outBinds"), Connection::GetOutBinds(executeBaton), v8::ReadOnly); + result->Set(NanNew("outBinds"), Connection::GetOutBinds(executeBaton));//, v8::ReadOnly); } else { - result->Set(String::New("outBinds"),Undefined()); + result->Set(NanNew("outBinds"),NanUndefined()); } - result->Set(String::New("rows"), Undefined()); - result->Set(String::New("metaData"), Undefined()); + result->Set(NanNew("rows"), NanUndefined()); + result->Set(NanNew("metaData"), NanUndefined()); break; } argv[1] = result; } exitAsyncAfterExecute: - Local callback = Local::New(executeBaton->cb); + Local callback = NanNew(executeBaton->cb); delete executeBaton; - node::MakeCallback( Context::GetCurrent()->Global(), - callback, 2, argv ); + NanMakeCallback( NanGetCurrentContext()->Global(), callback, 2, argv ); if(tc.HasCaught()) { node::FatalException(tc); @@ -1096,21 +1084,20 @@ void Connection::Async_AfterExecute(uv_work_t *req) RETURNS: MetaData Handle */ -Handle Connection::GetMetaData (std::string* columnNames, +v8::Handle Connection::GetMetaData (std::string* columnNames, unsigned int numCols ) { - HandleScope scope; - Handle metaArray = v8::Array::New(numCols); + NanEscapableScope(); + Handle metaArray = NanNew(numCols); for(unsigned int i=0; i < numCols ; i++) { - Local column = Object::New(); - column->Set(String::New("name"), - String::New(columnNames[i].c_str(), - (int) columnNames[i].length()) + Local column = NanNew(); + column->Set(NanNew("name"), + NanNew(columnNames[i].c_str()) ); metaArray->Set(i, column); } - return scope.Close(metaArray); + return NanEscapeScope(metaArray); } /*****************************************************************************/ @@ -1124,17 +1111,17 @@ Handle Connection::GetMetaData (std::string* columnNames, RETURNS: Rows Handle */ -Handle Connection::GetRows (eBaton* executeBaton) +v8::Handle Connection::GetRows (eBaton* executeBaton) { - HandleScope scope; + NanEscapableScope(); Handle rowsArray; switch(executeBaton->outFormat) { case ROWS_ARRAY : - rowsArray = v8::Array::New(executeBaton->rowsFetched); + rowsArray = NanNew(executeBaton->rowsFetched); for(unsigned int i = 0; i < executeBaton->rowsFetched; i++) { - Local row = v8::Array::New(executeBaton->numCols); + Local row = NanNew(executeBaton->numCols); for(unsigned int j = 0; j < executeBaton->numCols; j++) { long double *dblArr = (long double *)executeBaton->defines[j].buf; @@ -1151,15 +1138,15 @@ Handle Connection::GetRows (eBaton* executeBaton) } break; case ROWS_OBJECT : - rowsArray = v8::Array::New(executeBaton->rowsFetched); + rowsArray = NanNew(executeBaton->rowsFetched); for(unsigned int i =0 ; i < executeBaton->rowsFetched; i++) { - Local row = Object::New(); + Local row = NanNew(); for(unsigned int j = 0; j < executeBaton->numCols; j++) { long double *dblArr = (long double * )executeBaton->defines[j].buf; - row->Set(String::New(executeBaton->columnNames[j].c_str(), + row->Set(NanNew(executeBaton->columnNames[j].c_str(), (int) executeBaton->columnNames[j].length()), Connection::GetValue( executeBaton->defines[j].ind[i], @@ -1180,7 +1167,7 @@ Handle Connection::GetRows (eBaton* executeBaton) break; } exitGetRows: - return scope.Close(rowsArray); + return NanEscapeScope(rowsArray); } /*****************************************************************************/ @@ -1197,11 +1184,11 @@ Handle Connection::GetRows (eBaton* executeBaton) RETURNS: Handle */ -Handle Connection::GetValue ( short ind, unsigned short type, - void* val, DPI_BUFLEN_TYPE len, - DPI_SZ_TYPE maxSize) +v8::Handle Connection::GetValue ( short ind, unsigned short type, + void* val, DPI_BUFLEN_TYPE len, + DPI_SZ_TYPE maxSize) { - HandleScope scope; + NanEscapableScope(); Handle value; Local date; @@ -1210,17 +1197,18 @@ Handle Connection::GetValue ( short ind, unsigned short type, switch(type) { case (dpi::DpiVarChar) : - value = String::New((char*)val, len); - break; + value = NanNew((char*)val, len); + break; case (dpi::DpiInteger) : - value = Integer::New(*(int*)val); + value = NanNew(*(int*)val); break; case (dpi::DpiDouble) : - value = Number::New(*(double*)val); + value = NanNew(*(double*)val); break; case (dpi::DpiTimestampLTZ) : - date = Date::Cast(*Date::New ( *(long double*)val )); - value = date; + //date = Date::Cast(*NanNew( *(long double*)val )); + date = NanNew( *(long double*)val ); + value = date; break; default : break; @@ -1228,9 +1216,9 @@ Handle Connection::GetValue ( short ind, unsigned short type, } else { - value = Null(); + value = NanNull(); } - return scope.Close(value); + return NanEscapeScope(value); } @@ -1246,56 +1234,58 @@ Handle Connection::GetValue ( short ind, unsigned short type, Returns v8::Value - this will be an array (even for 1 row, array or 1). */ -Handle Connection::GetArrayValue ( Bind *binds, unsigned long count ) +v8::Handle Connection::GetArrayValue ( Bind *binds, unsigned long count ) { - HandleScope scope; + NanEscapableScope(); Local date; Local arrVal; unsigned long index = 0; Handle val; /* To return a value of array type, create one of specified size */ - arrVal = v8::Array::New ( count ) ; + arrVal = NanNew( count ) ; for ( index = 0 ; index < count ; index ++ ) { + if( + binds->ind[index] == -1 && + ( + (binds->type == dpi::DpiVarChar) || + (binds->type == dpi::DpiInteger) || + (binds->type == dpi::DpiDouble) || + (binds->type == dpi::DpiTimestampLTZ) + ) + ) + { + arrVal->Set( index, NanNull() ); + continue; + } + switch ( binds->type ) { case dpi::DpiVarChar: arrVal->Set ( index, - ( binds->ind[index] == -1 ) ? Null () : - String::New ((char *)binds->value + - (index * binds->maxSize ), - binds->len2[index])); + NanNew ((char *)binds->value + + (index * binds->maxSize ), + binds->len2[index])); break; case dpi::DpiInteger: arrVal->Set ( index, - (binds->ind[index] == -1 ) ? Null () : - Integer::New ( *((int *)binds->value + index ))); + NanNew ( *((int *)binds->value + index ))); break; case dpi::DpiDouble: arrVal->Set ( index, - (binds->ind[index] == -1 ) ? Null () : - Number::New ( *((double *)binds->value + index ))); + NanNew ( *((double *)binds->value + index ))); break; case dpi::DpiTimestampLTZ: - if ( binds->ind[index] != -1 ) - { - date = Date::Cast (*Date::New (*((long double *)binds->value + - index ))); - val = date; - arrVal->Set ( index, val ); - } - else - { - arrVal->Set ( index, Null () ); - } + arrVal->Set ( index, + NanNew (*((long double *)binds->value + index )) ); break; default: break; } } - return scope.Close ( arrVal ) ; + return NanEscapeScope( arrVal ) ; } @@ -1310,29 +1300,29 @@ Handle Connection::GetArrayValue ( Bind *binds, unsigned long count ) RETURNS: Outbinds object/array */ -Handle Connection::GetOutBinds (eBaton* executeBaton) +v8::Handle Connection::GetOutBinds (eBaton* executeBaton) { - HandleScope scope; + NanEscapableScope(); if(!executeBaton->binds.empty()) { if( executeBaton->binds[0]->key.empty() ) { // Binds as JS array - return scope.Close( GetOutBindArray( executeBaton->binds, - executeBaton->numOutBinds, - executeBaton->stmtIsReturning, - executeBaton->rowsAffected )); + return NanEscapeScope(GetOutBindArray( executeBaton->binds, + executeBaton->numOutBinds, + executeBaton->stmtIsReturning, + executeBaton->rowsAffected )); } else { - // Binds as JS object - return scope.Close ( GetOutBindObject( executeBaton->binds, - executeBaton->stmtIsReturning, - executeBaton->rowsAffected )); + // Binds as JS object + return NanEscapeScope(GetOutBindObject( executeBaton->binds, + executeBaton->stmtIsReturning, + executeBaton->rowsAffected )); } } - return scope.Close(Undefined()); + return NanUndefined(); } /*****************************************************************************/ @@ -1346,14 +1336,14 @@ Handle Connection::GetOutBinds (eBaton* executeBaton) RETURNS: Outbinds array */ -Handle Connection::GetOutBindArray ( std::vector &binds, - unsigned int outCount, - bool isDMLReturning, - unsigned long rowcount ) +v8::Handle Connection::GetOutBindArray ( std::vector &binds, + unsigned int outCount, + bool isDMLReturning, + unsigned long rowcount ) { - HandleScope scope; + NanEscapableScope(); - Local arrayBinds = v8::Array::New( outCount ); + Local arrayBinds = NanNew( outCount ); unsigned int it = 0; for(unsigned int index = 0; index < binds.size(); index++) @@ -1379,7 +1369,7 @@ Handle Connection::GetOutBindArray ( std::vector &binds, it ++; } } - return scope.Close(arrayBinds); + return NanEscapeScope(arrayBinds); } /*****************************************************************************/ @@ -1393,12 +1383,12 @@ Handle Connection::GetOutBindArray ( std::vector &binds, RETURNS: Outbinds object */ -Handle Connection::GetOutBindObject ( std::vector &binds, - bool isDMLReturning, - unsigned long rowcount ) +v8::Handle Connection::GetOutBindObject ( std::vector &binds, + bool isDMLReturning, + unsigned long rowcount ) { - HandleScope scope; - Local objectBinds = Object::New(); + NanEscapableScope(); + Local objectBinds = NanNew(); for(unsigned int index = 0; index < binds.size(); index++) { if(binds[index]->isOut) @@ -1422,12 +1412,12 @@ Handle Connection::GetOutBindObject ( std::vector &binds, val = Connection::GetArrayValue ( binds[index], rowcount ) ; } - objectBinds->Set( String::New ( binds[index]->key.c_str(), - (int) binds[index]->key.length() ), + objectBinds->Set( NanNew ( binds[index]->key.c_str(), + (int) binds[index]->key.length() ), val ); } } - return scope.Close(objectBinds); + return NanEscapeScope(objectBinds); } /*****************************************************************************/ @@ -1438,15 +1428,15 @@ Handle Connection::GetOutBindObject ( std::vector &binds, PARAMETERS: Arguments - Callback */ -Handle Connection::Release(const Arguments& args) +NAN_METHOD(Connection::Release) { - HandleScope scope; + NanScope(); Local callback; Connection *connection; NJS_GET_CALLBACK ( callback, args ); eBaton* releaseBaton = new eBaton; - releaseBaton->cb = Persistent::New( callback ); + NanAssignPersistent( releaseBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( releaseBaton->error, args, 1, 1, exitRelease ); connection = ObjectWrap::Unwrap(args.This()); @@ -1462,7 +1452,7 @@ Handle Connection::Release(const Arguments& args) uv_queue_work(uv_default_loop(), &releaseBaton->req, Async_Release, (uv_after_work_cb)Async_AfterRelease); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -1503,19 +1493,19 @@ void Connection::Async_Release(uv_work_t *req) */ void Connection::Async_AfterRelease(uv_work_t *req) { - HandleScope scope; + NanScope(); eBaton *releaseBaton = (eBaton*)req->data; v8::TryCatch tc; Handle argv[1]; if(!(releaseBaton->error).empty()) - argv[0] = v8::Exception::Error(String::New((releaseBaton->error).c_str())); + argv[0] = v8::Exception::Error(NanNew((releaseBaton->error).c_str())); else - argv[0] = Undefined(); - Local callback = Local::New(releaseBaton->cb); + argv[0] = NanUndefined(); + Local callback = NanNew(releaseBaton->cb); delete releaseBaton; - node::MakeCallback( Context::GetCurrent()->Global(), + NanMakeCallback( NanGetCurrentContext()->Global(), callback, 1, argv ); if(tc.HasCaught()) { @@ -1531,15 +1521,15 @@ void Connection::Async_AfterRelease(uv_work_t *req) PARAMETERS: Arguments - Callback */ -Handle Connection::Commit(const Arguments& args) +NAN_METHOD(Connection::Commit) { - HandleScope scope; + NanScope(); Local callback; Connection *connection; NJS_GET_CALLBACK ( callback, args ); eBaton* commitBaton = new eBaton; - commitBaton->cb = Persistent::New( callback ); + NanAssignPersistent( commitBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( commitBaton->error, args, 1, 1, exitCommit ); connection = ObjectWrap::Unwrap(args.This()); @@ -1555,7 +1545,7 @@ Handle Connection::Commit(const Arguments& args) uv_queue_work(uv_default_loop(), &commitBaton->req, Async_Commit, (uv_after_work_cb)Async_AfterCommit); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -1597,19 +1587,19 @@ void Connection::Async_Commit (uv_work_t *req) */ void Connection::Async_AfterCommit (uv_work_t *req) { - HandleScope scope; + NanScope(); eBaton *commitBaton = (eBaton*)req->data; v8::TryCatch tc; Handle argv[1]; if(!(commitBaton->error).empty()) - argv[0] = v8::Exception::Error(String::New((commitBaton->error).c_str())); + argv[0] = v8::Exception::Error(NanNew((commitBaton->error).c_str())); else - argv[0] = Undefined(); + argv[0] = NanUndefined(); - node::MakeCallback( Context::GetCurrent()->Global(), - commitBaton->cb, 1, argv ); + NanMakeCallback( NanGetCurrentContext()->Global(), + NanNew(commitBaton->cb), 1, argv ); if(tc.HasCaught()) { node::FatalException(tc); @@ -1625,15 +1615,15 @@ void Connection::Async_AfterCommit (uv_work_t *req) PARAMETERS: Arguments - Callback */ -Handle Connection::Rollback (const Arguments& args) +NAN_METHOD(Connection::Rollback) { - HandleScope scope; + NanScope(); Local callback; Connection *connection; NJS_GET_CALLBACK ( callback, args ); eBaton* rollbackBaton = new eBaton; - rollbackBaton->cb = Persistent::New( callback ); + NanAssignPersistent( rollbackBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( rollbackBaton->error, args, 1, 1, exitRollback ); connection = ObjectWrap::Unwrap(args.This()); @@ -1647,7 +1637,7 @@ Handle Connection::Rollback (const Arguments& args) rollbackBaton->req.data = (void*) rollbackBaton; uv_queue_work(uv_default_loop(), &rollbackBaton->req, Async_Rollback, (uv_after_work_cb)Async_AfterRollback); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -1689,19 +1679,19 @@ void Connection::Async_Rollback (uv_work_t *req) */ void Connection::Async_AfterRollback(uv_work_t *req) { - HandleScope scope; + NanScope(); eBaton *rollbackBaton = (eBaton*)req->data; v8::TryCatch tc; Handle argv[1]; if(!(rollbackBaton->error).empty()) - argv[0] = v8::Exception::Error(String::New((rollbackBaton->error).c_str())); + argv[0] = v8::Exception::Error(NanNew((rollbackBaton->error).c_str())); else - argv[0] = Undefined(); + argv[0] = NanUndefined(); - node::MakeCallback( Context::GetCurrent()->Global(), - rollbackBaton->cb, 1, argv ); + NanMakeCallback( NanGetCurrentContext()->Global(), + NanNew(rollbackBaton->cb), 1, argv ); if(tc.HasCaught()) { node::FatalException(tc); @@ -1717,15 +1707,15 @@ void Connection::Async_AfterRollback(uv_work_t *req) PARAMETERS: Arguments - Callback */ -Handle Connection::Break (const Arguments& args) +NAN_METHOD(Connection::Break) { - HandleScope scope; + NanScope(); Local callback; Connection *connection; NJS_GET_CALLBACK ( callback, args ); eBaton* breakBaton = new eBaton; - breakBaton->cb = Persistent::New( callback ); + NanAssignPersistent( breakBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( breakBaton->error, args, 1, 1, exitBreak ); connection = ObjectWrap::Unwrap(args.This()); @@ -1741,7 +1731,7 @@ Handle Connection::Break (const Arguments& args) uv_queue_work(uv_default_loop(), &breakBaton->req, Async_Break, (uv_after_work_cb)Async_AfterBreak); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -1784,18 +1774,18 @@ void Connection::Async_Break(uv_work_t *req) */ void Connection::Async_AfterBreak (uv_work_t *req) { - HandleScope scope; + NanScope(); eBaton *breakBaton = (eBaton*)req->data; v8::TryCatch tc; Handle argv[1]; - if(!(breakBaton->error).empty()) - argv[0] = v8::Exception::Error(String::New((breakBaton->error).c_str())); + if(!(breakBaton->error).empty()) + argv[0] = v8::Exception::Error(NanNew((breakBaton->error).c_str())); else - argv[0] = Undefined(); - node::MakeCallback( Context::GetCurrent()->Global(), - breakBaton->cb, 1, argv ); + argv[0] = NanUndefined(); + NanMakeCallback( NanGetCurrentContext()->Global(), + NanNew(breakBaton->cb), 1, argv ); if(tc.HasCaught()) { node::FatalException(tc); @@ -1821,7 +1811,7 @@ void Connection::Async_AfterBreak (uv_work_t *req) */ void Connection::v8Date2OraDate ( Handle val, Bind *bind) { - HandleScope scope; + NanScope(); Handle date = val.As(); // Expects to be of v8::Date type // Get the number of seconds from 1970-1-1 0:0:0 diff --git a/src/njs/src/njsConnection.h b/src/njs/src/njsConnection.h index 511aeaf1..9239d304 100644 --- a/src/njs/src/njsConnection.h +++ b/src/njs/src/njsConnection.h @@ -112,7 +112,7 @@ typedef struct eBaton ~eBaton () { - cb.Dispose(); + NanDisposePersistent(cb); if( !binds.empty() ) { for( unsigned int index = 0 ;index < binds.size(); index++ ) @@ -169,54 +169,45 @@ class Connection: public ObjectWrap static void Init (Handle target); private: - static Handle New (const Arguments& args); - + static NAN_METHOD(New); // Execute Method on Connection class - static Handle Execute (const Arguments& args); + static NAN_METHOD(Execute); static void Async_Execute (uv_work_t *req); static void Async_AfterExecute (uv_work_t *req); // Release Method on Connection class - static Handle Release (const Arguments& args); - static void Async_Release (uv_work_t *req); + static NAN_METHOD(Release); + static void Async_Release(uv_work_t *req); static void Async_AfterRelease (uv_work_t *req); // Commit Method on Connection class - static Handle Commit (const Arguments& args); + static NAN_METHOD(Commit); static void Async_Commit (uv_work_t *req); static void Async_AfterCommit (uv_work_t *req); // Rollback Method on Connection class - static Handle Rollback (const Arguments& args); + static NAN_METHOD(Rollback); static void Async_Rollback (uv_work_t *req); static void Async_AfterRollback (uv_work_t *req); // BreakMethod on Connection class - static Handle Break (const Arguments& args); - static void Async_Break (uv_work_t *req); + static NAN_METHOD(Break); + static void Async_Break(uv_work_t *req); static void Async_AfterBreak (uv_work_t *req); // Define Getter Accessors to properties - static Handle GetStmtCacheSize (Local property, - const AccessorInfo& info); - static Handle GetClientId (Local property, - const AccessorInfo& info); - static Handle GetModule (Local property, - const AccessorInfo& info); - static Handle GetAction (Local property, - const AccessorInfo& info); + static NAN_PROPERTY_GETTER(GetStmtCacheSize); + static NAN_PROPERTY_GETTER(GetClientId); + static NAN_PROPERTY_GETTER(GetModule); + static NAN_PROPERTY_GETTER(GetAction); // Define Setter Accessors to properties - static void SetStmtCacheSize (Local property,Local value, - const AccessorInfo& info); - static void SetClientId (Local property,Local value, - const AccessorInfo& info); - static void SetModule (Local property,Local value, - const AccessorInfo& info); - static void SetAction (Local property,Local value, - const AccessorInfo& info); - - static void connectionPropertyException(const AccessorInfo& info, + static NAN_SETTER(SetStmtCacheSize); + static NAN_SETTER(SetClientId); + static NAN_SETTER(SetModule); + static NAN_SETTER(SetAction); + + static void connectionPropertyException(Connection* njsConn, NJSErrorType errType, string property); @@ -226,13 +217,13 @@ class Connection: public ObjectWrap static void PrepareAndBind (eBaton* executeBaton); static void GetDefines (eBaton* executeBaton); - static void ProcessBinds (const Arguments& args, unsigned int index, + static void ProcessBinds (_NAN_METHOD_ARGS, unsigned int index, eBaton* executeBaton); - static void ProcessOptions (const Arguments& args, unsigned int index, + static void ProcessOptions (_NAN_METHOD_ARGS, unsigned int index, eBaton* executeBaton); - static void ProcessCallback (const Arguments& args, unsigned int index, + static void ProcessCallback (_NAN_METHOD_ARGS, unsigned int index, eBaton* executeBaton); - static void GetExecuteBaton (const Arguments& args, eBaton* executeBaton); + static void GetExecuteBaton (_NAN_METHOD_ARGS, eBaton* executeBaton); static void GetOptions (Handle options, eBaton* executeBaton); static void GetBinds (Handle bindobj, eBaton* executeBaton); static void GetBinds (Handle bindarray, eBaton* executeBaton); @@ -242,23 +233,21 @@ class Connection: public ObjectWrap eBaton* executeBaton, BindType bindType); static void GetOutBindParams (unsigned short dataType, Bind* bind, eBaton* executeBaton); - static Handle GetOutBinds (eBaton* executeBaton); - static Handle GetOutBindArray ( std::vector &binds, - unsigned int outCount, - bool bDMLReturn = false, - unsigned long rowcount = 1); - static Handle GetOutBindObject (std::vector &binds, - bool bDMLReturn = false, - unsigned long rowcount = 1); - static Handle GetRows (eBaton* executeBaton); - static Handle GetMetaData (std::string* columnNames, - unsigned int numCols); - static Handle GetArrayValue ( Bind *bind, unsigned long count ); - - static Handle GetValue (short ind, unsigned short type, void* val, - DPI_BUFLEN_TYPE len, - DPI_SZ_TYPE maxSize = -1); - + static v8::Handle GetOutBinds (eBaton* executeBaton); + static v8::Handle GetOutBindArray ( std::vector &binds, + unsigned int outCount, + bool bDMLReturn = false, + unsigned long rowcount = 1); + static v8::Handle GetOutBindObject (std::vector &binds, + bool bDMLReturn = false, + unsigned long rowcount = 1); + static v8::Handle GetRows (eBaton* executeBaton); + static v8::Handle GetMetaData (std::string* columnNames, + unsigned int numCols); + static v8::Handle GetArrayValue (Bind *bind, unsigned long count); + static v8::Handle GetValue (short ind, unsigned short type, void* val, + DPI_BUFLEN_TYPE len, + DPI_SZ_TYPE maxSize = -1); static void UpdateDateValue ( eBaton *executeBaton ); static void v8Date2OraDate ( v8::Handle, Bind *bind); diff --git a/src/njs/src/njsOracle.cpp b/src/njs/src/njsOracle.cpp index 31ac01c1..1f94746f 100644 --- a/src/njs/src/njsOracle.cpp +++ b/src/njs/src/njsOracle.cpp @@ -81,63 +81,63 @@ Oracledb::~Oracledb() */ void Oracledb::Init(Handle target) { - HandleScope scope; - - Local temp = FunctionTemplate::New(New); - oracledbTemplate_s = Persistent::New(temp); - oracledbTemplate_s->InstanceTemplate()->SetInternalFieldCount(1); - oracledbTemplate_s->SetClassName(String::New("Oracledb")); - - NODE_SET_PROTOTYPE_METHOD(oracledbTemplate_s, "getConnection", GetConnection); - NODE_SET_PROTOTYPE_METHOD(oracledbTemplate_s, "createPool", CreatePool); - - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolMax"), - Oracledb::GetPoolMax, - Oracledb::SetPoolMax ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolMin"), - Oracledb::GetPoolMin, - Oracledb::SetPoolMin ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolIncrement"), - Oracledb::GetPoolIncrement, - Oracledb::SetPoolIncrement ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolTimeout"), - Oracledb::GetPoolTimeout, - Oracledb::SetPoolTimeout ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("stmtCacheSize"), - Oracledb::GetStmtCacheSize, - Oracledb::SetStmtCacheSize ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("autoCommit"), - Oracledb::GetAutoCommit, - Oracledb::SetAutoCommit ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("maxRows"), - Oracledb::GetMaxRows, - Oracledb::SetMaxRows ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("outFormat"), - Oracledb::GetOutFormat, - Oracledb::SetOutFormat ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("version"), - Oracledb::GetVersion, - Oracledb::SetVersion ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("connectionClass"), - Oracledb::GetConnectionClass, - Oracledb::SetConnectionClass ); - oracledbTemplate_s->InstanceTemplate()->SetAccessor( - String::New("externalAuth"), - Oracledb::GetExternalAuth, - Oracledb::SetExternalAuth ); - - - target->Set(String::New("Oracledb"),oracledbTemplate_s->GetFunction()); + NanScope(); + + Local temp = NanNew(New); + //Local temp = NanNew(New); + temp->InstanceTemplate()->SetInternalFieldCount(1); + temp->SetClassName(NanNew("Oracledb")); + + NODE_SET_PROTOTYPE_METHOD(temp, "getConnection", GetConnection); + NODE_SET_PROTOTYPE_METHOD(temp, "createPool", CreatePool); + + temp->InstanceTemplate()->SetAccessor( + NanNew("poolMax"), + Oracledb::GetPoolMax, + Oracledb::SetPoolMax ); + temp->InstanceTemplate()->SetAccessor( + NanNew("poolMin"), + Oracledb::GetPoolMin, + Oracledb::SetPoolMin ); + temp->InstanceTemplate()->SetAccessor( + NanNew("poolIncrement"), + Oracledb::GetPoolIncrement, + Oracledb::SetPoolIncrement ); + temp->InstanceTemplate()->SetAccessor( + NanNew("poolTimeout"), + Oracledb::GetPoolTimeout, + Oracledb::SetPoolTimeout ); + temp->InstanceTemplate()->SetAccessor( + NanNew("stmtCacheSize"), + Oracledb::GetStmtCacheSize, + Oracledb::SetStmtCacheSize ); + temp->InstanceTemplate()->SetAccessor( + NanNew("autoCommit"), + Oracledb::GetAutoCommit, + Oracledb::SetAutoCommit ); + temp->InstanceTemplate()->SetAccessor( + NanNew("maxRows"), + Oracledb::GetMaxRows, + Oracledb::SetMaxRows ); + temp->InstanceTemplate()->SetAccessor( + NanNew("outFormat"), + Oracledb::GetOutFormat, + Oracledb::SetOutFormat ); + temp->InstanceTemplate()->SetAccessor( + NanNew("version"), + Oracledb::GetVersion, + Oracledb::SetVersion ); + temp->InstanceTemplate()->SetAccessor( + NanNew("connectionClass"), + Oracledb::GetConnectionClass, + Oracledb::SetConnectionClass ); + temp->InstanceTemplate()->SetAccessor( + NanNew("externalAuth"), + Oracledb::GetExternalAuth, + Oracledb::SetExternalAuth ); + + NanAssignPersistent( oracledbTemplate_s, temp); + target->Set(NanNew("Oracledb"),temp->GetFunction()); } /*****************************************************************************/ @@ -146,14 +146,14 @@ void Oracledb::Init(Handle target) Invoked when new of oracledb is called from JS */ -Handle Oracledb::New(const Arguments& args) +NAN_METHOD(Oracledb::New) { - HandleScope scope; + NanScope(); Oracledb *oracledb = new Oracledb(); oracledb->Wrap(args.This()); - return args.This(); + NanReturnValue(args.This()); } /*****************************************************************************/ @@ -161,13 +161,12 @@ Handle Oracledb::New(const Arguments& args) DESCRIPTION Get Accessor of poolMin Property */ -Handle Oracledb::GetPoolMin ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetPoolMin) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->poolMin_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->poolMin_); + NanReturnValue(value); } /*****************************************************************************/ @@ -175,11 +174,10 @@ Handle Oracledb::GetPoolMin ( Local property, DESCRIPTION Set Accessor of poolMin Property */ -void Oracledb::SetPoolMin ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetPoolMin) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->poolMin_, value, "poolMin"); } @@ -188,13 +186,12 @@ void Oracledb::SetPoolMin ( Local property, Local value, DESCRIPTION Get Accessor of poolMax Property */ -Handle Oracledb::GetPoolMax ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetPoolMax) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->poolMax_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->poolMax_); + NanReturnValue(value); } /*****************************************************************************/ @@ -202,11 +199,10 @@ Handle Oracledb::GetPoolMax ( Local property, DESCRIPTION Set Accessor of poolMax Property */ -void Oracledb::SetPoolMax ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetPoolMax) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->poolMax_, value, "poolMax"); } @@ -215,13 +211,12 @@ void Oracledb::SetPoolMax ( Local property, Local value, DESCRIPTION Get Accessor of poolIncrement Property */ -Handle Oracledb::GetPoolIncrement ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetPoolIncrement) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->poolIncrement_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->poolIncrement_); + NanReturnValue(value); } /*****************************************************************************/ @@ -229,11 +224,10 @@ Handle Oracledb::GetPoolIncrement ( Local property, DESCRIPTION Set Accessor of poolIncrement Property */ -void Oracledb::SetPoolIncrement ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetPoolIncrement) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->poolIncrement_, value, "poolIncrement"); } @@ -242,13 +236,12 @@ void Oracledb::SetPoolIncrement ( Local property, Local value, DESCRIPTION Get Accessor of poolTimeout Property */ -Handle Oracledb::GetPoolTimeout ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetPoolTimeout) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->poolTimeout_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->poolTimeout_); + NanReturnValue(value); } /*****************************************************************************/ @@ -256,11 +249,10 @@ Handle Oracledb::GetPoolTimeout ( Local property, DESCRIPTION Set Accessor of poolTimeout Property */ -void Oracledb::SetPoolTimeout ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetPoolTimeout) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->poolTimeout_ , value, "poolTimeout"); } @@ -269,13 +261,12 @@ void Oracledb::SetPoolTimeout ( Local property, Local value, DESCRIPTION Get Accessor of maxRows property */ -Handle Oracledb::GetMaxRows ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetMaxRows) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->maxRows_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->maxRows_); + NanReturnValue(value); } /*****************************************************************************/ @@ -283,11 +274,10 @@ Handle Oracledb::GetMaxRows ( Local property, DESCRIPTION Set Accessor of maxRows property */ -void Oracledb::SetMaxRows ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetMaxRows) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->maxRows_, value, "maxRows"); } @@ -296,13 +286,12 @@ void Oracledb::SetMaxRows ( Local property, Local value, DESCRIPTION Get Accessor of outFormat property */ -Handle Oracledb::GetOutFormat ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetOutFormat) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Handle value = v8::Integer::New(oracledb->outFormat_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Handle value = NanNew(oracledb->outFormat_); + NanReturnValue(value); } /*****************************************************************************/ @@ -310,11 +299,10 @@ Handle Oracledb::GetOutFormat ( Local property, DESCRIPTION Set Accessor of outFormat property */ -void Oracledb::SetOutFormat ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetOutFormat) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->outFormat_, value, "outFormat"); } @@ -323,13 +311,12 @@ void Oracledb::SetOutFormat ( Local property, Local value, DESCRIPTION Get Accessor of stmtCacheSize property */ -Handle Oracledb::GetStmtCacheSize ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetStmtCacheSize) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Local value = v8::Integer::New(oracledb->stmtCacheSize_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Local value = NanNew(oracledb->stmtCacheSize_); + NanReturnValue(value); } /*****************************************************************************/ @@ -337,11 +324,10 @@ Handle Oracledb::GetStmtCacheSize ( Local property, DESCRIPTION Set Accessor of stmtCacheSize property */ -void Oracledb::SetStmtCacheSize ( Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Oracledb::SetStmtCacheSize) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); NJS_SET_PROP_UINT(oracledb->stmtCacheSize_, value, "stmtCacheSize"); } @@ -350,14 +336,12 @@ void Oracledb::SetStmtCacheSize ( Local property, Local value, DESCRIPTION Get Accessor of autoCommit property */ -Handle Oracledb::GetAutoCommit ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetAutoCommit) { - HandleScope scope; - - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Handle value = v8::Boolean::New(oracledb->autoCommit_); - return scope.Close(value); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Handle value = NanNew(oracledb->autoCommit_); + NanReturnValue(value); } /*****************************************************************************/ @@ -365,11 +349,10 @@ Handle Oracledb::GetAutoCommit ( Local property, DESCRIPTION Set Accessor of autoCommit property */ -void Oracledb::SetAutoCommit ( Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetAutoCommit) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); oracledb->autoCommit_ = value->ToBoolean()->Value(); } @@ -378,13 +361,12 @@ void Oracledb::SetAutoCommit ( Local property, Local value, DESCRIPTION Get Accessor of version property */ -Handle Oracledb::GetVersion ( Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetVersion) { - HandleScope scope; + NanScope(); int version = NJS_NODE_ORACLEDB_VERSION; - Local value = v8::Integer::New(version); - return scope.Close(value); + Local value = NanNew(version); + NanReturnValue(value); } /*****************************************************************************/ @@ -392,10 +374,9 @@ Handle Oracledb::GetVersion ( Local property, DESCRIPTION Set Accessor of version property */ -void Oracledb::SetVersion ( Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Oracledb::SetVersion) { - HandleScope scope; + NanScope(); std::string msg; msg = NJSMessages::getErrorMsg(errReadOnly, "version"); NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length()); @@ -407,15 +388,14 @@ void Oracledb::SetVersion ( Local property, Local value, DESCRIPTION Get Accessor of connectionClass property */ -Handle Oracledb::GetConnectionClass ( Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Oracledb::GetConnectionClass) { - HandleScope scope; + NanScope(); - Oracledb *oracledb = ObjectWrap::Unwrap(info.Holder()); - Handle value = v8::String::New (oracledb->connClass_.c_str(), + Oracledb *oracledb = ObjectWrap::Unwrap(args.Holder()); + Handle value = NanNew(oracledb->connClass_.c_str(), (int)oracledb->connClass_.length ()); - return scope.Close(value); + NanReturnValue(value); } @@ -424,12 +404,11 @@ Handle Oracledb::GetConnectionClass ( Local property, DESCRIPTION Set Accessor of connectionClass property */ -void Oracledb::SetConnectionClass (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Oracledb::SetConnectionClass) { - HandleScope scope; + NanScope(); - Oracledb *oracledb = ObjectWrap::Unwrap(info.Holder()); + Oracledb *oracledb = ObjectWrap::Unwrap(args.Holder()); v8::String::Utf8Value utfstr ( value->ToString () ); oracledb->connClass_ = std::string ( *utfstr, utfstr.length() ); @@ -441,14 +420,14 @@ void Oracledb::SetConnectionClass (Local property, Local value, DESCRIPTION Get Accessor of externalAuth property */ -Handle Oracledb::GetExternalAuth(Local property, - const AccessorInfo& info ) +NAN_PROPERTY_GETTER(Oracledb::GetExternalAuth) { - HandleScope scope; + NanScope(); + + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); + Handle value = NanNew(oracledb->externalAuth_); - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); - Handle value = v8::Boolean::New(oracledb->externalAuth_); - return scope.Close(value); + NanReturnValue(value); } @@ -457,11 +436,10 @@ Handle Oracledb::GetExternalAuth(Local property, DESCRIPTION Set Accessor of externalAuth property */ -void Oracledb::SetExternalAuth(Local property, Local value, - const AccessorInfo& info ) +NAN_SETTER(Oracledb::SetExternalAuth) { - HandleScope scope; - Oracledb* oracledb = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Oracledb* oracledb = ObjectWrap::Unwrap(args.Holder()); oracledb->externalAuth_ = value->ToBoolean()->Value(); } @@ -475,9 +453,9 @@ void Oracledb::SetExternalAuth(Local property, Local value, Arguments - Connection attributes as JSON object, Callback */ -Handle Oracledb::GetConnection(const Arguments& args) +NAN_METHOD(Oracledb::GetConnection) { - HandleScope scope; + NanScope(); Local callback; Local connProps; @@ -485,7 +463,7 @@ Handle Oracledb::GetConnection(const Arguments& args) Oracledb* oracledb = ObjectWrap::Unwrap ( args.This() ); connectionBaton *connBaton = new connectionBaton (); - connBaton->cb = Persistent::New( callback ); + NanAssignPersistent(connBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( connBaton->error, args, 2, 2, exitGetConnection ); NJS_GET_ARG_V8OBJECT ( connProps, connBaton->error, args, 0, @@ -519,7 +497,7 @@ exitGetConnection : // baton, the worker thread anyway returns uv_queue_work( uv_default_loop(), &connBaton->req, Async_GetConnection, (uv_after_work_cb) Async_AfterGetConnection ); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -571,29 +549,29 @@ void Oracledb::Async_GetConnection (uv_work_t *req) */ void Oracledb::Async_AfterGetConnection (uv_work_t *req) { - HandleScope scope; + NanScope(); connectionBaton *connBaton = (connectionBaton*)req->data; v8::TryCatch tc; Handle argv[2]; if( !(connBaton->error).empty() ) { - argv[0] = v8::Exception::Error(String::New( (connBaton->error).c_str() )); - argv[1] = Null(); - } + argv[0] = v8::Exception::Error(NanNew( (connBaton->error).c_str() )); + argv[1] = NanNull(); + } else { - argv[0] = Undefined(); - Handle connection = Connection::connectionTemplate_s-> - GetFunction()-> NewInstance(); + argv[0] = NanUndefined(); + Local lft = NanNew(Connection::connectionTemplate_s); + Handle connection = lft->GetFunction()-> NewInstance(); (ObjectWrap::Unwrap (connection))-> setConnection( connBaton->dpiconn, connBaton->oracledb ); argv[1] = connection; } - Local callback = Local::New(connBaton->cb); + Local callback = NanNew(connBaton->cb); delete connBaton; - node::MakeCallback( Context::GetCurrent()->Global(), + NanMakeCallback( NanGetCurrentContext()->Global(), callback, 2, argv ); if(tc.HasCaught()) node::FatalException(tc); @@ -608,9 +586,9 @@ void Oracledb::Async_AfterGetConnection (uv_work_t *req) Arguments - Pool attributes as JSON object, Callback */ -Handle Oracledb::CreatePool (const Arguments &args) +NAN_METHOD(Oracledb::CreatePool) { - HandleScope scope ; + NanScope(); Local callback; Local poolProps; @@ -618,7 +596,8 @@ Handle Oracledb::CreatePool (const Arguments &args) Oracledb* oracledb = ObjectWrap::Unwrap ( args.This() ); connectionBaton *poolBaton = new connectionBaton (); - poolBaton->cb = Persistent::New( callback ); + + NanAssignPersistent( poolBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( poolBaton->error, args, 2, 2, exitCreatePool ); NJS_GET_ARG_V8OBJECT ( poolProps, poolBaton->error, args, 0, @@ -661,7 +640,7 @@ Handle Oracledb::CreatePool (const Arguments &args) Async_CreatePool, (uv_after_work_cb) Async_AfterCreatePool); - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -715,7 +694,7 @@ void Oracledb::Async_CreatePool (uv_work_t *req) */ void Oracledb::Async_AfterCreatePool (uv_work_t *req) { - HandleScope scope ; + NanScope() ; connectionBaton *poolBaton = (connectionBaton *)req->data; v8::TryCatch tc; @@ -723,13 +702,13 @@ void Oracledb::Async_AfterCreatePool (uv_work_t *req) if (!poolBaton->error.empty()) { - argv[0] = v8::Exception::Error(String::New(( poolBaton->error).c_str() )); - argv[1] = Undefined(); + argv[0] = v8::Exception::Error(NanNew(( poolBaton->error).c_str() )); + argv[1] = NanUndefined(); } else { - argv[0] = Undefined () ; - Handle njsPool = Pool::poolTemplate_s-> + argv[0] = NanUndefined (); + Handle njsPool = NanNew(Pool::poolTemplate_s)-> GetFunction() ->NewInstance(); (ObjectWrap::Unwrap (njsPool))-> setPool ( poolBaton->dpipool, poolBaton->oracledb, @@ -740,9 +719,9 @@ void Oracledb::Async_AfterCreatePool (uv_work_t *req) poolBaton->stmtCacheSize ); argv[1] = njsPool; } - Local callback = Local::New(poolBaton->cb); + Local callback = NanNew(poolBaton->cb); delete poolBaton; - node::MakeCallback ( Context::GetCurrent()->Global(), + NanMakeCallback ( NanGetCurrentContext()->Global(), callback, 2, argv); if(tc.HasCaught()) { diff --git a/src/njs/src/njsOracle.h b/src/njs/src/njsOracle.h index 0ea134f0..67c86d83 100644 --- a/src/njs/src/njsOracle.h +++ b/src/njs/src/njsOracle.h @@ -28,6 +28,8 @@ #include #include +#include "nan.h" + #include #include #include @@ -75,66 +77,43 @@ class Oracledb: public ObjectWrap // Define Oracledb Constructor static Persistent oracledbTemplate_s; - static Handle New(const Arguments& args); + static NAN_METHOD(New); // Get Connection Methods - static Handle GetConnection(const Arguments& args); + static NAN_METHOD(GetConnection); static void Async_GetConnection(uv_work_t *req); static void Async_AfterGetConnection(uv_work_t *req); // Create Pool Methods - static Handle CreatePool (const Arguments& args); + static NAN_METHOD(CreatePool); static void Async_CreatePool (uv_work_t *req ); static void Async_AfterCreatePool (uv_work_t *req); // Define Getter Accessors to Properties - static Handle GetPoolMin(Local property, - const AccessorInfo& info); - static Handle GetPoolMax(Local property, - const AccessorInfo& info); - static Handle GetPoolIncrement(Local property, - const AccessorInfo& info); - static Handle GetPoolTimeout(Local property, - const AccessorInfo& info); - static Handle GetStmtCacheSize(Local property, - const AccessorInfo& info); - static Handle GetAutoCommit(Local property, - const AccessorInfo& info); - static Handle GetMaxRows(Local property, - const AccessorInfo& info); - static Handle GetOutFormat(Local property, - const AccessorInfo& info); - static Handle GetVersion(Local property, - const AccessorInfo& info); - static Handle GetConnectionClass (Local property, - const AccessorInfo& info ); - static Handle GetExternalAuth(Local property, - const AccessorInfo& info); + static NAN_PROPERTY_GETTER(GetPoolMin); + static NAN_PROPERTY_GETTER(GetPoolMax); + static NAN_PROPERTY_GETTER(GetPoolIncrement); + static NAN_PROPERTY_GETTER(GetPoolTimeout); + static NAN_PROPERTY_GETTER(GetStmtCacheSize); + static NAN_PROPERTY_GETTER(GetAutoCommit); + static NAN_PROPERTY_GETTER(GetMaxRows); + static NAN_PROPERTY_GETTER(GetOutFormat); + static NAN_PROPERTY_GETTER(GetVersion); + static NAN_PROPERTY_GETTER(GetConnectionClass); + static NAN_PROPERTY_GETTER(GetExternalAuth); // Define Setter Accessors to Properties - static void SetPoolMin(Local property,Local value, - const AccessorInfo& info); - static void SetPoolMax(Local property,Local value, - const AccessorInfo& info); - static void SetPoolIncrement(Local property,Local value, - const AccessorInfo& info); - static void SetPoolTimeout(Local property,Local value, - const AccessorInfo& info); - static void SetStmtCacheSize(Local property,Local value, - const AccessorInfo& info); - static void SetAutoCommit(Local property,Local value, - const AccessorInfo& info); - static void SetMaxRows(Local property,Local value, - const AccessorInfo& info); - static void SetOutFormat(Local property,Local value, - const AccessorInfo& info); - static void SetVersion(Local property,Local value, - const AccessorInfo& info); - static void SetConnectionClass (Local property, Local value, - const AccessorInfo& info ); - static void SetExternalAuth(Local property,Local value, - const AccessorInfo& info); - + static NAN_SETTER(SetPoolMin); + static NAN_SETTER(SetPoolMax); + static NAN_SETTER(SetPoolIncrement); + static NAN_SETTER(SetPoolTimeout); + static NAN_SETTER(SetStmtCacheSize); + static NAN_SETTER(SetAutoCommit); + static NAN_SETTER(SetMaxRows); + static NAN_SETTER(SetOutFormat); + static NAN_SETTER(SetVersion); + static NAN_SETTER(SetConnectionClass); + static NAN_SETTER(SetExternalAuth); Oracledb(); ~Oracledb(); @@ -195,7 +174,7 @@ typedef struct connectionBaton ~connectionBaton() { - cb.Dispose(); + NanDisposePersistent(cb); } }connectionBaton; diff --git a/src/njs/src/njsPool.cpp b/src/njs/src/njsPool.cpp index dd83c0ee..9a667026 100644 --- a/src/njs/src/njsPool.cpp +++ b/src/njs/src/njsPool.cpp @@ -68,46 +68,46 @@ void Pool::setPool( dpi::SPool *dpipool, Oracledb* oracledb, unsigned int poolMa */ void Pool::Init(Handle target) { - HandleScope scope; + NanScope(); - Local temp = FunctionTemplate::New(New); - poolTemplate_s = Persistent::New(temp); - poolTemplate_s->InstanceTemplate()->SetInternalFieldCount(1); - poolTemplate_s->SetClassName(String::New("Pool")); + Local temp = NanNew(New); + temp->InstanceTemplate()->SetInternalFieldCount(1); + temp->SetClassName(NanNew("Pool")); - NODE_SET_PROTOTYPE_METHOD(poolTemplate_s, "terminate", Terminate); - NODE_SET_PROTOTYPE_METHOD(poolTemplate_s, "getConnection", GetConnection); + NODE_SET_PROTOTYPE_METHOD(temp, "terminate", Terminate); + NODE_SET_PROTOTYPE_METHOD(temp, "getConnection", GetConnection); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolMax"), + temp->InstanceTemplate()->SetAccessor( + NanNew("poolMax"), Pool::GetPoolMax, Pool::SetPoolMax ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolMin"), + temp->InstanceTemplate()->SetAccessor( + NanNew("poolMin"), Pool::GetPoolMin, Pool::SetPoolMin ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolIncrement"), + temp->InstanceTemplate()->SetAccessor( + NanNew("poolIncrement"), Pool::GetPoolIncrement, Pool::SetPoolIncrement ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("poolTimeout"), + temp->InstanceTemplate()->SetAccessor( + NanNew("poolTimeout"), Pool::GetPoolTimeout, Pool::SetPoolTimeout ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("connectionsOpen"), + temp->InstanceTemplate()->SetAccessor( + NanNew("connectionsOpen"), Pool::GetConnectionsOpen, Pool::SetConnectionsOpen ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("connectionsInUse"), + temp->InstanceTemplate()->SetAccessor( + NanNew("connectionsInUse"), Pool::GetConnectionsInUse, Pool::SetConnectionsInUse ); - poolTemplate_s->InstanceTemplate()->SetAccessor( - String::New("stmtCacheSize"), + temp->InstanceTemplate()->SetAccessor( + NanNew("stmtCacheSize"), Pool::GetStmtCacheSize, Pool::SetStmtCacheSize ); - target->Set(String::New("Pool"),poolTemplate_s->GetFunction()); + NanAssignPersistent( poolTemplate_s, temp ); + target->Set(NanNew("Pool"),temp->GetFunction()); } /*****************************************************************************/ @@ -116,14 +116,14 @@ void Pool::Init(Handle target) Invoked when new of pool is called from JS */ -Handle Pool::New(const Arguments& args) +NAN_METHOD(Pool::New) { - HandleScope scope; + NanScope(); Pool *njsPool = new Pool(); njsPool->Wrap(args.This()); - return args.This(); + NanReturnValue(args.This()); } /*****************************************************************************/ @@ -133,30 +133,30 @@ Handle Pool::New(const Arguments& args) */ Handle Pool::getPoolProperty(Pool* njsPool, unsigned int poolProperty) { - HandleScope scope; if(!njsPool->isValid_) { string msg = NJSMessages::getErrorMsg(errInvalidPool); NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length()); - return Undefined(); + return NanUndefined(); } else { - Local value = v8::Integer::New(poolProperty); - return scope.Close(value); + NanEscapableScope(); + Local value = NanNew(poolProperty); + return NanEscapeScope(value); } - return Undefined(); + return NanUndefined(); } + /*****************************************************************************/ /* DESCRIPTION Get Accessor of poolMin Property */ -Handle Pool::GetPoolMin (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetPoolMin) { - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); - return Pool::getPoolProperty(njsPool, njsPool->poolMin_); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); + NanReturnValue(getPoolProperty(njsPool, njsPool->poolMin_)); } /*****************************************************************************/ @@ -164,11 +164,10 @@ Handle Pool::GetPoolMin (Local property, DESCRIPTION Get Accessor of poolMax Property */ -Handle Pool::GetPoolMax (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetPoolMax) { - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); - return Pool::getPoolProperty(njsPool, njsPool->poolMax_); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); + NanReturnValue( getPoolProperty(njsPool, njsPool->poolMax_)); } /*****************************************************************************/ @@ -176,11 +175,10 @@ Handle Pool::GetPoolMax (Local property, DESCRIPTION Get Accessor of poolIncrement Property */ -Handle Pool::GetPoolIncrement (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetPoolIncrement) { - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); - return Pool::getPoolProperty(njsPool, njsPool->poolIncrement_); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); + NanReturnValue( getPoolProperty(njsPool, njsPool->poolIncrement_)); } /*****************************************************************************/ @@ -188,11 +186,10 @@ Handle Pool::GetPoolIncrement (Local property, DESCRIPTION Get Accessor of poolTimeout Property */ -Handle Pool::GetPoolTimeout (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetPoolTimeout) { - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); - return Pool::getPoolProperty(njsPool, njsPool->poolTimeout_); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); + NanReturnValue(getPoolProperty(njsPool, njsPool->poolTimeout_)); } /*****************************************************************************/ @@ -200,29 +197,28 @@ Handle Pool::GetPoolTimeout (Local property, DESCRIPTION Get Accessor of connectionsOpen Property */ -Handle Pool::GetConnectionsOpen (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetConnectionsOpen) { - HandleScope scope; - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); if(!njsPool->isValid_) { string msg = NJSMessages::getErrorMsg(errInvalidPool); NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length()); - return Undefined(); + NanReturnUndefined(); } try { - Local value = v8::Integer::New(njsPool->dpipool_-> + Local value = NanNew(njsPool->dpipool_-> connectionsOpen()); - return scope.Close(value); + NanReturnValue(value); } catch(dpi::Exception &e) { NJS_SET_EXCEPTION(e.what(), (int) strlen(e.what())); - return Undefined(); + NanReturnUndefined(); } - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -230,29 +226,28 @@ Handle Pool::GetConnectionsOpen (Local property, DESCRIPTION Get Accessor of connectionsInUse Property */ -Handle Pool::GetConnectionsInUse (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetConnectionsInUse) { - HandleScope scope; - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); + NanScope(); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); if(!njsPool->isValid_) { - string msg = NJSMessages::getErrorMsg(errInvalidPool); - NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length()); - return Undefined(); + string error = NJSMessages::getErrorMsg ( errInvalidPool ); + NJS_SET_EXCEPTION(error.c_str(), (int) error.length()); + NanReturnUndefined(); } try { - Local value = v8::Integer::New(njsPool->dpipool_-> + Local value = NanNew(njsPool->dpipool_-> connectionsInUse()); - return scope.Close(value); + NanReturnValue(value); } catch(dpi::Exception &e) { NJS_SET_EXCEPTION(e.what(), (int) strlen(e.what())); - return Undefined(); + NanReturnUndefined(); } - return Undefined(); + NanReturnUndefined(); } /*****************************************************************************/ @@ -260,11 +255,10 @@ Handle Pool::GetConnectionsInUse (Local property, DESCRIPTION Get Accessor of stmtCacheSize Property */ -Handle Pool::GetStmtCacheSize (Local property, - const AccessorInfo& info) +NAN_PROPERTY_GETTER(Pool::GetStmtCacheSize) { - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); - return Pool::getPoolProperty(njsPool, njsPool->stmtCacheSize_); + Pool* njsPool = ObjectWrap::Unwrap(args.Holder()); + NanReturnValue(getPoolProperty(njsPool, njsPool->stmtCacheSize_)); } /*****************************************************************************/ @@ -272,10 +266,9 @@ Handle Pool::GetStmtCacheSize (Local property, DESCRIPTION Abstraction to all setter accessors of properties */ -void Pool::setPoolProperty (const AccessorInfo& info, string property) +void Pool::setPoolProperty (Pool* njsPool, string property) { - HandleScope scope; - Pool* njsPool = ObjectWrap::Unwrap(info.Holder()); + NanScope(); string msg; if(!njsPool->isValid_) msg = NJSMessages::getErrorMsg(errInvalidPool); @@ -289,10 +282,9 @@ void Pool::setPoolProperty (const AccessorInfo& info, string property) DESCRIPTION Set Accessor of poolMin Property - throws error */ -void Pool::SetPoolMin (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetPoolMin) { - setPoolProperty(info, "poolMin"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "poolMin"); } /*****************************************************************************/ @@ -300,10 +292,9 @@ void Pool::SetPoolMin (Local property, Local value, DESCRIPTION Set Accessor of poolMax Property - throws error */ -void Pool::SetPoolMax (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetPoolMax) { - setPoolProperty(info, "poolMax"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "poolMax"); } /*****************************************************************************/ @@ -311,10 +302,9 @@ void Pool::SetPoolMax (Local property, Local value, DESCRIPTION Set Accessor of poolIncrement Property - throws error */ -void Pool::SetPoolIncrement (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetPoolIncrement) { - setPoolProperty(info, "poolIncrement"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "poolIncrement"); } /*****************************************************************************/ @@ -322,10 +312,9 @@ void Pool::SetPoolIncrement (Local property, Local value, DESCRIPTION Set Accessor of poolTimeout Property - throws error */ -void Pool::SetPoolTimeout (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetPoolTimeout) { - setPoolProperty(info, "poolTimeout"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "poolTimeout"); } /*****************************************************************************/ @@ -333,10 +322,9 @@ void Pool::SetPoolTimeout (Local property, Local value, DESCRIPTION Set Accessor of connectionsOpen Property - throws error */ -void Pool::SetConnectionsOpen (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetConnectionsOpen) { - setPoolProperty(info, "connectionsOpen"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "connectionsOpen"); } /*****************************************************************************/ @@ -344,10 +332,9 @@ void Pool::SetConnectionsOpen (Local property, Local value, DESCRIPTION Set Accessor of connectionsInUse Property - throws error */ -void Pool::SetConnectionsInUse (Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetConnectionsInUse) { - setPoolProperty(info, "connectionsInUse"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "connectionsInUse"); } /*****************************************************************************/ @@ -355,10 +342,9 @@ void Pool::SetConnectionsInUse (Local property, Local value, DESCRIPTION Set Accessor of stmtCacheSize Property - throws error */ -void Pool::SetStmtCacheSize(Local property, Local value, - const AccessorInfo& info) +NAN_SETTER(Pool::SetStmtCacheSize) { - setPoolProperty(info, "stmtCacheSize"); + setPoolProperty(ObjectWrap::Unwrap(args.Holder()), "stmtCacheSize"); } /*****************************************************************************/ @@ -369,16 +355,17 @@ void Pool::SetStmtCacheSize(Local property, Local value, PARAMETERS: Arguments - Callback */ -Handle Pool::GetConnection(const Arguments& args) +NAN_METHOD(Pool::GetConnection) { - HandleScope scope; + NanScope(); Local callback; NJS_GET_CALLBACK ( callback, args ); Pool *njsPool = ObjectWrap::Unwrap(args.This()); + poolBaton *connBaton = new poolBaton (); - connBaton->cb = Persistent::New( callback ); + NanAssignPersistent( connBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( connBaton->error, args, 1, 1, exitGetConnection ); @@ -396,8 +383,8 @@ Handle Pool::GetConnection(const Arguments& args) uv_queue_work(uv_default_loop(), &connBaton->req, Async_GetConnection, (uv_after_work_cb)Async_AfterGetConnection); - return Undefined(); -} + NanReturnUndefined(); +} /*****************************************************************************/ /* @@ -442,27 +429,28 @@ void Pool::Async_GetConnection(uv_work_t *req) */ void Pool::Async_AfterGetConnection(uv_work_t *req) { - HandleScope scope; + NanScope(); poolBaton *connBaton = (poolBaton*)req->data; + v8::TryCatch tc; Handle argv[2]; if(!(connBaton->error).empty()) { - argv[0] = v8::Exception::Error(String::New((connBaton->error).c_str())); - argv[1] = Undefined(); - } + argv[0] = v8::Exception::Error(NanNew((connBaton->error).c_str())); + argv[1] = NanUndefined(); + } else { - argv[0] = Undefined(); - Handle connection = Connection::connectionTemplate_s-> - GetFunction()-> NewInstance(); + argv[0] = NanUndefined(); + Local lft = NanNew(Connection::connectionTemplate_s); + Handle connection = lft->GetFunction()-> NewInstance(); (ObjectWrap::Unwrap (connection))-> setConnection( connBaton->dpiconn, connBaton->njspool->oracledb_ ); argv[1] = connection; } - node::MakeCallback(Context::GetCurrent()->Global(), - connBaton->cb, 2, argv); + NanMakeCallback(NanGetCurrentContext()->Global(), + NanNew(connBaton->cb), 2, argv); if(tc.HasCaught()) { node::FatalException(tc); @@ -478,16 +466,17 @@ void Pool::Async_AfterGetConnection(uv_work_t *req) PARAMETERS: Arguments - Callback */ -Handle Pool::Terminate(const Arguments& args ) +NAN_METHOD(Pool::Terminate) { - HandleScope scope; + NanScope(); Local callback; NJS_GET_CALLBACK ( callback, args ); Pool *njsPool = ObjectWrap::Unwrap(args.This()); + poolBaton *terminateBaton = new poolBaton (); - terminateBaton->cb = Persistent::New( callback ); + NanAssignPersistent( terminateBaton->cb, callback ); NJS_CHECK_NUMBER_OF_ARGS ( terminateBaton->error, args, 1, 1, exitTerminate ); @@ -504,7 +493,7 @@ Handle Pool::Terminate(const Arguments& args ) uv_queue_work(uv_default_loop(), &terminateBaton->req, Async_Terminate, (uv_after_work_cb)Async_AfterTerminate); - return scope.Close(Undefined()); + NanReturnUndefined(); } /*****************************************************************************/ @@ -545,7 +534,7 @@ void Pool::Async_Terminate(uv_work_t *req) */ void Pool::Async_AfterTerminate(uv_work_t *req) { - HandleScope scope; + NanScope(); poolBaton *terminateBaton = (poolBaton*)req->data; v8::TryCatch tc; @@ -554,17 +543,17 @@ void Pool::Async_AfterTerminate(uv_work_t *req) if(!(terminateBaton->error).empty()) { - argv[0] = v8::Exception::Error(String::New((terminateBaton->error).c_str())); + argv[0] = v8::Exception::Error(NanNew((terminateBaton->error).c_str())); } else { - argv[0] = Undefined(); + argv[0] = NanUndefined(); // pool is not valid after terminate succeeds. terminateBaton-> njspool-> isValid_ = false; } - node::MakeCallback( Context::GetCurrent()->Global(), - terminateBaton->cb, 1, argv ); + NanMakeCallback( NanGetCurrentContext()->Global(), + NanNew(terminateBaton->cb), 1, argv ); if(tc.HasCaught()) { node::FatalException(tc); diff --git a/src/njs/src/njsPool.h b/src/njs/src/njsPool.h index 5021968c..cbcc9e15 100644 --- a/src/njs/src/njsPool.h +++ b/src/njs/src/njsPool.h @@ -28,6 +28,7 @@ #include "dpi.h" #include +#include "nan.h" #include using namespace v8; @@ -48,52 +49,39 @@ class Pool: public ObjectWrap { private: - static Handle New(const Arguments& args); + static NAN_METHOD(New); - // Get Connection Methods - static Handle GetConnection(const Arguments& args); + // Get Connection Methods + static NAN_METHOD(GetConnection); static void Async_GetConnection(uv_work_t* req); static void Async_AfterGetConnection(uv_work_t* req); // Terminate Methods - static Handle Terminate(const Arguments& args); + static NAN_METHOD(Terminate); static void Async_Terminate(uv_work_t* req); static void Async_AfterTerminate(uv_work_t* req); // Define Getter Accessors to properties - static Handle GetPoolMax (Local property, - const AccessorInfo& info); - static Handle GetPoolMin (Local property, - const AccessorInfo& info); - static Handle GetPoolIncrement (Local property, - const AccessorInfo& info); - static Handle GetPoolTimeout (Local property, - const AccessorInfo& info); - static Handle GetConnectionsOpen (Local property, - const AccessorInfo& info); - static Handle GetConnectionsInUse (Local property, - const AccessorInfo& info); - static Handle GetStmtCacheSize (Local property, - const AccessorInfo& info); + static NAN_PROPERTY_GETTER(GetPoolMax); + static NAN_PROPERTY_GETTER(GetPoolMin); + static NAN_PROPERTY_GETTER(GetPoolIncrement); + static NAN_PROPERTY_GETTER(GetPoolTimeout); + static NAN_PROPERTY_GETTER(GetConnectionsOpen); + static NAN_PROPERTY_GETTER(GetConnectionsInUse); + static NAN_PROPERTY_GETTER(GetStmtCacheSize); + static Handle getPoolProperty(Pool* njsPool, unsigned int poolProperty); // Define Setter Accessors to properties - static void SetPoolMax (Local property,Local value, - const AccessorInfo& info); - static void SetPoolMin (Local property,Local value, - const AccessorInfo& info); - static void SetPoolIncrement (Local property,Local value, - const AccessorInfo& info); - static void SetPoolTimeout (Local property,Local value, - const AccessorInfo& info); - static void SetConnectionsOpen (Local property,Local value, - const AccessorInfo& info); - static void SetConnectionsInUse (Local property,Local value, - const AccessorInfo& info); - static void SetStmtCacheSize (Local property,Local value, - const AccessorInfo& info); - - static void setPoolProperty(const AccessorInfo& info, string property); + static NAN_SETTER(SetPoolMax); + static NAN_SETTER(SetPoolMin); + static NAN_SETTER(SetPoolIncrement); + static NAN_SETTER(SetPoolTimeout); + static NAN_SETTER(SetConnectionsOpen); + static NAN_SETTER(SetConnectionsInUse); + static NAN_SETTER(SetStmtCacheSize); + + static void setPoolProperty(Pool* njsPool, string property); Pool(); ~Pool(); @@ -124,7 +112,7 @@ typedef struct poolBaton ~poolBaton() { - cb.Dispose(); + NanDisposePersistent(cb); } }poolBaton; diff --git a/src/njs/src/njsUtils.h b/src/njs/src/njsUtils.h index f04135e1..e3827d80 100644 --- a/src/njs/src/njsUtils.h +++ b/src/njs/src/njsUtils.h @@ -26,6 +26,10 @@ #ifndef __NJSUTILS_H__ #define __NJSUTILS_H__ +#include + +#include "nan.h" + #include "njsMessages.h" // User specified data types for binds and defines. @@ -75,7 +79,7 @@ typedef enum { \ msg = NJSMessages::getErrorMsg ( errMissingCallback ); \ NJS_SET_EXCEPTION( msg.c_str(), msg.length() ); \ - return Undefined(); \ + NanReturnUndefined(); \ } \ else \ { \ @@ -89,7 +93,7 @@ typedef enum * for the exception to be thrown. */ #define NJS_SET_EXCEPTION( str, len ) \ - ThrowException(v8::Exception::Error(String::New( str, (int) len ))); + NanThrowError(str); /* * If arguments are not in given range, set the error. @@ -157,7 +161,7 @@ typedef enum */ #define NJS_GET_STRING_FROM_JSON( val, err, obj, key, index, exitCode ) \ { \ - Local v8value = obj->Get(String::New(key)); \ + Local v8value = obj->Get(NanNew(key)); \ err.clear(); \ if( v8value->IsString() ) \ { \ @@ -182,7 +186,7 @@ typedef enum */ #define NJS_GET_UINT_FROM_JSON( val, err, obj, key, index, exitCode ) \ { \ - Local v8value = obj->Get(String::New(key)); \ + Local v8value = obj->Get(NanNew(key)); \ err.clear(); \ if( v8value->IsUint32() ) \ { \ @@ -212,7 +216,7 @@ typedef enum */ #define NJS_GET_BOOL_FROM_JSON( val, err, obj, key, index, exitCode ) \ { \ - Local v8value = obj->Get(String::New(key)); \ + Local v8value = obj->Get(NanNew(key)); \ if ( !v8value->IsUndefined () ) \ { \ val = v8value->ToBoolean()->Value(); \