|
@@ -106,7 +106,7 @@ discard block |
|
|
block discarded – undo |
|
106
|
106
|
|
|
107
|
107
|
$needle = $prevEntityAlias . '_' . $currentEntityAlias; |
|
108
|
108
|
|
|
109
|
|
- return ! in_array($needle, $this->joins); |
|
|
109
|
+ return !in_array($needle, $this->joins); |
|
110
|
110
|
} |
|
111
|
111
|
|
|
112
|
112
|
private function storeJoin($prevEntityAlias, $currentEntityAlias) |
|
@@ -269,7 +269,7 @@ discard block |
|
|
block discarded – undo |
|
269
|
269
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
270
|
270
|
|
|
271
|
271
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
272
|
|
- $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
272
|
+ $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
273
|
273
|
|
|
274
|
274
|
$salt = ''; |
|
275
|
275
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -376,7 +376,7 @@ discard block |
|
|
block discarded – undo |
|
376
|
376
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
377
|
377
|
|
|
378
|
378
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
379
|
|
- $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
379
|
+ $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
380
|
380
|
|
|
381
|
381
|
$salt = ''; |
|
382
|
382
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -395,7 +395,7 @@ discard block |
|
|
block discarded – undo |
|
395
|
395
|
if (isset($filterAndOperator[1]) && $op->isListOrNlist()) { |
|
396
|
396
|
$whereCondition .= ' (:field_' . $embeddableFieldName . $salt . ')'; |
|
397
|
397
|
} else { |
|
398
|
|
- $whereCondition .=' :field_' . $embeddableFieldName . $salt; |
|
|
398
|
+ $whereCondition .= ' :field_' . $embeddableFieldName . $salt; |
|
399
|
399
|
} |
|
400
|
400
|
|
|
401
|
401
|
if ($orCondition['orCondition'] != null) { |
|
@@ -446,7 +446,7 @@ discard block |
|
|
block discarded – undo |
|
446
|
446
|
|
|
447
|
447
|
if (in_array($fieldName, $this->fields)) { |
|
448
|
448
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
449
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
449
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
450
|
450
|
} |
|
451
|
451
|
|
|
452
|
452
|
if (strstr($sort, '_embedded.')) { |
|
@@ -457,7 +457,7 @@ discard block |
|
|
block discarded – undo |
|
457
|
457
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
458
|
458
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
459
|
459
|
|
|
460
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
460
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
461
|
461
|
} |
|
462
|
462
|
|
|
463
|
463
|
} |
|
@@ -545,7 +545,7 @@ discard block |
|
|
block discarded – undo |
|
545
|
545
|
return $this->pageLength; |
|
546
|
546
|
} |
|
547
|
547
|
|
|
548
|
|
- public function setSelect( $select) : QueryBuilderFactory |
|
|
548
|
+ public function setSelect($select) : QueryBuilderFactory |
|
549
|
549
|
{ |
|
550
|
550
|
$this->select = $select; |
|
551
|
551
|
|