@@ -1379,7 +1379,7 @@ protected function columnMap($columns, array &$stack, bool $root): array
1379
1379
1380
1380
foreach ($ columns as $ key => $ value ) {
1381
1381
if (is_int ($ key )) {
1382
- preg_match ("/( " . $ this ::TABLE_PATTERN . ")?(?<column> " . $ this ::COLUMN_PATTERN . ")(?:\s*\((?<alias> " . $ this ::ALIAS_PATTERN . ")\))?(?:\s*\[(?<type>(?:String|Bool|Int|Number|Object|JSON))\])?/u " , $ value , $ keyMatch );
1382
+ preg_match ("/( " . $ this ::TABLE_PATTERN . "\. )?(?<column> " . $ this ::COLUMN_PATTERN . ")(?:\s*\((?<alias> " . $ this ::ALIAS_PATTERN . ")\))?(?:\s*\[(?<type>(?:String|Bool|Int|Number|Object|JSON))\])?/u " , $ value , $ keyMatch );
1383
1383
1384
1384
$ columnKey = !empty ($ keyMatch ['alias ' ]) ?
1385
1385
$ keyMatch ['alias ' ] :
@@ -1389,7 +1389,7 @@ protected function columnMap($columns, array &$stack, bool $root): array
1389
1389
[$ columnKey , $ keyMatch ['type ' ]] :
1390
1390
[$ columnKey ];
1391
1391
} elseif ($ this ->isRaw ($ value )) {
1392
- preg_match ("/( " . $ this ::TABLE_PATTERN . ")?(?<column> " . $ this ::COLUMN_PATTERN . ")(\s*\[(?<type>(String|Bool|Int|Number))\])?/u " , $ key , $ keyMatch );
1392
+ preg_match ("/( " . $ this ::TABLE_PATTERN . "\. )?(?<column> " . $ this ::COLUMN_PATTERN . ")(\s*\[(?<type>(String|Bool|Int|Number))\])?/u " , $ key , $ keyMatch );
1393
1393
$ columnKey = $ keyMatch ['column ' ];
1394
1394
1395
1395
$ stack [$ key ] = isset ($ keyMatch ['type ' ]) ?
@@ -1432,7 +1432,7 @@ protected function dataMap(
1432
1432
1433
1433
if (count ($ columnsKey ) === 1 && is_array ($ columns [$ columnsKey [0 ]])) {
1434
1434
$ indexKey = array_keys ($ columns )[0 ];
1435
- $ dataKey = preg_replace ("/^[\p{L}_][\p{L}\p{N}@$#\-_]* \./u " , '' , $ indexKey );
1435
+ $ dataKey = preg_replace ("/^ " . $ this :: COLUMN_PATTERN . " \./u " , '' , $ indexKey );
1436
1436
$ currentStack = [];
1437
1437
1438
1438
foreach ($ data as $ item ) {
0 commit comments