|
@@ -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) |
|
@@ -270,7 +270,7 @@ discard block |
|
|
block discarded – undo |
|
270
|
270
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
271
|
271
|
|
|
272
|
272
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
273
|
|
- $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
273
|
+ $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
274
|
274
|
|
|
275
|
275
|
$salt = ''; |
|
276
|
276
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -377,7 +377,7 @@ discard block |
|
|
block discarded – undo |
|
377
|
377
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
378
|
378
|
|
|
379
|
379
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
380
|
|
- $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
380
|
+ $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
381
|
381
|
|
|
382
|
382
|
$salt = ''; |
|
383
|
383
|
foreach ($this->qBuilder->getParameters() as $parameter) { |
|
@@ -396,7 +396,7 @@ discard block |
|
|
block discarded – undo |
|
396
|
396
|
if (isset($filterAndOperator[1]) && $op->isListOrNlist()) { |
|
397
|
397
|
$whereCondition .= ' (:field_' . $embeddableFieldName . $salt . ')'; |
|
398
|
398
|
} else { |
|
399
|
|
- $whereCondition .=' :field_' . $embeddableFieldName . $salt; |
|
|
399
|
+ $whereCondition .= ' :field_' . $embeddableFieldName . $salt; |
|
400
|
400
|
} |
|
401
|
401
|
|
|
402
|
402
|
if ($orCondition['orCondition'] != null) { |
|
@@ -447,7 +447,7 @@ discard block |
|
|
block discarded – undo |
|
447
|
447
|
|
|
448
|
448
|
if (in_array($fieldName, $this->fields)) { |
|
449
|
449
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
450
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
450
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
451
|
451
|
} |
|
452
|
452
|
|
|
453
|
453
|
if (strstr($sort, '_embedded.')) { |
|
@@ -458,7 +458,7 @@ discard block |
|
|
block discarded – undo |
|
458
|
458
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
459
|
459
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
460
|
460
|
|
|
461
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
461
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
462
|
462
|
} |
|
463
|
463
|
|
|
464
|
464
|
} |
|
@@ -546,7 +546,7 @@ discard block |
|
|
block discarded – undo |
|
546
|
546
|
return $this->pageLength; |
|
547
|
547
|
} |
|
548
|
548
|
|
|
549
|
|
- public function setSelect( $select) : QueryBuilderFactory |
|
|
549
|
+ public function setSelect($select) : QueryBuilderFactory |
|
550
|
550
|
{ |
|
551
|
551
|
$this->select = $select; |
|
552
|
552
|
|