- Fixed Issue In Auto Resolving Column Names

- Fixed Exception In Ordr By Due To Empty Search Columns

Author: iYogesharma

composer.json

@@ -6,7 +6,7 @@
         "datatable",
         "laravel"
     ],
-    "version": "4.0",
+    "version": "4.1",
     "license": "MIT",
     "authors": [{
         "name": "Yogesh Sharma",

src/AbstractDatatable.php

@@ -266,16 +266,14 @@ protected function setArrayFilters( array $filters )
     }
 
 
-       /**
+    /**
      * Prepare result to return as response
      *
      * @return void
      */
     protected function prepareQueryWithoutOffset()
     {
-        $this->query = $this->query->orderBy($this->columns[$this->order],$this->dir);
-
-        $this->result = $this->query->get();
+        $this->result =  $this->queryWithOrderBy()->get();
     }
 
     /**
@@ -285,12 +283,26 @@ protected function prepareQueryWithoutOffset()
      */
     public function prepareQueryWithOffsetAndOrderBy()
     {
-        $this->query = $this->query->offset($this->request->getStart())
-                            ->limit($this->request->getPerPage())
-                            ->orderBy($this->columns[$this->order],$this->dir);
+        $this->query = $this->queryWithOrderBy()
+                            ->offset($this->request->getStart())
+                            ->limit($this->request->getPerPage());
+
         $this->result = $this->query->get();
     }
 
+    /**
+     * Add Order By Clause to Query IF Column list is not empty
+     */
+    private function queryWithOrderBy()
+    {
+        if( isset( $this->columns[$this->order] ) )
+        {
+            $this->query = $this->query->orderBy($this->columns[$this->order],$this->dir);
+        }
+
+        return $this->query;
+    }
+
     /**
      * Prepare result to return as response
      *

src/DatatableRequest.php

@@ -4,6 +4,10 @@
 
     class DatatableRequest
     {
+        const LIMIT = 100;
+
+        const OFFSET = 0;
+
         /**
          * @var \Illuminate\Http\Request
          */
@@ -73,20 +77,20 @@ public function getDraw()
         }
 
         /**
-         * @return string
+         * @return int
          */
         public function getStart()
         {
-            return $this->request->input('start');
+            return $this->request->input('start') ?? self::OFFSET;
         }
 
         /**
          * Get max data per page for pagination
-         * @return array|string
+         * @return array|int
          */
         public function getPerPage()
         {
-            return $this->request->input('length');
+            return $this->request->input('length')  ?? self::LIMIT;
         }
 
         /**

src/Traits/HasQueryBuilder.php

@@ -53,11 +53,15 @@ private function identifyQueryColumns()
     {
         $skip  = config('datatable.skip') ?? [];
 
+        $connection = $this->query->connection->getDatabaseName();
+
         if(  empty($this->query->columns)  || $this->query->columns[0] === '*' )
         {
-            $this->query->columns = Schema::getColumnListing( $this->query->from );
+            $from = strpos($this->query->from,'.') ? explode('.',$this->query->from)[1] : $this->query->from; 
+           
+            $this->query->columns = Schema::connection($connection)->getColumnListing( $from );
 
-            delete_keys($this->query->columns,  $skip);
+            !empty( $skip ) && delete_keys($this->query->columns,  $skip);
         }
         else
         {
@@ -69,9 +73,9 @@ private function identifyQueryColumns()
 
                     $table = explode('.*',$c)[0];
 
-                    $columns = Schema::getColumnListing( $table );
+                    $columns = Schema::connection($connection)->getColumnListing( $table );
 
-                    delete_keys($columns, $skip);
+                    !empty( $skip ) && delete_keys($columns, $skip);
 
                     array_walk($columns, function(&$value)use($table) { $value = "{$table}.{$value}"; } );