Skip to content

Fix sort processors for MySQL 8 #46

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
halftrainedharry wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix sort processors for MySQL 8 #46

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions core/components/faqman/processors/mgr/item/remove.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ public function afterRemove() {
*/
$this->modx->exec("
UPDATE {$this->modx->getTableName($this->classKey)}
SET rank = rank - 1
SET `rank` = `rank` - 1
WHERE
`set` = {$this->set}
AND rank > {$this->rank}
AND rank > 0
AND `rank` > {$this->rank}
AND `rank` > 0
");
return true;
}
Expand Down
14 changes: 7 additions & 7 deletions core/components/faqman/processors/mgr/item/sort.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,22 @@ public function process() {
if ($source->get('rank') < $target->get('rank')) {
$this->modx->exec("
UPDATE {$this->modx->getTableName($this->classKey)}
SET rank = rank - 1
SET `rank` = `rank` - 1
WHERE
`set` = " . $this->getProperty('set', false) . "
AND rank <= {$target->get('rank')}
AND rank > {$source->get('rank')}
AND rank > 0
AND `rank` <= {$target->get('rank')}
AND `rank` > {$source->get('rank')}
AND `rank` > 0
");
$newRank = $target->get('rank');
} else {
$this->modx->exec("
UPDATE {$this->modx->getTableName($this->classKey)}
SET rank = rank + 1
SET `rank` = `rank` + 1
WHERE
`set` = " . $this->getProperty('set', false) . "
AND rank >= {$target->get('rank')}
AND rank < {$source->get('rank')}
AND `rank` >= {$target->get('rank')}
AND `rank` < {$source->get('rank')}
");
$newRank = $target->get('rank');
}
Expand Down
14 changes: 7 additions & 7 deletions core/components/faqman/processors/mgr/set/sort.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@ public function process() {
if ($source->get('rank') < $target->get('rank')) {
$this->modx->exec("
UPDATE {$this->modx->getTableName($this->classKey)}
SET rank = rank - 1
SET `rank` = `rank` - 1
WHERE
rank <= {$target->get('rank')}
AND rank > {$source->get('rank')}
AND rank > 0
`rank` <= {$target->get('rank')}
AND `rank` > {$source->get('rank')}
AND `rank` > 0
");
$newRank = $target->get('rank');
} else {
$this->modx->exec("
UPDATE {$this->modx->getTableName($this->classKey)}
SET rank = rank + 1
SET `rank` = `rank` + 1
WHERE
rank >= {$target->get('rank')}
AND rank < {$source->get('rank')}
`rank` >= {$target->get('rank')}
AND `rank` < {$source->get('rank')}
");
$newRank = $target->get('rank');
}
Expand Down