Merge pull request #8 from aloware/fix/clear-builder-orders

Fix clear builder orders

Author: hamed-aloware

src/CursorPaginationServiceProvider.php

@@ -61,7 +61,11 @@ public function registerMacro()
             }
 
             // Clear Default Quey Order By
-            $this->query->orders = null;
+            if($this instanceof EloquentBuilder) {
+                $this->getQuery()->orders = null;
+            } else {
+                $this->orders = null;
+            }
 
             // If there's a sorting by the identifier, check if it's desc so the cursor is inverted
             $identifier_sort_inverted = $identifier_sort ? $identifier_sort['direction'] === 'desc' : false;

src/QueryBuilderHelper.php

@@ -44,7 +44,9 @@ public static function getCursorIdentifierColumn($builder)
      */
     public static function getTableName($builder)
     {
-        $table = explode(' ', trim($builder->from))[0];
+        $from = str_replace('`', '', $builder->from);
+
+        $table = explode(' ', trim($from))[0];
 
         return $table;
     }