RID query fixes

lib/db/record.js

@@ -152,7 +152,6 @@ function recordIdResolver () {
       return obj.map(replaceRecordIds.bind(this, records));
     }
     else if (obj instanceof RIDBag) {
-      /*jshint validthis:true */
       obj._prefetchedRecords = records;
       return obj;
     }
@@ -167,10 +166,10 @@ function recordIdResolver () {
         seen[obj['@rid']] = obj;
       }
     }
+
     var keys = Object.keys(obj),
         total = keys.length,
         i, key, value;
-
     for (i = 0; i < total; i++) {
       key = keys[i];
       value = obj[key];

lib/db/statement.js

@@ -400,7 +400,7 @@ Statement.prototype.buildStatement = function () {
   if (state.upsert) {
     statement.push('UPSERT');
   }
-  
+
   if ((state.update || state.insert || state.delete) && state.return) {
     statement.push('RETURN ' + state.return);
   }
@@ -472,6 +472,17 @@ Statement.prototype.buildStatement = function () {
           return item;
         }
       }
+      else if (item && typeof item === 'object') {
+        var keys = Object.keys(item),
+            length = keys.length,
+            parts = new Array(length),
+            key, i;
+        for (i = 0; i < length; i++) {
+          key = keys[i];
+          parts.push(key, item[key]);
+        }
+        return parts.join(' ');
+      }
       else {
         return ''+item;
       }
@@ -559,7 +570,7 @@ Statement.prototype._objectToCondition = function (obj, operator) {
     key = keys[i];
     paramName = 'param' + paramify(key) + (this._state.paramIndex++);
     conditions.push(key + ' ' + operator + ' :' + paramName);
-    this.addParam(paramName, obj[key] instanceof RID ? ''+obj[key] : obj[key]);
+    this.addParam(paramName, obj[key]);
   }
 
   if (conditions.length === 0) {

lib/transport/binary/protocol/operations/command.js

@@ -3,7 +3,8 @@
 var Operation = require('../operation'),
     constants = require('../constants'),
     serializer = require('../serializer'),
-    writer = require('../writer');
+    writer = require('../writer'),
+    RID = require('../../../../recordid');
 
 module.exports = Operation.extend({
   id: 'REQUEST_COMMAND',

lib/utils.js

@@ -139,10 +139,10 @@ exports.prepare = function (query, params) {
   if (!params) {
     return query;
   }
-  var pattern = /"(\\[\s\S]|[^"])*"|'(\\[\s\S]|[^'])*'|:([A-Za-z][A-Za-z0-9_-]*|\/\*[\s\S]*?\*\/)/g;
+  var pattern = /"(\\[\s\S]|[^"])*"|'(\\[\s\S]|[^'])*'|\s:([A-Za-z][A-Za-z0-9_-]*|\/\*[\s\S]*?\*\/)/g;
   return query.replace(pattern, function (all, double, single, param) {
     if (param) {
-      return exports.encode(params[param]);
+      return ' ' + exports.encode(params[param]);
     }
     else {
       return all;

test/core/utils.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var utils = require('../../lib/utils');
+
+describe('utils.prepare', function () {
+  it("should prepare SQL statements", function () {
+    utils.prepare("select from index:foo").should.equal("select from index:foo");
+  });
+  it("should prepare SQL statements with parameters", function () {
+    utils.prepare("select from index:foo where key = :key", {key: 123}).should.equal("select from index:foo where key = 123");
+  });
+});

test/db/query-test.js

@@ -261,6 +261,13 @@ describe("Database API - Query", function () {
         user.name.should.equal('reader');
       });
     });
+    it('should select a record by its RID', function () {
+      return this.db.select().from('OUser').where({'@rid': new LIB.RID('#5:0')}).one()
+      .then(function (user) {
+        expect(typeof user).to.equal('object');
+        user.name.should.equal('admin');
+      });
+    });
     it('should select a user with a fetch plan', function () {
       return this.db.select().from('OUser').where({name: 'reader'}).fetch({roles: 3}).one()
       .then(function (user) {