Improve FragmentFinder implementation

thephpleague · Jan 13, 2024 · ecef445 · ecef445
1 parent 950f862
commit ecef445
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/FragmentFinder.php b/src/FragmentFinder.php
@@ -107,22 +107,28 @@ private function find(array $parsedExpression, TabularDataReader $tabularDataRea
                         (null === $selection['end'] || $offset <= $selection['end'])
             );
 
-            return [$tabularDataReader->filter($rowFilter)];
+            return [Statement::create()->where($rowFilter)->process($tabularDataReader)];
         }
 
         if (self::TYPE_COLUMN === $type) {
-            $columns = array_reduce($selections, fn (array $columns, array $selection) => [...$columns, ...$selection['columns']], []);
+            $columns = array_reduce(
+                $selections,
+                fn (array $columns, array $selection) => [...$columns, ...$selection['columns']],
+                []
+            );
 
             return [match ([]) {
                 $columns => ResultSet::createFromRecords(),
-                default => $tabularDataReader->select(...$columns),
+                default => Statement::create()->select(...$columns)->process($tabularDataReader),
             }];
         }
 
         return array_map(
-            fn (array $selection) => $tabularDataReader
-                ->slice($selection['start'], $selection['length'])
-                ->select(...$selection['columns']),
+            fn (array $selection) => Statement::create()
+                ->select(...$selection['columns'])
+                ->offset($selection['start'])
+                ->limit($selection['length'])
+                ->process($tabularDataReader),
             $selections
         );
     }