fixes for selecting with fields$ and more tests

Author: mirceaalexandru

README.md

@@ -12,7 +12,7 @@ seneca-postgres-store is a [PostgreSQL][postgresqlorg] database plugin for the [
 Usage:
 
     var seneca = require('seneca');
-    var store = require('seneca-postgresql-store');
+    var store = require('seneca-postgres-store');
 
     var config = {}
     var storeopts = {

lib/postgresql-store.js

@@ -239,10 +239,7 @@ module.exports = function (opts) {
           return done(null, query)
         }
         else {
-          if (q.distinct$ || q.fields$) {
-            return done(null, query_builder.filterStatement(qent, q))
-          }
-          else if (q.ids) {
+          if (q.ids) {
             return done(null, query_builder.selectstmOr(qent, q))
           }
           else {

lib/query_builder.js

@@ -295,11 +295,22 @@ function filterStatement (qent, q) {
 }
 
 function selectstm (qent, q, done) {
+  var specialOps = ['fields$']
+  var specialOpsVal = {}
+
   var stm = {}
 
+  for (var i in specialOps){
+    if (q[specialOps[i]]){
+      specialOpsVal[specialOps[i]] = q[specialOps[i]]
+      delete q[specialOps[i]]
+    }
+  }
+
   var table = relationalstore.tablename(qent)
   var entp = relationalstore.makeentp(qent)
 
+
   var w = whereargs(entp, q)
 
   var response = buildQueryFromExpression(entp, w)
@@ -315,7 +326,13 @@ function selectstm (qent, q, done) {
 
   var metastr = ' ' + mq.params.join(' ')
 
-  stm.text = 'SELECT * FROM ' + relationalstore.escapeStr(table) + (wherestr ? ' WHERE ' + wherestr : '') + relationalstore.escapeStr(metastr)
+  var what = '*'
+  if (specialOpsVal['fields$'] && _.isArray(specialOpsVal['fields$']) && specialOpsVal['fields$'].length > 0){
+    what = ' ' + specialOpsVal['fields$'].join(', ')
+    what += ', id '
+  }
+
+  stm.text = 'SELECT ' + what + ' FROM ' + relationalstore.escapeStr(table) + (wherestr ? ' WHERE ' + wherestr : '') + relationalstore.escapeStr(metastr)
   stm.values = values
 
   done(null, stm)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "seneca-postgres-store",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Seneca data store plugin for PostgreSQL",
   "main": "lib/postgresql-store.js",
   "author": "Marian Radulescu",

test/postgres.test.js

@@ -317,4 +317,41 @@ describe('postgres store API V2.0.0', function () {
       done()
     })
   })
+
+  it('use and$ & or$ and limit$', function (done) {
+    var product = si.make('product')
+
+    product.list$({
+      or$: [{price: {gte$: 200}}, {and$: [{name: 'cherry'}, {price: 300}]}],
+      sort$: {price: 1},
+      limit$: 1,
+      fields$: ['name']
+    }, function (err, lst) {
+      assert(!err)
+
+      assert.equal(1, lst.length)
+      assert.equal('pear', lst[0].name)
+      assert(!lst[0].price)
+      done()
+    })
+  })
+
+  it('use and$ & or$ and limit$, fields$ and skip$', function (done) {
+    var product = si.make('product')
+
+    product.list$({
+      price: {gte$: 200},
+      sort$: {price: 1},
+      limit$: 1,
+      fields$: ['name'],
+      skip$: 1
+    }, function (err, lst) {
+      assert(!err)
+
+      assert.equal(1, lst.length)
+      assert.equal('cherry', lst[0].name)
+      assert(!lst[0].price)
+      done()
+    })
+  })
 })