Fixed queryBuilder method bugs

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes in Laravel Nova Exports will be documented in this file
 
+## 1.0.2
+- Fixed queryBuilder method bugs
+
 ## 1.0.1
 - Added ability to manipulate with the query builder
 - Added ability to set own file name 

README.md

@@ -43,9 +43,9 @@ public function actions(Request $request): array
 - `withUserSelection()` - Enables multi-select field that allow user to select the columns when exporting.
 - `usesDateRange(string $columnName)` - Enables field that allow user to select the range of dates when exporting. *Default: `created_at`*
 - `usesGenerator()` - Enables cursor usage when getting data from database. 
-- `queryBuilder(callable $query)` - Manipulate query builder before data exportation. 
+- `queryBuilder(callable $query)` - Use own query on data exportation. 
 
-*`withUserSelection` method isn't fully supported by `queryBuilder` method. I recommend to not use them together.*
+*`withUserSelection` method cannot be used together with `queryBuilder` method.*
 
 You are also able to use all of [Nova Action](https://nova.laravel.com/docs/3.0/actions/defining-actions.html) methods, and all of [Detached Actions](https://github.com/gobrightspot/nova-detached-actions#display-on-different-screens) methods on `ExportResourceAction`.
 

src/ExportResourceAction.php

@@ -317,6 +317,8 @@ protected function resourceGenerator(Builder $builder): ?Generator
     protected function getQueryData(array $columns, ActionFields $fields)
     {
         if (!$this->usesOwnQuery) {
+            $columns = array_map(fn($column) => $this->table.'.'.$column, $columns);
+
             $this->queryBuilder = $this->queryBuilder->select($columns);
         }
 
@@ -327,7 +329,7 @@ protected function getQueryData(array $columns, ActionFields $fields)
             if ($from && $to) {
                 $this->queryBuilder = $this->queryBuilder
                     ->whereBetween(
-                        $this->rangeColumn,
+                        $this->table . '.' . $this->rangeColumn,
                         [
                             Carbon::parse($from)->startOfDay(),
                             Carbon::parse($to)->endOfDay()
@@ -336,7 +338,7 @@ protected function getQueryData(array $columns, ActionFields $fields)
             } elseif ($from && is_null($to)) {
                 $this->queryBuilder = $this->queryBuilder
                     ->whereDate(
-                        $this->rangeColumn,
+                        $this->table . '.' . $this->rangeColumn,
                         Carbon::parse($from)->startOfDay()
                     );
             }
@@ -366,3 +368,4 @@ protected function getQueryData(array $columns, ActionFields $fields)
         return $data;
     }
 }
+