|
@@ -116,7 +116,7 @@ discard block |
|
|
block discarded – undo |
|
116
|
116
|
|
|
117
|
117
|
$needle = $prevEntityAlias . '_' . $currentEntityAlias; |
|
118
|
118
|
|
|
119
|
|
- return ! in_array($needle, $this->joins); |
|
|
119
|
+ return !in_array($needle, $this->joins); |
|
120
|
120
|
} |
|
121
|
121
|
|
|
122
|
122
|
private function storeJoin($prevEntityAlias, $currentEntityAlias) |
|
@@ -275,7 +275,7 @@ discard block |
|
|
block discarded – undo |
|
275
|
275
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
276
|
276
|
|
|
277
|
277
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
278
|
|
- $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
278
|
+ $embeddedFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
279
|
279
|
|
|
280
|
280
|
$salt = '_' . random_int(111, 999); |
|
281
|
281
|
|
|
@@ -368,7 +368,7 @@ discard block |
|
|
block discarded – undo |
|
368
|
368
|
$relationEntityAlias = $this->getRelationEntityAlias(); |
|
369
|
369
|
|
|
370
|
370
|
$embeddedFields = explode('.', $filterObject->getFieldName()); |
|
371
|
|
- $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields)-1]); |
|
|
371
|
+ $embeddableFieldName = $this->parser->camelize($embeddedFields[count($embeddedFields) - 1]); |
|
372
|
372
|
|
|
373
|
373
|
$salt = '_' . random_int(111, 999); |
|
374
|
374
|
|
|
@@ -378,7 +378,7 @@ discard block |
|
|
block discarded – undo |
|
378
|
378
|
if (isset($filterAndOperator[1]) && $op->isListOrNlist()) { |
|
379
|
379
|
$whereCondition .= ' (:field_' . $embeddableFieldName . $salt . ')'; |
|
380
|
380
|
} else { |
|
381
|
|
- $whereCondition .=' :field_' . $embeddableFieldName . $salt; |
|
|
381
|
+ $whereCondition .= ' :field_' . $embeddableFieldName . $salt; |
|
382
|
382
|
} |
|
383
|
383
|
|
|
384
|
384
|
if (null != $orCondition['orCondition']) { |
|
@@ -437,7 +437,7 @@ discard block |
|
|
block discarded – undo |
|
437
|
437
|
); |
|
438
|
438
|
} |
|
439
|
439
|
|
|
440
|
|
- $this->qBuilder->addOrderBy($this->entityAlias .'.'. $fieldName, $direction); |
|
|
440
|
+ $this->qBuilder->addOrderBy($this->entityAlias . '.' . $fieldName, $direction); |
|
441
|
441
|
} |
|
442
|
442
|
|
|
443
|
443
|
if (strstr($sort, '_embedded.')) { |
|
@@ -448,7 +448,7 @@ discard block |
|
|
block discarded – undo |
|
448
|
448
|
$fieldName = $this->parser->camelize($embeddedFields[2]); |
|
449
|
449
|
$direction = ($val === self::DIRECTION_AZ) ? self::DIRECTION_AZ : self::DIRECTION_ZA; |
|
450
|
450
|
|
|
451
|
|
- $this->qBuilder->addOrderBy($relationEntityAlias.'.'.$fieldName, $direction); |
|
|
451
|
+ $this->qBuilder->addOrderBy($relationEntityAlias . '.' . $fieldName, $direction); |
|
452
|
452
|
} |
|
453
|
453
|
|
|
454
|
454
|
} |
|
@@ -523,7 +523,7 @@ discard block |
|
|
block discarded – undo |
|
523
|
523
|
return $this->pageLength; |
|
524
|
524
|
} |
|
525
|
525
|
|
|
526
|
|
- public function setSelect( $select) : QueryBuilderFactory |
|
|
526
|
+ public function setSelect($select) : QueryBuilderFactory |
|
527
|
527
|
{ |
|
528
|
528
|
$this->select = $select; |
|
529
|
529
|
|