|
@@ -115,7 +115,7 @@ discard block |
|
|
block discarded – undo |
|
115
|
115
|
|
|
116
|
116
|
$needle = $prevEntityAlias . '_' . $currentEntityAlias; |
|
117
|
117
|
|
|
118
|
|
- return ! in_array($needle, $this->joins); |
|
|
118
|
+ return !in_array($needle, $this->joins); |
|
119
|
119
|
} |
|
120
|
120
|
|
|
121
|
121
|
private function storeJoin($prevEntityAlias, $currentEntityAlias) |
|
@@ -274,7 +274,7 @@ discard block |
|
|
block discarded – undo |
|
274
|
274
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
275
|
275
|
|
|
276
|
276
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
277
|
|
- $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
277
|
+ $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
278
|
278
|
|
|
279
|
279
|
$salt = '_' . random_int(111, 999); |
|
280
|
280
|
|
|
@@ -367,7 +367,7 @@ discard block |
|
|
block discarded – undo |
|
367
|
367
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
368
|
368
|
|
|
369
|
369
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
370
|
|
- $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
370
|
+ $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
371
|
371
|
|
|
372
|
372
|
$salt = '_' . random_int(111, 999); |
|
373
|
373
|
|
|
@@ -377,7 +377,7 @@ discard block |
|
|
block discarded – undo |
|
377
|
377
|
if ($filterObject->isListType()) { |
|
378
|
378
|
$whereCondition .= ' (:field_' . $embeddableFieldName . $salt . ')'; |
|
379
|
379
|
} else { |
|
380
|
|
- $whereCondition .=' :field_' . $embeddableFieldName . $salt; |
|
|
380
|
+ $whereCondition .= ' :field_' . $embeddableFieldName . $salt; |
|
381
|
381
|
} |
|
382
|
382
|
|
|
383
|
383
|
if (null != $orCondition['orCondition']) { |
|
@@ -429,7 +429,7 @@ discard block |
|
|
block discarded – undo |
|
429
|
429
|
if (in_array($fieldName, $this->fields)) { |
|
430
|
430
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
431
|
431
|
$this->ensureQueryBuilderIsDefined(); |
|
432
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
432
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
433
|
433
|
} |
|
434
|
434
|
|
|
435
|
435
|
if (strstr($sort, '_embedded.')) { |
|
@@ -440,7 +440,7 @@ discard block |
|
|
block discarded – undo |
|
440
|
440
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
441
|
441
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
442
|
442
|
|
|
443
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
443
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
444
|
444
|
} |
|
445
|
445
|
|
|
446
|
446
|
} |
|
@@ -515,7 +515,7 @@ discard block |
|
|
block discarded – undo |
|
515
|
515
|
return $this->pageLength; |
|
516
|
516
|
} |
|
517
|
517
|
|
|
518
|
|
- public function setSelect( $select) : QueryBuilderFactory |
|
|
518
|
+ public function setSelect($select) : QueryBuilderFactory |
|
519
|
519
|
{ |
|
520
|
520
|
$this->select = $select; |
|
521
|
521
|
|