update

Bored-Programmers · Oct 29, 2023 · f481eb7 · f481eb7
1 parent 3c7a44b
commit f481eb7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Models/Scopes/MappedColumnsScope.php b/src/Models/Scopes/MappedColumnsScope.php
@@ -41,9 +41,18 @@ private function mapColumns($array, $mappedColToDbColWithTable)
 
         foreach ($array as $key => $column) {
             if (is_array($column)) {
-                if ($column['type'] === 'Exists') {
+                if ($column['type'] === 'Exists' || $column['type'] === 'Nested') {
                     $column['query']->applyBeforeQueryCallbacks();
 
+                    $mappedColToDbColOnlyTables = array_filter(
+                        $mappedColToDbColWithTable,
+                        fn($val) => str_contains($val, '.')
+                    );
+
+                    $column['query']->columns = $this->mapColumns($column['query']->columns, $mappedColToDbColOnlyTables);
+                    $column['query']->wheres = $this->mapColumns($column['query']->wheres, $mappedColToDbColOnlyTables);
+                    $column['query']->joins = $this->mapJoins($column['query']->joins, $mappedColToDbColOnlyTables);
+
                 } elseif ($column['type'] === 'Column') {
                     if ($newColumnName = $mappedColToDbColWithTable[$column['first']] ?? null) {
                         $array[$key]['first'] = $newColumnName;