Skip to content
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

Pass buffers as parameters #52

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pass buffers as parameters #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7622a48
Pass buffers as parameters
Apr 5, 2017
eb3ad7c
Add buffer parameter test
Apr 5, 2017
8c1fbe6
Make buffer parameter test node 4 compatible
Apr 5, 2017
ab8c80b
Make buffer parameter test node 4 compatible for real
Apr 5, 2017
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
100 changes: 65 additions & 35 deletions src/connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,27 @@ NAN_METHOD(Connection::ExecParams) {
v8::Local<v8::Array> jsParams = v8::Local<v8::Array>::Cast(info[1]);

int numberOfParams = jsParams->Length();
char **parameters = NewCStringArray(jsParams);

char** parameters = new char*[numberOfParams];
int* lengths = new int[numberOfParams];
int* formats = new int[numberOfParams];

ConvertParameters(jsParams, parameters, lengths, formats);

PGresult* result = PQexecParams(
self->pq,
*commandText,
numberOfParams,
NULL, //const Oid* paramTypes[],
parameters, //const char* const* paramValues[]
NULL, //const int* paramLengths[]
NULL, //const int* paramFormats[],
lengths, //const int* paramLengths[]
formats, //const int* paramFormats[],
0 //result format of text
);

DeleteCStringArray(parameters, numberOfParams);
delete[] lengths;
delete[] formats;

self->SetLastResult(result);
}
Expand Down Expand Up @@ -152,19 +159,26 @@ NAN_METHOD(Connection::ExecPrepared) {
v8::Local<v8::Array> jsParams = v8::Local<v8::Array>::Cast(info[1]);

int numberOfParams = jsParams->Length();
char** parameters = NewCStringArray(jsParams);

char** parameters = new char*[numberOfParams];
int* lengths = new int[numberOfParams];
int* formats = new int[numberOfParams];

ConvertParameters(jsParams, parameters, lengths, formats);

PGresult* result = PQexecPrepared(
self->pq,
*statementName,
numberOfParams,
parameters, //const char* const* paramValues[]
NULL, //const int* paramLengths[]
NULL, //const int* paramFormats[],
lengths, //const int* paramLengths[]
formats, //const int* paramFormats[],
0 //result format of text
);

DeleteCStringArray(parameters, numberOfParams);
delete[] lengths;
delete[] formats;

self->SetLastResult(result);
}
Expand Down Expand Up @@ -356,20 +370,27 @@ NAN_METHOD(Connection::SendQueryParams) {
v8::Local<v8::Array> jsParams = v8::Local<v8::Array>::Cast(info[1]);

int numberOfParams = jsParams->Length();
char** parameters = NewCStringArray(jsParams);

char** parameters = new char*[numberOfParams];
int* lengths = new int[numberOfParams];
int* formats = new int[numberOfParams];

ConvertParameters(jsParams, parameters, lengths, formats);

int success = PQsendQueryParams(
self->pq,
*commandText,
numberOfParams,
NULL, //const Oid* paramTypes[],
parameters, //const char* const* paramValues[]
NULL, //const int* paramLengths[]
NULL, //const int* paramFormats[],
lengths, //const int* paramLengths[]
formats, //const int* paramFormats[],
0 //result format of text
);

DeleteCStringArray(parameters, numberOfParams);
delete[] lengths;
delete[] formats;

info.GetReturnValue().Set(success == 1);
}
Expand Down Expand Up @@ -406,19 +427,25 @@ NAN_METHOD(Connection::SendQueryPrepared) {
v8::Local<v8::Array> jsParams = v8::Local<v8::Array>::Cast(info[1]);

int numberOfParams = jsParams->Length();
char** parameters = NewCStringArray(jsParams);
char** parameters = new char*[numberOfParams];
int* lengths = new int[numberOfParams];
int* formats = new int[numberOfParams];

ConvertParameters(jsParams, parameters, lengths, formats);

int success = PQsendQueryPrepared(
self->pq,
*statementName,
numberOfParams,
parameters, //const char* const* paramValues[]
NULL, //const int* paramLengths[]
NULL, //const int* paramFormats[],
lengths, //const int* paramLengths[]
formats, //const int* paramFormats[],
0 //result format of text
);

DeleteCStringArray(parameters, numberOfParams);
delete[] lengths;
delete[] formats;

info.GetReturnValue().Set(success == 1);
}
Expand Down Expand Up @@ -747,43 +774,46 @@ void Connection::SetLastResult(PGresult* result) {
lastResult = result;
}

char* Connection::NewCString(v8::Local<v8::Value> val) {
Nan::HandleScope scope;

v8::Local<v8::String> str = Nan::To<v8::String>(val).ToLocalChecked();
int len = str->Utf8Length() + 1;
char* buffer = new char[len];
str->WriteUtf8(buffer, len);
return buffer;
void Connection::DeleteCStringArray(char** array, int length) {
for(int i = 0; i < length; i++) {
delete [] array[i];
}
delete [] array;
}

char** Connection::NewCStringArray(v8::Local<v8::Array> jsParams) {
void Connection::ConvertParameters(v8::Local<v8::Array> jsParams, char** parameters, int* lengths, int* formats) {
Nan::HandleScope scope;

int numberOfParams = jsParams->Length();

char** parameters = new char*[numberOfParams];

for(int i = 0; i < numberOfParams; i++) {
v8::Local<v8::Value> val = Nan::Get(jsParams, i).ToLocalChecked();
if(val->IsNull()) {
parameters[i] = NULL;
continue;
}
//expect every other value to be a string...
//make sure aggresive type checking is done
//on the JavaScript side before calling
parameters[i] = NewCString(val);
}

return parameters;
}

void Connection::DeleteCStringArray(char** array, int length) {
for(int i = 0; i < length; i++) {
delete [] array[i];
v8::Local<v8::Object> bufferObj = val->ToObject();
if (node::Buffer::HasInstance(val)) {
int len = node::Buffer::Length(bufferObj);
lengths[i] = len;
char* buffer = new char[len];
memcpy(buffer, node::Buffer::Data(bufferObj), len);
parameters[i] = buffer;
formats[i] = 1;
} else {
//expect every other value to be a string...
//make sure aggresive type checking is done
//on the JavaScript side before calling
v8::Local<v8::String> str = Nan::To<v8::String>(val).ToLocalChecked();
int len = str->Utf8Length() + 1;
lengths[i] = str->Utf8Length();
char* buffer = new char[len];
str->WriteUtf8(buffer, len);
parameters[i] = buffer;
formats[i] = 0;
}
}
delete [] array;
}

void Connection::Emit(const char* message) {
Expand Down
3 changes: 1 addition & 2 deletions src/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ class Connection : public Nan::ObjectWrap {
void WriteStop();
void ClearLastResult();
void SetLastResult(PGresult* result);
static char* NewCString(v8::Local<v8::Value> val);
static char** NewCStringArray(v8::Local<v8::Array> jsParams);
static void DeleteCStringArray(char** array, int length);
static void ConvertParameters(v8::Local<v8::Array> jsParams, char** parameters, int* lengths, int* formats);
void Emit(const char* message);
};

Expand Down
9 changes: 9 additions & 0 deletions test/sync-parameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,13 @@ describe('sync query with parameters', function() {
this.pq.execParams(queryText, ['Barkley', 4]);
assert.equal(this.pq.resultErrorMessage(), '');
});

it('works with buffer parameter', function() {
var queryText = 'SELECT $1::bytea as bin';
var octets = [0x00, 0x2a, 0x80, 0xff];
var buffer = (Number(process.version.match(/^v(\d+)/)[1]) <= 4) ? new Buffer(octets) : Buffer.from(octets);
this.pq.execParams(queryText, [buffer]);
assert.strictEqual(this.pq.ntuples(), 1);
assert.strictEqual(this.pq.getvalue(0, 0), '\\x002a80ff');
});
});