Prepared queries now work mostly as expected. :)

Aurynn Shaw · Aurynn Shaw · commit ff835890bf09 · 2010-08-24T08:15:33.000-07:00
diff --git a/demo.js b/demo.js
@@ -1,13 +1,19 @@
 var sys = require("sys");
 var pg = require("./lib/postgres-pure");
-pg.DEBUG=true;
+pg.DEBUG=0;
 
 var db = new pg.connect("pgsql://aurynn:12345@localhost:5432/akhyana");
 db.prepare("SELECT * FROM users WHERE id = $1;", function (sth) {
     sys.debug("in callback");
     sth.execute([1], function (rs) {
-        for (var i = 0; i <= rs.length; i++) {
-            sys.puts(rs[i]);
+        sys.debug("In execute");
+        for (var i = 0; i < rs.length; i++) {
+            for (var key in rs[i]) {
+                if (rs[i].hasOwnProperty(key)) {
+                    sys.puts(key +": " +rs[i][key]);
+                }
+            }
         }
+        db.end();
     });
 });
diff --git a/lib/buffer_extras.js b/lib/buffer_extras.js
@@ -98,7 +98,7 @@ Buffer.makeWriter = function makeWriter() {
     },
     byte1: function byte1(string) {
         var b = new Buffer(1); // one octet.
-        b.write(string, 'ascii', 0);
+        b.write(string, 'utf8', 0);
         data.push(b);
         return writer;
     },
diff --git a/lib/postgres-pure.js b/lib/postgres-pure.js
@@ -51,27 +51,45 @@ function encoder(header) {
 
 // http://www.postgresql.org/docs/8.3/static/protocol-message-formats.html
 var formatter = {
-  Bind: function (portal, prepared_name, args) {
+  Bind: function (portal, prepared_name, params, args) {
       var builder =  (encoder('B'))
         .push.cstring(portal)
         .push.cstring(prepared_name)
-        .push.int16(0)      // 0 format codes. We don't want to declare types.
-        .push.int16(args.length);
+        .push.int16(args.length); // declare our format codes as expected.
+      
       for (var i = 0; i < args.length; i++) {
           switch (typeof args[i]) {
               case "number":
-                builder.push.int32(4); // 4 bytes. int32.
-                builder.push.int32(args[i]);
+              case "boolean":
+              case "object":
+                builder.push.int16(1); // binary
                 break;
               case "string":
-                builder.push.int32(args[i].length);
-                builder.push.string(args[i]); // Not a cstring. Don't \0
+                builder.push.int16(0);
+                break;
+          }
+      }
+      
+      builder.push.int16(args.length);
+      for (var i = 0; i < args.length; i++) {
+          switch (typeof args[i]) {
+              case "number":
+                builder.push.int32(4) // 4 bytes. int32.
+                    .push.int32(args[i]);
+                break;
+              case "string":
+                builder.push.int32(args[i].length)
+                    .push.string(args[i]); // Not a cstring. Don't \0
                 break;
               case "boolean":
-                builder.push.int32(1); // One byte.
-                builder.push.string(args[i] ? 1 : 0);
+                builder.push.int32(1) // One byte.
+                    .push.string(args[i] ? 1 : 0);
                 break;
-          }
+              case "object":
+                if (args[i] === null) {
+                    builder.push.int32(-1);
+                }
+          };
       }
       builder.push.int16(0); // They should all use text. Don't declare return
                              // types, as we already have the types from the
@@ -193,7 +211,7 @@ function parse_response(code, buffer) {
     for (var i = 0; i < num_fields; i++) {
         data.push(reader.int32());
     }
-    args = data;
+    args = [data];
     break;
   case 'S':
     type = "ParameterStatus";
@@ -409,11 +427,11 @@ function Prepared(sql, conn, callback) {
                 if (typeof(arguments[1]) == 'function') {
                     callback = arguments[1];
                 }
-                eP = new execPrepared(portal, prepared_name, arguments[0], arguments[1]);
+                eP = new execPrepared(portal, prepared_name, q.param_description, arguments[0], q.row_description, conn, arguments[1]);
             }
         }
         else if (typeof(arguments[0]) == 'function' ) {
-            eP = new execPrepared(portal, prepared_name, [], arguments[0]);
+            eP = new execPrepared(portal, prepared_name, q.param_description, [], q.row_description, conn, arguments[0]);
             // Announcing that my slot is released in favour of this new query.
             // The connection doesn't advance the buffer, but *does* replace 
             // the current query with this one.
@@ -437,20 +455,25 @@ function Prepared(sql, conn, callback) {
 }
 Prepared.prototype = new process.EventEmitter;
 
-function execPrepared (portal, prepared, args, callback) {
+function execPrepared (portal, prepared, params, args, row_desc, conn,  callback) {
     var q = this;
+    q.row_description = row_desc;
     var results = [];
     var arr = [
         {
             type: "Execute",
             args: [portal, 0], // No limit. Get all the rows.
+        },
+        {
+            type: "Flush",
+            args: [portal, 0]
         }
     ];
     // If we have args, unshift the Bind.
     if (args instanceof Array && args.length >= 1) {
         arr.unshift({
             type: "Bind",
-            args:[portal, prepared, args],
+            args:[portal, prepared, params, args],
             callback: callback
         });
     }
@@ -473,13 +496,20 @@ function execPrepared (portal, prepared, args, callback) {
         // If it was a SELECT, args will be an array of rows, 
         // If it was an INSERT, etc, it'll be the type, and the number of 
         // affected rows.
+        if (exports.DEBUG > 0) {
+            sys.debug("Results length " + results.length);
+        }
         if (results.length >= 1) {
-            callback.call(data, results);
+            if (exports.DEBUG > 0) {
+                sys.debug("Calling with results");
+            }
+            callback.call(q, results);
         }
         else {
             this.type = data.type;
-            callback.call(data);
+            callback.call(q);
         }
+        conn.release(q);
     });
     var pos = 0;
     q.next = function() {
@@ -717,7 +747,11 @@ function Connection(args) {
             }
             row[description.field] = value;
         }
-        if (current_query.listeners("newRow") > 0) {
+        if (exports.DEBUG > 0) {
+            sys.debug(current_query.listeners("newRow").length);
+            sys.debug(current_query);
+        }
+        if (current_query.listeners("newRow").length > 0) {
             current_query.emit("newRow", row);
         }
         else {
