archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2026-01-18 15:55:05 +00:00
Code Issues Projects Releases Wiki Activity

string based parameterized statements working

Browse Source
This commit is contained in:
bmc 2011-03-01 01:49:02 +00:00
parent 23717bf8be
commit 8c7083207a
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/binding.cc
View File

@ -1,6 +1,7 @@
#include <libpq-fe.h>
#include <node.h>
#include <node_events.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
@ -67,7 +68,6 @@ public:
}
String::Utf8Value conninfo(args[0]->ToString());
self->Connect(*conninfo);
return Undefined();
@ -83,8 +83,9 @@ public:
return ThrowException(Exception::Error(String::New("First parameter must be a string query")));
}
String::Utf8Value queryText(args[0]->ToString());
int result = self->Send(*queryText);
char* queryText = MallocCString(args[0]);
int result = self->Send(queryText);
free(queryText);
if(result == 0) {
THROW("PQsendQuery returned error code");
}
@ -107,20 +108,40 @@ public:
return ThrowException(Exception::Error(String::New("Values must be array")));
}
String::Utf8Value queryText(args[0]->ToString());
char* queryText = MallocCString(args[0]);
Local<Array> params = Local<Array>::Cast(args[1]);
int len = params->Length();
for(int i = 0; i < len; i++) {
char* *paramValues = new char*[len];
for(int i = 0; i < len; i++) {
Handle<Value> val = params->Get(i);
if(!val->IsString()) {
//TODO this leaks mem
delete [] paramValues;
return ThrowException(Exception::Error(String::New("Only string parameters supported")));
}
char* cString = MallocCString(val);
paramValues[i] = cString;
}
char **rawParams;
self->SendQueryParams(*queryText, len, rawParams);
THROW("Not implemented");
return Undefined();
int result = self->SendQueryParams(queryText, len, paramValues);
free(queryText);
for(int i = 0; i < len; i++) {
free(paramValues[i]);
}
delete [] paramValues;
if(result == 1) {
return Undefined();
}
return ThrowException(Exception::Error(String::New("Could not dispatch parameterized query")));
}
static char* MallocCString(v8::Handle<Value> v8String)
{
String::Utf8Value utf8String(v8String->ToString());
char *cString = (char *) malloc(strlen(*utf8String) + 1);
strcpy(cString, *utf8String);
return cString;
}
//v8 entry point into Connection#end

8
test/native/evented-api-tests.js
View File

@ -34,10 +34,11 @@ var setupClient = function() {
client.query("INSERT INTO boom(name) VALUES('Brian')");
return client;
}
test('multiple results', function() {
test('queued queries', function() {
var client = setupClient();
var q = client.query("SELECT * from BOOM");
var q = client.query("SELECT name FROM BOOM");
assert.emits(q, 'row', function(row) {
assert.equal(row.name, 'Aaron');
assert.emits(q, 'row', function(row) {
@ -61,14 +62,15 @@ test('multiple results', function() {
test('parameterized queries', function() {
test('with a single string param', function() {
var client = setupClient();
var q = client.query("SELECT name FROM boom WHERE name = $1", ['Brian']);
var q = client.query("SELECT * FROM boom WHERE name = $1", ['Aaron']);
assert.emits(q, 'row', function(row) {
assert.equal(row.name, 'Brian')
assert.equal(row.name, 'Aaron');
})
assert.emits(q, 'end', function() {
client.end();
});
})
test('with object config for query', function() {
var client = setupClient();
var q = client.query({