removed unnecessary properties, changed sorts to orders to use existing features better

Author: David Nahodyl

src/Database/Query/FMBaseBuilder.php

@@ -5,7 +5,6 @@
 
 
 use BlueFeather\EloquentFileMaker\Exceptions\FileMakerDataApiException;
-use BlueFeather\EloquentFileMaker\Services\FileMakerConnection;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
@@ -15,13 +14,6 @@
 class FMBaseBuilder extends Builder
 {
 
-    /**
-     * The database connection instance.
-     *
-     * @var FileMakerConnection
-     */
-    public $connection;
-
     /**
      * The internal FileMaker Record ID to act on
      * @var
@@ -34,29 +26,6 @@ class FMBaseBuilder extends Builder
      */
     protected $fieldMapping = [];
 
-    /**
-     * The collection of sort orders for the query
-     *
-     * @var array
-     */
-    public $sorts = [];
-
-
-    /**
-     * The maximum number of records to return.
-     * Default is 100 for the FileMaker data API
-     *
-     * @var int
-     */
-    public $limit;
-
-    /**
-     * The number of records to skip.
-     *
-     * @var int
-     */
-    public $offset;
-
     /**
      * The name of the FileMaker script to be run after the action specified by the API call and after the subsequent sort.
      *
@@ -280,7 +249,7 @@ public function orderByDesc($column): FMBaseBuilder
 
     protected function appendSortOrder($column, $direction)
     {
-        $this->sorts[] = ['fieldName' => $this->getMappedFieldName($column), 'sortOrder' => $direction];
+        $this->orders[] = ['fieldName' => $this->getMappedFieldName($column), 'sortOrder' => $direction];
     }
 
     /**

src/Services/FileMakerConnection.php

@@ -30,30 +30,6 @@ class FileMakerConnection extends Connection
     protected $retries = 1;
 
 
-    /**
-     * Set the name of the connected database.
-     *
-     * @param string $connection
-     * @return $this
-     */
-    public function setConnection($connection, $config = [])
-    {
-        if (!$config) {
-            $config = $this->getConnection($connection);
-        }
-
-        $this->config = Arr::add($config, 'name', $connection);
-
-        $this->tablePrefix = $this->getConfig('prefix');
-
-        return $this;
-    }
-
-    protected function getConnection($connection)
-    {
-        return config('database.connections')[$connection];
-    }
-
     /**
      * @param String $layout
      * @return $this
@@ -291,9 +267,9 @@ public function getRecords(FMBaseBuilder $query)
         if ($query->limit > 0) {
             $queryParams['_limit'] = $query->limit;
         }
-        if (sizeof($query->sorts) > 0) {
+        if ($query->orders !== null && sizeof($query->orders) > 0) {
             // sort can have many values, so it needs to get json_encoded and passed as a single string
-            $queryParams['_sort'] = json_encode($query->sorts);
+            $queryParams['_sort'] = json_encode($query->orders);
         }
 
         $response = $this->makeRequest('get', $url, $queryParams);
@@ -446,7 +422,7 @@ protected function buildPostDataFromQuery(FMBaseBuilder $query)
         // attribute => parameter
         $params = [
             'wheres' => 'query',
-            'sorts' => 'sort',
+            'orders' => 'sort',
             'script' => 'script',
             'scriptParam' => 'script.param',
             'scriptPrerequest' => 'script.prerequest',