implement count

parse-community · Jun 17, 2016 · 8850369 · 8850369
1 parent 4c7be10
commit 8850369
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/spec/InstallationsRouter.spec.js b/spec/InstallationsRouter.spec.js
@@ -103,7 +103,7 @@ describe('InstallationsRouter', () => {
     });
   });
 
-  it_exclude_dbs(['postgres'])('query installations with count = 1', (done) => {
+  it('query installations with count = 1', done => {
     var androidDeviceRequest = {
       'installationId': '12345678-abcd-abcd-abcd-123456789abc',
       'deviceType': 'android'
@@ -130,7 +130,11 @@ describe('InstallationsRouter', () => {
       expect(response.results.length).toEqual(2);
       expect(response.count).toEqual(2);
       done();
-    });
+    })
+    .catch(error => {
+      fail(JSON.stringify(error));
+      done();
+    })
   });
 
   it_exclude_dbs(['postgres'])('query installations with limit = 0 and count = 1', (done) => {

diff --git a/spec/ParseObject.spec.js b/spec/ParseObject.spec.js
@@ -1478,7 +1478,7 @@ describe('Parse.Object testing', () => {
                           expectError(Parse.Error.MISSING_OBJECT_ID, done));
   });
 
-  it("fetchAll error on deleted object", function(done) {
+  it_exclude_dbs(['postgres'])("fetchAll error on deleted object", function(done) {
     var numItems = 11;
     var container = new Container();
     var subContainer = new Container();

diff --git a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
@@ -356,7 +356,10 @@ export class PostgresStorageAdapter {
     let where = buildWhereClause({ schema, query, index: 2 })
     values.push(...where.values);
 
-    const qs = `SELECT * FROM $1:name WHERE ${where.pattern} ${limit !== undefined ? `LIMIT $${values.length + 1}` : ''}`;
+    const wherePattern = where.pattern.length > 0 ? `WHERE ${where.pattern}` : '';
+    const limitPattern = limit !== undefined ? `LIMIT $${values.length + 1}` : '';
+
+    const qs = `SELECT * FROM $1:name ${wherePattern} ${limitPattern}`;
     if (limit !== undefined) {
       values.push(limit);
     }
@@ -412,7 +415,14 @@ export class PostgresStorageAdapter {
 
   // Executes a count.
   count(className, schema, query) {
-    return Promise.reject('Not implemented yet.')
+    let values = [className];
+    let where = buildWhereClause({ schema, query, index: 2 });
+    values.push(...where.values);
+
+    const wherePattern = where.pattern.length > 0 ? `WHERE ${where.pattern}` : '';
+    const qs = `SELECT COUNT(*) FROM $1:name ${wherePattern}`;
+    return this._client.query(qs, values)
+    .then(result => parseInt(result[0].count))
   }
 }