@@ -125,11 +125,11 @@ discard block |
||
| 125 | 125 | */ |
| 126 | 126 | private $_hints = []; |
| 127 | 127 | |
| 128 | - /** |
|
| 129 | - * Whether to use second level cache, if available. |
|
| 130 | - * |
|
| 131 | - * @var boolean |
|
| 132 | - */ |
|
| 128 | + /** |
|
| 129 | + * Whether to use second level cache, if available. |
|
| 130 | + * |
|
| 131 | + * @var boolean |
|
| 132 | + */ |
|
| 133 | 133 | protected $cacheable = false; |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
| 223 | - * Obtain the name of the second level query cache region in which query results will be stored |
|
| 224 | - * |
|
| 225 | - * @return string|null The cache region name; NULL indicates the default region. |
|
| 226 | - */ |
|
| 223 | + * Obtain the name of the second level query cache region in which query results will be stored |
|
| 224 | + * |
|
| 225 | + * @return string|null The cache region name; NULL indicates the default region. |
|
| 226 | + */ |
|
| 227 | 227 | public function getCacheRegion() |
| 228 | 228 | { |
| 229 | 229 | return $this->cacheRegion; |
@@ -1435,10 +1435,10 @@ discard block |
||
| 1435 | 1435 | */ |
| 1436 | 1436 | private function _getDQLForDelete() |
| 1437 | 1437 | { |
| 1438 | - return 'DELETE' |
|
| 1439 | - . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
| 1440 | - . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1441 | - . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1438 | + return 'DELETE' |
|
| 1439 | + . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
| 1440 | + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1441 | + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1442 | 1442 | } |
| 1443 | 1443 | |
| 1444 | 1444 | /** |
@@ -1446,11 +1446,11 @@ discard block |
||
| 1446 | 1446 | */ |
| 1447 | 1447 | private function _getDQLForUpdate() |
| 1448 | 1448 | { |
| 1449 | - return 'UPDATE' |
|
| 1450 | - . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
| 1451 | - . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', ']) |
|
| 1452 | - . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1453 | - . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1449 | + return 'UPDATE' |
|
| 1450 | + . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', ']) |
|
| 1451 | + . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', ']) |
|
| 1452 | + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1453 | + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1454 | 1454 | } |
| 1455 | 1455 | |
| 1456 | 1456 | /** |
@@ -1459,8 +1459,8 @@ discard block |
||
| 1459 | 1459 | private function _getDQLForSelect() |
| 1460 | 1460 | { |
| 1461 | 1461 | $dql = 'SELECT' |
| 1462 | - . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '') |
|
| 1463 | - . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']); |
|
| 1462 | + . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '') |
|
| 1463 | + . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']); |
|
| 1464 | 1464 | |
| 1465 | 1465 | $fromParts = $this->getDQLPart('from'); |
| 1466 | 1466 | $joinParts = $this->getDQLPart('join'); |
@@ -1484,10 +1484,10 @@ discard block |
||
| 1484 | 1484 | } |
| 1485 | 1485 | |
| 1486 | 1486 | $dql .= implode(', ', $fromClauses) |
| 1487 | - . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1488 | - . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', ']) |
|
| 1489 | - . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING ']) |
|
| 1490 | - . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1487 | + . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE ']) |
|
| 1488 | + . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', ']) |
|
| 1489 | + . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING ']) |
|
| 1490 | + . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']); |
|
| 1491 | 1491 | |
| 1492 | 1492 | return $dql; |
| 1493 | 1493 | } |
@@ -1507,8 +1507,8 @@ discard block |
||
| 1507 | 1507 | } |
| 1508 | 1508 | |
| 1509 | 1509 | return (isset($options['pre']) ? $options['pre'] : '') |
| 1510 | - . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart) |
|
| 1511 | - . (isset($options['post']) ? $options['post'] : ''); |
|
| 1510 | + . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart) |
|
| 1511 | + . (isset($options['post']) ? $options['post'] : ''); |
|
| 1512 | 1512 | } |
| 1513 | 1513 | |
| 1514 | 1514 | /** |