Improve error message accuracy of native SendQuery

benmonty · brianc · commit a9635a3d8d57 · 2012-08-07T08:38:57.000-05:00
* add private method const char *GetLastError() to src/binding.cc
* add var const char *lastErrorMessage to SendQuery in src/binding.cc
* throw result of PQErrorMessage inside SendQuery

This commit replaces the static/vague error message "PQsendQuery
returned error code" with the actual message text of the error.
The method GetLastError() returns the text of PQErrorMessage.
GetLastError is called from within SendQuery to retrieve the message.
diff --git a/src/binding.cc b/src/binding.cc
@@ -129,6 +129,7 @@ class Connection : public ObjectWrap {
   {
     HandleScope scope;
     Connection *self = ObjectWrap::Unwrap<Connection>(args.This());
+    const char *lastErrorMessage;
     if(!args[0]->IsString()) {
       THROW("First parameter must be a string query");
     }
@@ -137,7 +138,8 @@ class Connection : public ObjectWrap {
     int result = self->Send(queryText);
     free(queryText);
     if(result == 0) {
-      THROW("PQsendQuery returned error code");
+      lastErrorMessage = self->GetLastError();                                                                                                                                                                       
+      THROW(lastErrorMessage);   
     }
     //TODO should we flush before throw?
     self->Flush();
@@ -615,6 +617,11 @@ class Connection : public ObjectWrap {
   {
     EmitError(PQerrorMessage(connection_));
   }
+ 
+  const char *GetLastError()
+  {
+    return PQerrorMessage(connection_);
+  }
 
   void StopWrite()
   {

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ class Connection : public ObjectWrap {`
`129`	`129`	`{`
`130`	`130`	`HandleScope scope;`
`131`	`131`	`Connection *self = ObjectWrap::Unwrap<Connection>(args.This());`
	`132`	`+ const char *lastErrorMessage;`
`132`	`133`	`if(!args[0]->IsString()) {`
`133`	`134`	`THROW("First parameter must be a string query");`
`134`	`135`	`}`
`@@ -137,7 +138,8 @@ class Connection : public ObjectWrap {`
`137`	`138`	`int result = self->Send(queryText);`
`138`	`139`	`free(queryText);`
`139`	`140`	`if(result == 0) {`
`140`		`- THROW("PQsendQuery returned error code");`
	`141`	`+ lastErrorMessage = self->GetLastError();`
	`142`	`+ THROW(lastErrorMessage);`
`141`	`143`	`}`
`142`	`144`	`//TODO should we flush before throw?`
`143`	`145`	`self->Flush();`
`@@ -615,6 +617,11 @@ class Connection : public ObjectWrap {`
`615`	`617`	`{`
`616`	`618`	`EmitError(PQerrorMessage(connection_));`
`617`	`619`	`}`
	`620`	`+`
	`621`	`+ const char *GetLastError()`
	`622`	`+ {`
	`623`	`+ return PQerrorMessage(connection_);`
	`624`	`+ }`
`618`	`625`
`619`	`626`	`void StopWrite()`
`620`	`627`	`{`