@@ -289,11 +289,11 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function getSQLTableAlias($tableName, $dqlAlias = '') |
291 | 291 | { |
292 | - $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : ''; |
|
292 | + $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : ''; |
|
293 | 293 | |
294 | 294 | if ( ! isset($this->tableAliasMap[$tableName])) { |
295 | 295 | $this->tableAliasMap[$tableName] = (preg_match('/[a-z]/i', $tableName[0]) ? strtolower($tableName[0]) : 't') |
296 | - . $this->tableAliasCounter++ . '_'; |
|
296 | + . $this->tableAliasCounter++.'_'; |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | return $this->tableAliasMap[$tableName]; |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | */ |
312 | 312 | public function setSQLTableAlias($tableName, $alias, $dqlAlias = '') |
313 | 313 | { |
314 | - $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : ''; |
|
314 | + $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : ''; |
|
315 | 315 | |
316 | 316 | $this->tableAliasMap[$tableName] = $alias; |
317 | 317 | |
@@ -352,12 +352,12 @@ discard block |
||
352 | 352 | |
353 | 353 | // If this is a joined association we must use left joins to preserve the correct result. |
354 | 354 | $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER '; |
355 | - $sql .= 'JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; |
|
355 | + $sql .= 'JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON '; |
|
356 | 356 | |
357 | 357 | $sqlParts = []; |
358 | 358 | |
359 | 359 | foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) { |
360 | - $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName; |
|
360 | + $sqlParts[] = $baseTableAlias.'.'.$columnName.' = '.$tableAlias.'.'.$columnName; |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | // Add filters on the root class |
@@ -378,12 +378,12 @@ discard block |
||
378 | 378 | $subClass = $this->em->getClassMetadata($subClassName); |
379 | 379 | $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias); |
380 | 380 | |
381 | - $sql .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON '; |
|
381 | + $sql .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON '; |
|
382 | 382 | |
383 | 383 | $sqlParts = []; |
384 | 384 | |
385 | 385 | foreach ($this->quoteStrategy->getIdentifierColumnNames($subClass, $this->platform) as $columnName) { |
386 | - $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName; |
|
386 | + $sqlParts[] = $baseTableAlias.'.'.$columnName.' = '.$tableAlias.'.'.$columnName; |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | $sql .= implode(' AND ', $sqlParts); |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | ? $persister->getOwningTable($fieldName) |
416 | 416 | : $qComp['metadata']->getTableName(); |
417 | 417 | |
418 | - $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias) . '.' . $columnName; |
|
418 | + $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias).'.'.$columnName; |
|
419 | 419 | |
420 | 420 | // OrderByClause should replace an ordered relation. see - DDC-2475 |
421 | 421 | if (isset($this->orderedColumnsMap[$orderedColumn])) { |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | } |
424 | 424 | |
425 | 425 | $this->orderedColumnsMap[$orderedColumn] = $orientation; |
426 | - $orderedColumns[] = $orderedColumn . ' ' . $orientation; |
|
426 | + $orderedColumns[] = $orderedColumn.' '.$orientation; |
|
427 | 427 | } |
428 | 428 | } |
429 | 429 | |
@@ -458,15 +458,15 @@ discard block |
||
458 | 458 | } |
459 | 459 | |
460 | 460 | $sqlTableAlias = ($this->useSqlTableAliases) |
461 | - ? $this->getSQLTableAlias($class->getTableName(), $dqlAlias) . '.' |
|
461 | + ? $this->getSQLTableAlias($class->getTableName(), $dqlAlias).'.' |
|
462 | 462 | : ''; |
463 | 463 | |
464 | - $sqlParts[] = $sqlTableAlias . $class->discriminatorColumn['name'] . ' IN (' . implode(', ', $values) . ')'; |
|
464 | + $sqlParts[] = $sqlTableAlias.$class->discriminatorColumn['name'].' IN ('.implode(', ', $values).')'; |
|
465 | 465 | } |
466 | 466 | |
467 | 467 | $sql = implode(' AND ', $sqlParts); |
468 | 468 | |
469 | - return (count($sqlParts) > 1) ? '(' . $sql . ')' : $sql; |
|
469 | + return (count($sqlParts) > 1) ? '('.$sql.')' : $sql; |
|
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
@@ -479,11 +479,11 @@ discard block |
||
479 | 479 | */ |
480 | 480 | private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias) |
481 | 481 | { |
482 | - if (!$this->em->hasFilters()) { |
|
482 | + if ( ! $this->em->hasFilters()) { |
|
483 | 483 | return ''; |
484 | 484 | } |
485 | 485 | |
486 | - switch($targetEntity->inheritanceType) { |
|
486 | + switch ($targetEntity->inheritanceType) { |
|
487 | 487 | case ClassMetadata::INHERITANCE_TYPE_NONE: |
488 | 488 | break; |
489 | 489 | case ClassMetadata::INHERITANCE_TYPE_JOINED: |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | $filterClauses = []; |
507 | 507 | foreach ($this->em->getFilters()->getEnabledFilters() as $filter) { |
508 | 508 | if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) { |
509 | - $filterClauses[] = '(' . $filterExpr . ')'; |
|
509 | + $filterClauses[] = '('.$filterExpr.')'; |
|
510 | 510 | } |
511 | 511 | } |
512 | 512 | |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | } |
539 | 539 | |
540 | 540 | if ( ! $AST->orderByClause && ($orderBySql = $this->_generateOrderedCollectionOrderByItems())) { |
541 | - $sql .= ' ORDER BY ' . $orderBySql; |
|
541 | + $sql .= ' ORDER BY '.$orderBySql; |
|
542 | 542 | } |
543 | 543 | |
544 | 544 | if ($limit !== null || $offset !== null) { |
@@ -550,11 +550,11 @@ discard block |
||
550 | 550 | } |
551 | 551 | |
552 | 552 | if ($lockMode === LockMode::PESSIMISTIC_READ) { |
553 | - return $sql . ' ' . $this->platform->getReadLockSQL(); |
|
553 | + return $sql.' '.$this->platform->getReadLockSQL(); |
|
554 | 554 | } |
555 | 555 | |
556 | 556 | if ($lockMode === LockMode::PESSIMISTIC_WRITE) { |
557 | - return $sql . ' ' . $this->platform->getWriteLockSQL(); |
|
557 | + return $sql.' '.$this->platform->getWriteLockSQL(); |
|
558 | 558 | } |
559 | 559 | |
560 | 560 | if ($lockMode !== LockMode::OPTIMISTIC) { |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | $sqlParts = []; |
610 | 610 | |
611 | 611 | foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) { |
612 | - $sqlParts[] = $tableAlias . '.' . $columnName; |
|
612 | + $sqlParts[] = $tableAlias.'.'.$columnName; |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | return implode(', ', $sqlParts); |
@@ -652,7 +652,7 @@ discard block |
||
652 | 652 | $class = $this->queryComponents[$dqlAlias]['metadata']; |
653 | 653 | |
654 | 654 | if ($this->useSqlTableAliases) { |
655 | - $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.'; |
|
655 | + $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.'; |
|
656 | 656 | } |
657 | 657 | |
658 | 658 | $sql .= $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform); |
@@ -681,7 +681,7 @@ discard block |
||
681 | 681 | } |
682 | 682 | |
683 | 683 | if ($this->useSqlTableAliases) { |
684 | - $sql .= $this->getSQLTableAlias($class->getTableName(), $dqlAlias) . '.'; |
|
684 | + $sql .= $this->getSQLTableAlias($class->getTableName(), $dqlAlias).'.'; |
|
685 | 685 | } |
686 | 686 | |
687 | 687 | $sql .= reset($assoc['targetToSourceKeyColumns']); |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | */ |
700 | 700 | public function walkSelectClause($selectClause) |
701 | 701 | { |
702 | - $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : ''); |
|
702 | + $sql = 'SELECT '.(($selectClause->isDistinct) ? 'DISTINCT ' : ''); |
|
703 | 703 | $sqlSelectExpressions = array_filter(array_map([$this, 'walkSelectExpression'], $selectClause->selectExpressions)); |
704 | 704 | |
705 | 705 | if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && $selectClause->isDistinct) { |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | $discrColumn = $rootClass->discriminatorColumn; |
737 | 737 | $columnAlias = $this->getSQLColumnAlias($discrColumn['name']); |
738 | 738 | |
739 | - $sqlSelectExpressions[] = $tblAlias . '.' . $discrColumn['name'] . ' AS ' . $columnAlias; |
|
739 | + $sqlSelectExpressions[] = $tblAlias.'.'.$discrColumn['name'].' AS '.$columnAlias; |
|
740 | 740 | |
741 | 741 | $this->rsm->setDiscriminatorColumn($dqlAlias, $columnAlias); |
742 | 742 | $this->rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName'], false, $discrColumn['type']); |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | foreach ($class->associationMappings as $assoc) { |
752 | 752 | if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)) { |
753 | 753 | continue; |
754 | - } else if ( !$addMetaColumns && !isset($assoc['id'])) { |
|
754 | + } else if ( ! $addMetaColumns && ! isset($assoc['id'])) { |
|
755 | 755 | continue; |
756 | 756 | } |
757 | 757 | |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | $columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); |
767 | 767 | |
768 | 768 | $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); |
769 | - $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; |
|
769 | + $sqlSelectExpressions[] = $sqlTableAlias.'.'.$quotedColumnName.' AS '.$columnAlias; |
|
770 | 770 | |
771 | 771 | $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $isIdentifier, $columnType); |
772 | 772 | } |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | $columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); |
796 | 796 | |
797 | 797 | $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform); |
798 | - $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; |
|
798 | + $sqlSelectExpressions[] = $sqlTableAlias.'.'.$quotedColumnName.' AS '.$columnAlias; |
|
799 | 799 | |
800 | 800 | $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $subClass->isIdentifier($columnName), $columnType); |
801 | 801 | } |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl); |
822 | 822 | } |
823 | 823 | |
824 | - return ' FROM ' . implode(', ', $sqlParts); |
|
824 | + return ' FROM '.implode(', ', $sqlParts); |
|
825 | 825 | } |
826 | 826 | |
827 | 827 | /** |
@@ -898,14 +898,14 @@ discard block |
||
898 | 898 | } |
899 | 899 | |
900 | 900 | $sql = $this->platform->appendLockHint( |
901 | - $this->quoteStrategy->getTableName($class, $this->platform) . ' ' . |
|
901 | + $this->quoteStrategy->getTableName($class, $this->platform).' '. |
|
902 | 902 | $this->getSQLTableAlias($class->getTableName(), $dqlAlias), |
903 | 903 | $this->query->getHint(Query::HINT_LOCK_MODE) |
904 | 904 | ); |
905 | 905 | |
906 | 906 | if ($class->isInheritanceTypeJoined()) { |
907 | 907 | if ($buildNestedJoins) { |
908 | - $sql = '(' . $sql . $this->_generateClassTableInheritanceJoins($class, $dqlAlias) . ')'; |
|
908 | + $sql = '('.$sql.$this->_generateClassTableInheritanceJoins($class, $dqlAlias).')'; |
|
909 | 909 | } else { |
910 | 910 | $sql .= $this->_generateClassTableInheritanceJoins($class, $dqlAlias); |
911 | 911 | } |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | // Ensure we got the owning side, since it has all mapping info |
945 | 945 | $assoc = ( ! $relation['isOwningSide']) ? $targetClass->associationMappings[$relation['mappedBy']] : $relation; |
946 | 946 | |
947 | - if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && (!$this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) { |
|
947 | + if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) { |
|
948 | 948 | if ($relation['type'] == ClassMetadata::ONE_TO_MANY || $relation['type'] == ClassMetadata::MANY_TO_MANY) { |
949 | 949 | throw QueryException::iterateWithFetchJoinNotAllowed($assoc); |
950 | 950 | } |
@@ -964,12 +964,12 @@ discard block |
||
964 | 964 | $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform); |
965 | 965 | |
966 | 966 | if ($relation['isOwningSide']) { |
967 | - $conditions[] = $sourceTableAlias . '.' . $quotedSourceColumn . ' = ' . $targetTableAlias . '.' . $quotedTargetColumn; |
|
967 | + $conditions[] = $sourceTableAlias.'.'.$quotedSourceColumn.' = '.$targetTableAlias.'.'.$quotedTargetColumn; |
|
968 | 968 | |
969 | 969 | continue; |
970 | 970 | } |
971 | 971 | |
972 | - $conditions[] = $sourceTableAlias . '.' . $quotedTargetColumn . ' = ' . $targetTableAlias . '.' . $quotedSourceColumn; |
|
972 | + $conditions[] = $sourceTableAlias.'.'.$quotedTargetColumn.' = '.$targetTableAlias.'.'.$quotedSourceColumn; |
|
973 | 973 | } |
974 | 974 | |
975 | 975 | // Apply remaining inheritance restrictions |
@@ -987,7 +987,7 @@ discard block |
||
987 | 987 | } |
988 | 988 | |
989 | 989 | $targetTableJoin = [ |
990 | - 'table' => $targetTableName . ' ' . $targetTableAlias, |
|
990 | + 'table' => $targetTableName.' '.$targetTableAlias, |
|
991 | 991 | 'condition' => implode(' AND ', $conditions), |
992 | 992 | ]; |
993 | 993 | break; |
@@ -1007,10 +1007,10 @@ discard block |
||
1007 | 1007 | $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform); |
1008 | 1008 | $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform); |
1009 | 1009 | |
1010 | - $conditions[] = $sourceTableAlias . '.' . $quotedTargetColumn . ' = ' . $joinTableAlias . '.' . $quotedSourceColumn; |
|
1010 | + $conditions[] = $sourceTableAlias.'.'.$quotedTargetColumn.' = '.$joinTableAlias.'.'.$quotedSourceColumn; |
|
1011 | 1011 | } |
1012 | 1012 | |
1013 | - $sql .= $joinTableName . ' ' . $joinTableAlias . ' ON ' . implode(' AND ', $conditions); |
|
1013 | + $sql .= $joinTableName.' '.$joinTableAlias.' ON '.implode(' AND ', $conditions); |
|
1014 | 1014 | |
1015 | 1015 | // Join target table |
1016 | 1016 | $sql .= ($joinType == AST\Join::JOIN_TYPE_LEFT || $joinType == AST\Join::JOIN_TYPE_LEFTOUTER) ? ' LEFT JOIN ' : ' INNER JOIN '; |
@@ -1024,7 +1024,7 @@ discard block |
||
1024 | 1024 | $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform); |
1025 | 1025 | $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform); |
1026 | 1026 | |
1027 | - $conditions[] = $targetTableAlias . '.' . $quotedTargetColumn . ' = ' . $joinTableAlias . '.' . $quotedSourceColumn; |
|
1027 | + $conditions[] = $targetTableAlias.'.'.$quotedTargetColumn.' = '.$joinTableAlias.'.'.$quotedSourceColumn; |
|
1028 | 1028 | } |
1029 | 1029 | |
1030 | 1030 | // Apply remaining inheritance restrictions |
@@ -1042,7 +1042,7 @@ discard block |
||
1042 | 1042 | } |
1043 | 1043 | |
1044 | 1044 | $targetTableJoin = [ |
1045 | - 'table' => $targetTableName . ' ' . $targetTableAlias, |
|
1045 | + 'table' => $targetTableName.' '.$targetTableAlias, |
|
1046 | 1046 | 'condition' => implode(' AND ', $conditions), |
1047 | 1047 | ]; |
1048 | 1048 | break; |
@@ -1052,22 +1052,22 @@ discard block |
||
1052 | 1052 | } |
1053 | 1053 | |
1054 | 1054 | // Handle WITH clause |
1055 | - $withCondition = (null === $condExpr) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')'); |
|
1055 | + $withCondition = (null === $condExpr) ? '' : ('('.$this->walkConditionalExpression($condExpr).')'); |
|
1056 | 1056 | |
1057 | 1057 | if ($targetClass->isInheritanceTypeJoined()) { |
1058 | 1058 | $ctiJoins = $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias); |
1059 | 1059 | // If we have WITH condition, we need to build nested joins for target class table and cti joins |
1060 | 1060 | if ($withCondition) { |
1061 | - $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition']; |
|
1061 | + $sql .= '('.$targetTableJoin['table'].$ctiJoins.') ON '.$targetTableJoin['condition']; |
|
1062 | 1062 | } else { |
1063 | - $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins; |
|
1063 | + $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'].$ctiJoins; |
|
1064 | 1064 | } |
1065 | 1065 | } else { |
1066 | - $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition']; |
|
1066 | + $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition']; |
|
1067 | 1067 | } |
1068 | 1068 | |
1069 | 1069 | if ($withCondition) { |
1070 | - $sql .= ' AND ' . $withCondition; |
|
1070 | + $sql .= ' AND '.$withCondition; |
|
1071 | 1071 | } |
1072 | 1072 | |
1073 | 1073 | // Apply the indexes |
@@ -1100,7 +1100,7 @@ discard block |
||
1100 | 1100 | $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems); |
1101 | 1101 | } |
1102 | 1102 | |
1103 | - return ' ORDER BY ' . implode(', ', $orderByItems); |
|
1103 | + return ' ORDER BY '.implode(', ', $orderByItems); |
|
1104 | 1104 | } |
1105 | 1105 | |
1106 | 1106 | /** |
@@ -1117,10 +1117,10 @@ discard block |
||
1117 | 1117 | $this->orderedColumnsMap[$sql] = $type; |
1118 | 1118 | |
1119 | 1119 | if ($expr instanceof AST\Subselect) { |
1120 | - return '(' . $sql . ') ' . $type; |
|
1120 | + return '('.$sql.') '.$type; |
|
1121 | 1121 | } |
1122 | 1122 | |
1123 | - return $sql . ' ' . $type; |
|
1123 | + return $sql.' '.$type; |
|
1124 | 1124 | } |
1125 | 1125 | |
1126 | 1126 | /** |
@@ -1128,7 +1128,7 @@ discard block |
||
1128 | 1128 | */ |
1129 | 1129 | public function walkHavingClause($havingClause) |
1130 | 1130 | { |
1131 | - return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression); |
|
1131 | + return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression); |
|
1132 | 1132 | } |
1133 | 1133 | |
1134 | 1134 | /** |
@@ -1151,7 +1151,7 @@ discard block |
||
1151 | 1151 | $conditions = []; |
1152 | 1152 | |
1153 | 1153 | if ($join->conditionalExpression) { |
1154 | - $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')'; |
|
1154 | + $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')'; |
|
1155 | 1155 | } |
1156 | 1156 | |
1157 | 1157 | $isUnconditionalJoin = empty($conditions); |
@@ -1159,7 +1159,7 @@ discard block |
||
1159 | 1159 | ? ' AND ' |
1160 | 1160 | : ' ON '; |
1161 | 1161 | |
1162 | - $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, !$isUnconditionalJoin); |
|
1162 | + $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, ! $isUnconditionalJoin); |
|
1163 | 1163 | |
1164 | 1164 | // Apply remaining inheritance restrictions |
1165 | 1165 | $discrSql = $this->_generateDiscriminatorColumnConditionSQL([$dqlAlias]); |
@@ -1176,7 +1176,7 @@ discard block |
||
1176 | 1176 | } |
1177 | 1177 | |
1178 | 1178 | if ($conditions) { |
1179 | - $sql .= $condExprConjunction . implode(' AND ', $conditions); |
|
1179 | + $sql .= $condExprConjunction.implode(' AND ', $conditions); |
|
1180 | 1180 | } |
1181 | 1181 | |
1182 | 1182 | break; |
@@ -1206,7 +1206,7 @@ discard block |
||
1206 | 1206 | $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression); |
1207 | 1207 | } |
1208 | 1208 | |
1209 | - $sql .= implode(', ', $scalarExpressions) . ')'; |
|
1209 | + $sql .= implode(', ', $scalarExpressions).')'; |
|
1210 | 1210 | |
1211 | 1211 | return $sql; |
1212 | 1212 | } |
@@ -1228,7 +1228,7 @@ discard block |
||
1228 | 1228 | ? $this->conn->quote($nullIfExpression->secondExpression) |
1229 | 1229 | : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression); |
1230 | 1230 | |
1231 | - return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')'; |
|
1231 | + return 'NULLIF('.$firstExpression.', '.$secondExpression.')'; |
|
1232 | 1232 | } |
1233 | 1233 | |
1234 | 1234 | /** |
@@ -1243,11 +1243,11 @@ discard block |
||
1243 | 1243 | $sql = 'CASE'; |
1244 | 1244 | |
1245 | 1245 | foreach ($generalCaseExpression->whenClauses as $whenClause) { |
1246 | - $sql .= ' WHEN ' . $this->walkConditionalExpression($whenClause->caseConditionExpression); |
|
1247 | - $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression); |
|
1246 | + $sql .= ' WHEN '.$this->walkConditionalExpression($whenClause->caseConditionExpression); |
|
1247 | + $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression); |
|
1248 | 1248 | } |
1249 | 1249 | |
1250 | - $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END'; |
|
1250 | + $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression).' END'; |
|
1251 | 1251 | |
1252 | 1252 | return $sql; |
1253 | 1253 | } |
@@ -1261,14 +1261,14 @@ discard block |
||
1261 | 1261 | */ |
1262 | 1262 | public function walkSimpleCaseExpression($simpleCaseExpression) |
1263 | 1263 | { |
1264 | - $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand); |
|
1264 | + $sql = 'CASE '.$this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand); |
|
1265 | 1265 | |
1266 | 1266 | foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) { |
1267 | - $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression); |
|
1268 | - $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression); |
|
1267 | + $sql .= ' WHEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression); |
|
1268 | + $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression); |
|
1269 | 1269 | } |
1270 | 1270 | |
1271 | - $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END'; |
|
1271 | + $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END'; |
|
1272 | 1272 | |
1273 | 1273 | return $sql; |
1274 | 1274 | } |
@@ -1302,14 +1302,14 @@ discard block |
||
1302 | 1302 | $fieldMapping = $class->fieldMappings[$fieldName]; |
1303 | 1303 | $columnName = $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform); |
1304 | 1304 | $columnAlias = $this->getSQLColumnAlias($fieldMapping['columnName']); |
1305 | - $col = $sqlTableAlias . '.' . $columnName; |
|
1305 | + $col = $sqlTableAlias.'.'.$columnName; |
|
1306 | 1306 | |
1307 | 1307 | if (isset($fieldMapping['requireSQLConversion'])) { |
1308 | 1308 | $type = Type::getType($fieldMapping['type']); |
1309 | 1309 | $col = $type->convertToPHPValueSQL($col, $this->conn->getDatabasePlatform()); |
1310 | 1310 | } |
1311 | 1311 | |
1312 | - $sql .= $col . ' AS ' . $columnAlias; |
|
1312 | + $sql .= $col.' AS '.$columnAlias; |
|
1313 | 1313 | |
1314 | 1314 | $this->scalarResultAliasMap[$resultAlias] = $columnAlias; |
1315 | 1315 | |
@@ -1334,7 +1334,7 @@ discard block |
||
1334 | 1334 | $columnAlias = $this->getSQLColumnAlias('sclr'); |
1335 | 1335 | $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; |
1336 | 1336 | |
1337 | - $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias; |
|
1337 | + $sql .= $expr->dispatch($this).' AS '.$columnAlias; |
|
1338 | 1338 | |
1339 | 1339 | $this->scalarResultAliasMap[$resultAlias] = $columnAlias; |
1340 | 1340 | |
@@ -1348,7 +1348,7 @@ discard block |
||
1348 | 1348 | $columnAlias = $this->getSQLColumnAlias('sclr'); |
1349 | 1349 | $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; |
1350 | 1350 | |
1351 | - $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias; |
|
1351 | + $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias; |
|
1352 | 1352 | |
1353 | 1353 | $this->scalarResultAliasMap[$resultAlias] = $columnAlias; |
1354 | 1354 | |
@@ -1359,7 +1359,7 @@ discard block |
||
1359 | 1359 | break; |
1360 | 1360 | |
1361 | 1361 | case ($expr instanceof AST\NewObjectExpression): |
1362 | - $sql .= $this->walkNewObject($expr,$selectExpression->fieldIdentificationVariable); |
|
1362 | + $sql .= $this->walkNewObject($expr, $selectExpression->fieldIdentificationVariable); |
|
1363 | 1363 | break; |
1364 | 1364 | |
1365 | 1365 | default: |
@@ -1400,14 +1400,14 @@ discard block |
||
1400 | 1400 | $columnAlias = $this->getSQLColumnAlias($mapping['columnName']); |
1401 | 1401 | $quotedColumnName = $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform); |
1402 | 1402 | |
1403 | - $col = $sqlTableAlias . '.' . $quotedColumnName; |
|
1403 | + $col = $sqlTableAlias.'.'.$quotedColumnName; |
|
1404 | 1404 | |
1405 | 1405 | if (isset($mapping['requireSQLConversion'])) { |
1406 | 1406 | $type = Type::getType($mapping['type']); |
1407 | 1407 | $col = $type->convertToPHPValueSQL($col, $this->platform); |
1408 | 1408 | } |
1409 | 1409 | |
1410 | - $sqlParts[] = $col . ' AS '. $columnAlias; |
|
1410 | + $sqlParts[] = $col.' AS '.$columnAlias; |
|
1411 | 1411 | |
1412 | 1412 | $this->scalarResultAliasMap[$resultAlias][] = $columnAlias; |
1413 | 1413 | |
@@ -1424,21 +1424,21 @@ discard block |
||
1424 | 1424 | $sqlTableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias); |
1425 | 1425 | |
1426 | 1426 | foreach ($subClass->fieldMappings as $fieldName => $mapping) { |
1427 | - if (isset($mapping['inherited']) || ($partialFieldSet && !in_array($fieldName, $partialFieldSet))) { |
|
1427 | + if (isset($mapping['inherited']) || ($partialFieldSet && ! in_array($fieldName, $partialFieldSet))) { |
|
1428 | 1428 | continue; |
1429 | 1429 | } |
1430 | 1430 | |
1431 | 1431 | $columnAlias = $this->getSQLColumnAlias($mapping['columnName']); |
1432 | 1432 | $quotedColumnName = $this->quoteStrategy->getColumnName($fieldName, $subClass, $this->platform); |
1433 | 1433 | |
1434 | - $col = $sqlTableAlias . '.' . $quotedColumnName; |
|
1434 | + $col = $sqlTableAlias.'.'.$quotedColumnName; |
|
1435 | 1435 | |
1436 | 1436 | if (isset($mapping['requireSQLConversion'])) { |
1437 | 1437 | $type = Type::getType($mapping['type']); |
1438 | 1438 | $col = $type->convertToPHPValueSQL($col, $this->platform); |
1439 | 1439 | } |
1440 | 1440 | |
1441 | - $sqlParts[] = $col . ' AS ' . $columnAlias; |
|
1441 | + $sqlParts[] = $col.' AS '.$columnAlias; |
|
1442 | 1442 | |
1443 | 1443 | $this->scalarResultAliasMap[$resultAlias][] = $columnAlias; |
1444 | 1444 | |
@@ -1458,7 +1458,7 @@ discard block |
||
1458 | 1458 | */ |
1459 | 1459 | public function walkQuantifiedExpression($qExpr) |
1460 | 1460 | { |
1461 | - return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')'; |
|
1461 | + return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')'; |
|
1462 | 1462 | } |
1463 | 1463 | |
1464 | 1464 | /** |
@@ -1498,7 +1498,7 @@ discard block |
||
1498 | 1498 | $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl); |
1499 | 1499 | } |
1500 | 1500 | |
1501 | - return ' FROM ' . implode(', ', $sqlParts); |
|
1501 | + return ' FROM '.implode(', ', $sqlParts); |
|
1502 | 1502 | } |
1503 | 1503 | |
1504 | 1504 | /** |
@@ -1506,7 +1506,7 @@ discard block |
||
1506 | 1506 | */ |
1507 | 1507 | public function walkSimpleSelectClause($simpleSelectClause) |
1508 | 1508 | { |
1509 | - return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '') |
|
1509 | + return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '') |
|
1510 | 1510 | . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression); |
1511 | 1511 | } |
1512 | 1512 | |
@@ -1525,10 +1525,10 @@ discard block |
||
1525 | 1525 | * @param null|string $newObjectResultAlias |
1526 | 1526 | * @return string The SQL. |
1527 | 1527 | */ |
1528 | - public function walkNewObject($newObjectExpression, $newObjectResultAlias=null) |
|
1528 | + public function walkNewObject($newObjectExpression, $newObjectResultAlias = null) |
|
1529 | 1529 | { |
1530 | 1530 | $sqlSelectExpressions = []; |
1531 | - $objIndex = $newObjectResultAlias?:$this->newObjectCounter++; |
|
1531 | + $objIndex = $newObjectResultAlias ?: $this->newObjectCounter++; |
|
1532 | 1532 | |
1533 | 1533 | foreach ($newObjectExpression->args as $argIndex => $e) { |
1534 | 1534 | $resultAlias = $this->scalarResultCounter++; |
@@ -1541,7 +1541,7 @@ discard block |
||
1541 | 1541 | break; |
1542 | 1542 | |
1543 | 1543 | case ($e instanceof AST\Subselect): |
1544 | - $sqlSelectExpressions[] = '(' . $e->dispatch($this) . ') AS ' . $columnAlias; |
|
1544 | + $sqlSelectExpressions[] = '('.$e->dispatch($this).') AS '.$columnAlias; |
|
1545 | 1545 | break; |
1546 | 1546 | |
1547 | 1547 | case ($e instanceof AST\PathExpression): |
@@ -1550,7 +1550,7 @@ discard block |
||
1550 | 1550 | $class = $qComp['metadata']; |
1551 | 1551 | $fieldType = $class->fieldMappings[$e->field]['type']; |
1552 | 1552 | |
1553 | - $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias; |
|
1553 | + $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias; |
|
1554 | 1554 | break; |
1555 | 1555 | |
1556 | 1556 | case ($e instanceof AST\Literal): |
@@ -1564,11 +1564,11 @@ discard block |
||
1564 | 1564 | break; |
1565 | 1565 | } |
1566 | 1566 | |
1567 | - $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias; |
|
1567 | + $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias; |
|
1568 | 1568 | break; |
1569 | 1569 | |
1570 | 1570 | default: |
1571 | - $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias; |
|
1571 | + $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias; |
|
1572 | 1572 | break; |
1573 | 1573 | } |
1574 | 1574 | |
@@ -1601,10 +1601,10 @@ discard block |
||
1601 | 1601 | case ($expr instanceof AST\Subselect): |
1602 | 1602 | $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; |
1603 | 1603 | |
1604 | - $columnAlias = 'sclr' . $this->aliasCounter++; |
|
1604 | + $columnAlias = 'sclr'.$this->aliasCounter++; |
|
1605 | 1605 | $this->scalarResultAliasMap[$alias] = $columnAlias; |
1606 | 1606 | |
1607 | - $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias; |
|
1607 | + $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias; |
|
1608 | 1608 | break; |
1609 | 1609 | |
1610 | 1610 | case ($expr instanceof AST\Functions\FunctionNode): |
@@ -1621,7 +1621,7 @@ discard block |
||
1621 | 1621 | $columnAlias = $this->getSQLColumnAlias('sclr'); |
1622 | 1622 | $this->scalarResultAliasMap[$alias] = $columnAlias; |
1623 | 1623 | |
1624 | - $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias; |
|
1624 | + $sql .= $expr->dispatch($this).' AS '.$columnAlias; |
|
1625 | 1625 | break; |
1626 | 1626 | |
1627 | 1627 | case ($expr instanceof AST\ParenthesisExpression): |
@@ -1641,8 +1641,8 @@ discard block |
||
1641 | 1641 | */ |
1642 | 1642 | public function walkAggregateExpression($aggExpression) |
1643 | 1643 | { |
1644 | - return $aggExpression->functionName . '(' . ($aggExpression->isDistinct ? 'DISTINCT ' : '') |
|
1645 | - . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression) . ')'; |
|
1644 | + return $aggExpression->functionName.'('.($aggExpression->isDistinct ? 'DISTINCT ' : '') |
|
1645 | + . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression).')'; |
|
1646 | 1646 | } |
1647 | 1647 | |
1648 | 1648 | /** |
@@ -1656,7 +1656,7 @@ discard block |
||
1656 | 1656 | $sqlParts[] = $this->walkGroupByItem($groupByItem); |
1657 | 1657 | } |
1658 | 1658 | |
1659 | - return ' GROUP BY ' . implode(', ', $sqlParts); |
|
1659 | + return ' GROUP BY '.implode(', ', $sqlParts); |
|
1660 | 1660 | } |
1661 | 1661 | |
1662 | 1662 | /** |
@@ -1713,7 +1713,7 @@ discard block |
||
1713 | 1713 | { |
1714 | 1714 | $class = $this->em->getClassMetadata($deleteClause->abstractSchemaName); |
1715 | 1715 | $tableName = $class->getTableName(); |
1716 | - $sql = 'DELETE FROM ' . $this->quoteStrategy->getTableName($class, $this->platform); |
|
1716 | + $sql = 'DELETE FROM '.$this->quoteStrategy->getTableName($class, $this->platform); |
|
1717 | 1717 | |
1718 | 1718 | $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable); |
1719 | 1719 | $this->rootAliases[] = $deleteClause->aliasIdentificationVariable; |
@@ -1728,12 +1728,12 @@ discard block |
||
1728 | 1728 | { |
1729 | 1729 | $class = $this->em->getClassMetadata($updateClause->abstractSchemaName); |
1730 | 1730 | $tableName = $class->getTableName(); |
1731 | - $sql = 'UPDATE ' . $this->quoteStrategy->getTableName($class, $this->platform); |
|
1731 | + $sql = 'UPDATE '.$this->quoteStrategy->getTableName($class, $this->platform); |
|
1732 | 1732 | |
1733 | 1733 | $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable); |
1734 | 1734 | $this->rootAliases[] = $updateClause->aliasIdentificationVariable; |
1735 | 1735 | |
1736 | - $sql .= ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems)); |
|
1736 | + $sql .= ' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems)); |
|
1737 | 1737 | |
1738 | 1738 | return $sql; |
1739 | 1739 | } |
@@ -1746,7 +1746,7 @@ discard block |
||
1746 | 1746 | $useTableAliasesBefore = $this->useSqlTableAliases; |
1747 | 1747 | $this->useSqlTableAliases = false; |
1748 | 1748 | |
1749 | - $sql = $this->walkPathExpression($updateItem->pathExpression) . ' = '; |
|
1749 | + $sql = $this->walkPathExpression($updateItem->pathExpression).' = '; |
|
1750 | 1750 | $newValue = $updateItem->newValue; |
1751 | 1751 | |
1752 | 1752 | switch (true) { |
@@ -1789,7 +1789,7 @@ discard block |
||
1789 | 1789 | |
1790 | 1790 | if (count($filterClauses)) { |
1791 | 1791 | if ($condSql) { |
1792 | - $condSql = '(' . $condSql . ') AND '; |
|
1792 | + $condSql = '('.$condSql.') AND '; |
|
1793 | 1793 | } |
1794 | 1794 | |
1795 | 1795 | $condSql .= implode(' AND ', $filterClauses); |
@@ -1797,11 +1797,11 @@ discard block |
||
1797 | 1797 | } |
1798 | 1798 | |
1799 | 1799 | if ($condSql) { |
1800 | - return ' WHERE ' . (( ! $discrSql) ? $condSql : '(' . $condSql . ') AND ' . $discrSql); |
|
1800 | + return ' WHERE '.(( ! $discrSql) ? $condSql : '('.$condSql.') AND '.$discrSql); |
|
1801 | 1801 | } |
1802 | 1802 | |
1803 | 1803 | if ($discrSql) { |
1804 | - return ' WHERE ' . $discrSql; |
|
1804 | + return ' WHERE '.$discrSql; |
|
1805 | 1805 | } |
1806 | 1806 | |
1807 | 1807 | return ''; |
@@ -1844,7 +1844,7 @@ discard block |
||
1844 | 1844 | // if only one ConditionalPrimary is defined |
1845 | 1845 | return ( ! ($factor instanceof AST\ConditionalFactor)) |
1846 | 1846 | ? $this->walkConditionalPrimary($factor) |
1847 | - : ($factor->not ? 'NOT ' : '') . $this->walkConditionalPrimary($factor->conditionalPrimary); |
|
1847 | + : ($factor->not ? 'NOT ' : '').$this->walkConditionalPrimary($factor->conditionalPrimary); |
|
1848 | 1848 | } |
1849 | 1849 | |
1850 | 1850 | /** |
@@ -1859,7 +1859,7 @@ discard block |
||
1859 | 1859 | if ($primary->isConditionalExpression()) { |
1860 | 1860 | $condExpr = $primary->conditionalExpression; |
1861 | 1861 | |
1862 | - return '(' . $this->walkConditionalExpression($condExpr) . ')'; |
|
1862 | + return '('.$this->walkConditionalExpression($condExpr).')'; |
|
1863 | 1863 | } |
1864 | 1864 | } |
1865 | 1865 | |
@@ -1870,7 +1870,7 @@ discard block |
||
1870 | 1870 | { |
1871 | 1871 | $sql = ($existsExpr->not) ? 'NOT ' : ''; |
1872 | 1872 | |
1873 | - $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')'; |
|
1873 | + $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')'; |
|
1874 | 1874 | |
1875 | 1875 | return $sql; |
1876 | 1876 | } |
@@ -1914,7 +1914,7 @@ discard block |
||
1914 | 1914 | $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName()); |
1915 | 1915 | $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias); |
1916 | 1916 | |
1917 | - $sql .= $this->quoteStrategy->getTableName($targetClass, $this->platform) . ' ' . $targetTableAlias . ' WHERE '; |
|
1917 | + $sql .= $this->quoteStrategy->getTableName($targetClass, $this->platform).' '.$targetTableAlias.' WHERE '; |
|
1918 | 1918 | |
1919 | 1919 | $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']]; |
1920 | 1920 | $sqlParts = []; |
@@ -1922,7 +1922,7 @@ discard block |
||
1922 | 1922 | foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) { |
1923 | 1923 | $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $this->platform); |
1924 | 1924 | |
1925 | - $sqlParts[] = $sourceTableAlias . '.' . $targetColumn . ' = ' . $targetTableAlias . '.' . $sourceColumn; |
|
1925 | + $sqlParts[] = $sourceTableAlias.'.'.$targetColumn.' = '.$targetTableAlias.'.'.$sourceColumn; |
|
1926 | 1926 | } |
1927 | 1927 | |
1928 | 1928 | foreach ($this->quoteStrategy->getIdentifierColumnNames($targetClass, $this->platform) as $targetColumnName) { |
@@ -1930,7 +1930,7 @@ discard block |
||
1930 | 1930 | $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++); |
1931 | 1931 | } |
1932 | 1932 | |
1933 | - $sqlParts[] = $targetTableAlias . '.' . $targetColumnName . ' = ' . $entitySql; |
|
1933 | + $sqlParts[] = $targetTableAlias.'.'.$targetColumnName.' = '.$entitySql; |
|
1934 | 1934 | } |
1935 | 1935 | |
1936 | 1936 | $sql .= implode(' AND ', $sqlParts); |
@@ -1946,8 +1946,8 @@ discard block |
||
1946 | 1946 | $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias); |
1947 | 1947 | |
1948 | 1948 | // join to target table |
1949 | - $sql .= $this->quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $this->platform) . ' ' . $joinTableAlias |
|
1950 | - . ' INNER JOIN ' . $this->quoteStrategy->getTableName($targetClass, $this->platform) . ' ' . $targetTableAlias . ' ON '; |
|
1949 | + $sql .= $this->quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $this->platform).' '.$joinTableAlias |
|
1950 | + . ' INNER JOIN '.$this->quoteStrategy->getTableName($targetClass, $this->platform).' '.$targetTableAlias.' ON '; |
|
1951 | 1951 | |
1952 | 1952 | // join conditions |
1953 | 1953 | $joinColumns = $assoc['isOwningSide'] ? $joinTable['inverseJoinColumns'] : $joinTable['joinColumns']; |
@@ -1956,7 +1956,7 @@ discard block |
||
1956 | 1956 | foreach ($joinColumns as $joinColumn) { |
1957 | 1957 | $targetColumn = $this->quoteStrategy->getColumnName($targetClass->fieldNames[$joinColumn['referencedColumnName']], $targetClass, $this->platform); |
1958 | 1958 | |
1959 | - $joinSqlParts[] = $joinTableAlias . '.' . $joinColumn['name'] . ' = ' . $targetTableAlias . '.' . $targetColumn; |
|
1959 | + $joinSqlParts[] = $joinTableAlias.'.'.$joinColumn['name'].' = '.$targetTableAlias.'.'.$targetColumn; |
|
1960 | 1960 | } |
1961 | 1961 | |
1962 | 1962 | $sql .= implode(' AND ', $joinSqlParts); |
@@ -1968,7 +1968,7 @@ discard block |
||
1968 | 1968 | foreach ($joinColumns as $joinColumn) { |
1969 | 1969 | $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$joinColumn['referencedColumnName']], $class, $this->platform); |
1970 | 1970 | |
1971 | - $sqlParts[] = $joinTableAlias . '.' . $joinColumn['name'] . ' = ' . $sourceTableAlias . '.' . $targetColumn; |
|
1971 | + $sqlParts[] = $joinTableAlias.'.'.$joinColumn['name'].' = '.$sourceTableAlias.'.'.$targetColumn; |
|
1972 | 1972 | } |
1973 | 1973 | |
1974 | 1974 | foreach ($this->quoteStrategy->getIdentifierColumnNames($targetClass, $this->platform) as $targetColumnName) { |
@@ -1976,13 +1976,13 @@ discard block |
||
1976 | 1976 | $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++); |
1977 | 1977 | } |
1978 | 1978 | |
1979 | - $sqlParts[] = $targetTableAlias . '.' . $targetColumnName . ' IN (' . $entitySql . ')'; |
|
1979 | + $sqlParts[] = $targetTableAlias.'.'.$targetColumnName.' IN ('.$entitySql.')'; |
|
1980 | 1980 | } |
1981 | 1981 | |
1982 | 1982 | $sql .= implode(' AND ', $sqlParts); |
1983 | 1983 | } |
1984 | 1984 | |
1985 | - return $sql . ')'; |
|
1985 | + return $sql.')'; |
|
1986 | 1986 | } |
1987 | 1987 | |
1988 | 1988 | /** |
@@ -1993,7 +1993,7 @@ discard block |
||
1993 | 1993 | $sizeFunc = new AST\Functions\SizeFunction('size'); |
1994 | 1994 | $sizeFunc->collectionPathExpression = $emptyCollCompExpr->expression; |
1995 | 1995 | |
1996 | - return $sizeFunc->getSql($this) . ($emptyCollCompExpr->not ? ' > 0' : ' = 0'); |
|
1996 | + return $sizeFunc->getSql($this).($emptyCollCompExpr->not ? ' > 0' : ' = 0'); |
|
1997 | 1997 | } |
1998 | 1998 | |
1999 | 1999 | /** |
@@ -2002,19 +2002,19 @@ discard block |
||
2002 | 2002 | public function walkNullComparisonExpression($nullCompExpr) |
2003 | 2003 | { |
2004 | 2004 | $expression = $nullCompExpr->expression; |
2005 | - $comparison = ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL'; |
|
2005 | + $comparison = ' IS'.($nullCompExpr->not ? ' NOT' : '').' NULL'; |
|
2006 | 2006 | |
2007 | 2007 | // Handle ResultVariable |
2008 | 2008 | if (is_string($expression) && isset($this->queryComponents[$expression]['resultVariable'])) { |
2009 | - return $this->walkResultVariable($expression) . $comparison; |
|
2009 | + return $this->walkResultVariable($expression).$comparison; |
|
2010 | 2010 | } |
2011 | 2011 | |
2012 | 2012 | // Handle InputParameter mapping inclusion to ParserResult |
2013 | 2013 | if ($expression instanceof AST\InputParameter) { |
2014 | - return $this->walkInputParameter($expression) . $comparison; |
|
2014 | + return $this->walkInputParameter($expression).$comparison; |
|
2015 | 2015 | } |
2016 | 2016 | |
2017 | - return $expression->dispatch($this) . $comparison; |
|
2017 | + return $expression->dispatch($this).$comparison; |
|
2018 | 2018 | } |
2019 | 2019 | |
2020 | 2020 | /** |
@@ -2022,7 +2022,7 @@ discard block |
||
2022 | 2022 | */ |
2023 | 2023 | public function walkInExpression($inExpr) |
2024 | 2024 | { |
2025 | - $sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN ('; |
|
2025 | + $sql = $this->walkArithmeticExpression($inExpr->expression).($inExpr->not ? ' NOT' : '').' IN ('; |
|
2026 | 2026 | |
2027 | 2027 | $sql .= ($inExpr->subselect) |
2028 | 2028 | ? $this->walkSubselect($inExpr->subselect) |
@@ -2048,10 +2048,10 @@ discard block |
||
2048 | 2048 | } |
2049 | 2049 | |
2050 | 2050 | if ($this->useSqlTableAliases) { |
2051 | - $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias) . '.'; |
|
2051 | + $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias).'.'; |
|
2052 | 2052 | } |
2053 | 2053 | |
2054 | - $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN '); |
|
2054 | + $sql .= $class->discriminatorColumn['name'].($instanceOfExpr->not ? ' NOT IN ' : ' IN '); |
|
2055 | 2055 | |
2056 | 2056 | $sqlParameterList = []; |
2057 | 2057 | |
@@ -2081,7 +2081,7 @@ discard block |
||
2081 | 2081 | $sqlParameterList[] = $this->conn->quote($discriminatorValue); |
2082 | 2082 | } |
2083 | 2083 | |
2084 | - $sql .= '(' . implode(', ', $sqlParameterList) . ')'; |
|
2084 | + $sql .= '('.implode(', ', $sqlParameterList).')'; |
|
2085 | 2085 | |
2086 | 2086 | return $sql; |
2087 | 2087 | } |
@@ -2127,8 +2127,8 @@ discard block |
||
2127 | 2127 | $sql .= ' NOT'; |
2128 | 2128 | } |
2129 | 2129 | |
2130 | - $sql .= ' BETWEEN ' . $this->walkArithmeticExpression($betweenExpr->leftBetweenExpression) |
|
2131 | - . ' AND ' . $this->walkArithmeticExpression($betweenExpr->rightBetweenExpression); |
|
2130 | + $sql .= ' BETWEEN '.$this->walkArithmeticExpression($betweenExpr->leftBetweenExpression) |
|
2131 | + . ' AND '.$this->walkArithmeticExpression($betweenExpr->rightBetweenExpression); |
|
2132 | 2132 | |
2133 | 2133 | return $sql; |
2134 | 2134 | } |
@@ -2143,7 +2143,7 @@ discard block |
||
2143 | 2143 | ? $this->walkResultVariable($stringExpr) |
2144 | 2144 | : $stringExpr->dispatch($this); |
2145 | 2145 | |
2146 | - $sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE '; |
|
2146 | + $sql = $leftExpr.($likeExpr->not ? ' NOT' : '').' LIKE '; |
|
2147 | 2147 | |
2148 | 2148 | if ($likeExpr->stringPattern instanceof AST\InputParameter) { |
2149 | 2149 | $sql .= $this->walkInputParameter($likeExpr->stringPattern); |
@@ -2156,7 +2156,7 @@ discard block |
||
2156 | 2156 | } |
2157 | 2157 | |
2158 | 2158 | if ($likeExpr->escapeChar) { |
2159 | - $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar); |
|
2159 | + $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar); |
|
2160 | 2160 | } |
2161 | 2161 | |
2162 | 2162 | return $sql; |
@@ -2183,7 +2183,7 @@ discard block |
||
2183 | 2183 | ? $leftExpr->dispatch($this) |
2184 | 2184 | : (is_numeric($leftExpr) ? $leftExpr : $this->conn->quote($leftExpr)); |
2185 | 2185 | |
2186 | - $sql .= ' ' . $compExpr->operator . ' '; |
|
2186 | + $sql .= ' '.$compExpr->operator.' '; |
|
2187 | 2187 | |
2188 | 2188 | $sql .= ($rightExpr instanceof AST\Node) |
2189 | 2189 | ? $rightExpr->dispatch($this) |
@@ -2215,7 +2215,7 @@ discard block |
||
2215 | 2215 | { |
2216 | 2216 | return ($arithmeticExpr->isSimpleArithmeticExpression()) |
2217 | 2217 | ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression) |
2218 | - : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')'; |
|
2218 | + : '('.$this->walkSubselect($arithmeticExpr->subselect).')'; |
|
2219 | 2219 | } |
2220 | 2220 | |
2221 | 2221 | /** |
@@ -2269,7 +2269,7 @@ discard block |
||
2269 | 2269 | |
2270 | 2270 | $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : ''); |
2271 | 2271 | |
2272 | - return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary); |
|
2272 | + return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary); |
|
2273 | 2273 | } |
2274 | 2274 | |
2275 | 2275 | /** |
@@ -2282,7 +2282,7 @@ discard block |
||
2282 | 2282 | public function walkArithmeticPrimary($primary) |
2283 | 2283 | { |
2284 | 2284 | if ($primary instanceof AST\SimpleArithmeticExpression) { |
2285 | - return '(' . $this->walkSimpleArithmeticExpression($primary) . ')'; |
|
2285 | + return '('.$this->walkSimpleArithmeticExpression($primary).')'; |
|
2286 | 2286 | } |
2287 | 2287 | |
2288 | 2288 | if ($primary instanceof AST\Node) { |