Merge pull request #1 from KolyaSirik/master

add limit and offset to query

Author: sokyrko

src/sokyrko/yii/salesforce/data/ActiveQuery.php

@@ -8,8 +8,6 @@
 
 namespace sokyrko\yii\salesforce\data;
 
-use Akeneo\SalesForce\Connector\SalesForceClient;
-use Akeneo\SalesForce\Query\QueryBuilder;
 use sokyrko\yii\salesforce\components\SalesforceComponent;
 use yii\base\InvalidCallException;
 use yii\base\InvalidParamException;
@@ -43,6 +41,7 @@ class ActiveQuery implements ActiveQueryInterface
         'where'   => [],
         'orderBy' => [],
         'limit'   => '',
+        'offset'  => '',
     ];
 
     /**
@@ -95,6 +94,8 @@ protected function parseSelect($what)
     public function asArray($value = true)
     {
         $this->asArray = $value;
+
+        return $this;
     }
 
     /**
@@ -247,7 +248,15 @@ public function getRawQuery()
             $q->orderBy($this->parseOrderBy($this->queryParts['orderBy']));
         }
 
-        // TODO: support limit and join
+        if ($this->queryParts['limit']) {
+            $q->limit($this->queryParts['limit']);
+        }
+
+        if ($this->queryParts['offset']) {
+            $q->offset($this->queryParts['offset']);
+        }
+
+        // TODO: support join
 
         return $q->getQuery();
     }
@@ -527,7 +536,7 @@ public function addOrderBy($columns)
      */
     public function limit($limit)
     {
-        $this->queryParts['limit'][] = $limit;
+        $this->queryParts['limit'] = $limit;
 
         return $this;
     }
@@ -540,7 +549,9 @@ public function limit($limit)
      */
     public function offset($offset)
     {
-        throw new InvalidCallException('Not implemented yet.');
+        $this->queryParts['offset'] = $offset;
+
+        return $this;
     }
 
     /**

src/sokyrko/yii/salesforce/data/QueryBuilder.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace sokyrko\yii\salesforce\data;
+
+/**
+ * Class QueryBuilder
+ *
+ * @package sokyrko\yii\salesforce\data
+ */
+class QueryBuilder extends \Akeneo\SalesForce\Query\QueryBuilder
+{
+    /**
+     * @param int $limit
+     *
+     * @return $this
+     */
+    public function limit($limit)
+    {
+        $this->query = sprintf('%s LIMIT %s', $this->query, $limit);
+
+        return $this;
+    }
+
+    /**
+     * @param int $offset
+     *
+     * @return $this
+     */
+    public function offset($offset)
+    {
+        $this->query = sprintf('%s OFFSET %s', $this->query, $offset);
+
+        return $this;
+    }
+}

tests/unit/ActiveQueryTest.php

@@ -71,4 +71,20 @@ public function testWhereAndOrderBy()
             Airport::find()->where(['Name' => 'Test'])->orderBy(['Id' => SORT_ASC])->getRawQuery()
         );
     }
+
+    public function testLimit()
+    {
+        Assert::assertEquals(
+            'SELECT Id, Name FROM Airport__c LIMIT 100',
+            Airport::find()->limit(100)->getRawQuery()
+        );
+    }
+
+    public function testOffset()
+    {
+        Assert::assertEquals(
+            'SELECT Id, Name FROM Airport__c OFFSET 100',
+            Airport::find()->offset(100)->getRawQuery()
+        );
+    }
 }