Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions formats/datatables/QuerySegmentListProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function setQuerySegmentList( &$querySegmentList ) {
/**
* @since 2.2
*
* @param integer $queryMode
* @param int $queryMode
*/
public function setQueryMode( $queryMode ) {
$this->queryMode = $queryMode;
Expand Down Expand Up @@ -165,7 +165,7 @@ private function table( QuerySegment &$query ) {

$this->fromTables[$subQuery->alias] = $joinTable;

ksort($this->fromTables);
ksort( $this->fromTables );
$this->joinConditions[$subQuery->alias] = [ $joinType . ' JOIN', "$joinField$op=" . $subQuery->joinfield ];

$query->from .= " $joinType JOIN $t ON $joinField$op=" . $subQuery->joinfield;
Expand Down Expand Up @@ -387,5 +387,4 @@ public function cleanUp() {
$this->temporaryTableBuilder->drop( $this->connection->tableName( $table ) );
}
}

}
19 changes: 9 additions & 10 deletions formats/datatables/SearchPanes.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

namespace SRF\DataTables;

use DataItem as SMWDataItem;
use SMW\DataTypeRegistry;
use SMW\DataValueFactory;
use SMW\DIProperty;
Expand All @@ -28,7 +27,7 @@
use SRF\DataTables;

class SearchPanes {
/** @const DataTables */
/** @var DataTables */
private $datatables;

private array $searchPanesLog = [];
Expand Down Expand Up @@ -696,7 +695,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
];

if ( $threshold < 1 ) {
return [];
return [];
}

$query = $this->datatables->query;
Expand All @@ -721,7 +720,7 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search

$tables = $querySegmentListProcessor->fromTables;
$joins = $querySegmentListProcessor->joinConditions;

$tables[$qobj->alias] = $qobj->joinTable;

$conds = $qobj->where;
Expand Down Expand Up @@ -754,12 +753,12 @@ private function searchPanesMainlabel( PrintRequest $printRequest, array $search
$joins_ = $joins;

$res = $this->connection->select(
$tables_,
$fields_,
$conds_,
__METHOD__,
$sql_options_,
$joins_
$tables_,
$fields_,
$conds_,
__METHOD__,
$sql_options_,
$joins_
);

$diHandler = $this->datatables->store->getDataItemHandlerForDIType(
Expand Down