Skip to content

fix hash extra conditions for joins #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dimadimx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix hash extra conditions for joins #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 22 additions & 7 deletions lib/Skeleton/Pager/Pager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,11 @@ protected static function get_options_from_hash($hash) {

if (isset($options['joins']) and is_array($options['joins'])) {
$joins = [];
foreach ($options['joins'] as $join) {
$joins[] = new Join($join['remote_table'], $join['remote_id'], $join['local_field'], $join['conditions']);
foreach ($options['joins'] as $join_key => $join) {
$joins[$join_key] = new Join($join['remote_table'], $join['remote_id'], $join['local_field']);
foreach ($join['conditions'] as $condition) {
$joins[$join_key]->add_condition(new Condition($condition['local_field'], $condition['comparison'], $condition['value']));
}
}

$options['joins'] = $joins;
Expand Down Expand Up @@ -488,6 +491,10 @@ public function create_options_hash($conditions = null, $page = null, $sort = nu
$direction = $this->options['direction'];
}

if ($joins === null) {
$joins = $this->options['joins'];
}

if ($per_page === null) {
$per_page = $this->options['per_page'];
}
Expand All @@ -512,13 +519,21 @@ public function create_options_hash($conditions = null, $page = null, $sort = nu
$flat_conditions = $conditions;
}

$joins = [];
foreach ($this->options['joins'] as $join) {
$joins[] = [
$flat_joins = [];
foreach ($joins as $join) {
$extra_conditions = [];
foreach ($join->get_conditions() as $condition) {
$extra_conditions[] = [
'local_field' => $condition->get_local_field(),
'value' => $condition->get_value(),
'comparison' => $condition->get_comparison(),
];
}
$flat_joins[] = [
'remote_table' => $join->get_remote_table(),
'remote_id' => $join->get_remote_id(),
'local_field' => $join->get_local_field(),
'conditions' => $join->get_conditions(),
'conditions' => $extra_conditions,
];
}

Expand All @@ -528,7 +543,7 @@ public function create_options_hash($conditions = null, $page = null, $sort = nu
'page' => $page,
'sort' => $sort,
'direction' => $direction,
'joins' => $joins,
'joins' => $flat_joins,
'per_page' => $per_page,
];

Expand Down