Skip to content

Downgrade to node-v0.10.x #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonistiigi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Downgrade to node-v0.10.x #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/node_freetds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void FreeTDS::Initialize(Handle<Object> target) {
}

Handle<Value> FreeTDS::New(const Arguments& args) {
HandleScope scope(node_isolate);
HandleScope scope;
REQ_ARG(String, 0, server);
REQ_ARG(String, 1, database);

Expand All @@ -96,7 +96,7 @@ Handle<Value> FreeTDS::Version(const Arguments& args) {
* returns true if login was successful
*/
Handle<Value> FreeTDS::Login(const Arguments& args) {
HandleScope scope(node_isolate);
HandleScope scope;
FreeTDS *freetds = FreeTDS::Unwrap(args);
LOGINREC *login;

Expand All @@ -121,9 +121,6 @@ Handle<Value> FreeTDS::Login(const Arguments& args) {

DBSETLVERSION(login, DBVERSION_80);

printf("User: %s\n", *userId);
printf("Password: %s\n", *pw);

// set the application name to node-freetds to help with profiling etc
DBSETLAPP(login, "node-freetds");

Expand All @@ -146,30 +143,30 @@ Handle<Value> FreeTDS::Login(const Arguments& args) {
dbloginfree(login);

// wrap the dbconn so that we can persist it from the JS side
return True(node_isolate);
return v8::True();
}

// one arg - logout
Handle<Value> FreeTDS::Logout(const Arguments& args) {
HandleScope scope(node_isolate);
HandleScope scope;
FreeTDS *freetds = FreeTDS::Unwrap(args);

dbfreebuf(freetds->dbconn);
dbclose(freetds->dbconn);

return Undefined(node_isolate);
return v8::Undefined();
}

// TODO Logout and Cleanup should happen when the object is freed and probably should not be exposed to Javascript.
// TODO Calling dbexit here will be really confusing to freetds if it is called out of order when there is more than one dbinit or instance of FreeTDS.
Handle<Value> FreeTDS::Cleanup(const Arguments& args) {
HandleScope scope(node_isolate);
HandleScope scope;
dbexit();
return Undefined(node_isolate);
return v8::Undefined();
}

void onDataResponse(uv_work_t *req, int stat) {
HandleScope scope(node_isolate);
HandleScope scope;
FreeTDS::data_callback_t *callbackData = static_cast<FreeTDS::data_callback_t*>(req->data);

if(callbackData->response == FAIL){
Expand Down Expand Up @@ -354,7 +351,7 @@ static void waitForDataResponse(uv_work_t *req) {

// db, statement, callback
Handle<Value> FreeTDS::ExecuteStatement(const Arguments& args) {
HandleScope scope(node_isolate);
HandleScope scope;
FreeTDS *freetds = FreeTDS::Unwrap(args);

REQ_ARG(String, 0, js_statement);
Expand All @@ -374,7 +371,7 @@ Handle<Value> FreeTDS::ExecuteStatement(const Arguments& args) {
if(!asprintf(&callbackData->statement, "%s", *statement))
return ERROR("Out of memory.");;
if(js_callback->IsFunction())
callbackData->callback = Persistent<Function>::New(node_isolate, js_callback);
callbackData->callback = Persistent<Function>::New(js_callback);

if(dbsqlsend(freetds->dbconn) == FAIL) {
delete callbackData;
Expand All @@ -385,7 +382,7 @@ Handle<Value> FreeTDS::ExecuteStatement(const Arguments& args) {

uv_queue_work(uv_default_loop(), &callbackData->worker, waitForDataResponse, onDataResponse);

return Undefined(node_isolate);
return v8::Undefined();
}

NODE_MODULE(node_freetds, FreeTDS::Initialize);
4 changes: 2 additions & 2 deletions src/node_freetds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ class FreeTDS : public node::ObjectWrap {

static v8::Handle<v8::Value> getServer(Local<String> property,
const AccessorInfo& info) {
v8::HandleScope scope(node_isolate);
v8::HandleScope scope;
FreeTDS *freetds = FreeTDS::Unwrap(info);
return scope.Close(v8::String::New(freetds->server));
}

static v8::Handle<v8::Value> getDatabase(Local<String> property,
const AccessorInfo& info) {
v8::HandleScope scope(node_isolate);
v8::HandleScope scope;
FreeTDS *freetds = FreeTDS::Unwrap(info);
return scope.Close(v8::String::New(freetds->database));
}
Expand Down