Skip to content

Update Node.php to Prevent Key Name Integrity errors of mysql #237

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
MeeDNite wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Node.php to Prevent Key Name Integrity errors of mysql #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10d4b75
Update Node.php
MeeDNite Jul 21, 2016
08e154d
Update Node.php
MeeDNite Jul 21, 2016
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
10 changes: 5 additions & 5 deletions src/Baum/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ public static function buildTree($nodeList) {
* @return \Illuminate\Database\Query\Builder
*/
public function scopeWithoutNode($query, $node) {
return $query->where($node->getKeyName(), '!=', $node->getKey());
return $query->where($node->getQualifiedKeyName(), '!=', $node->getKey());
}

/**
Expand Down Expand Up @@ -568,8 +568,8 @@ public function getRoot() {
*/
public function ancestorsAndSelf() {
return $this->newNestedSetQuery()
->where($this->getLeftColumnName(), '<=', $this->getLeft())
->where($this->getRightColumnName(), '>=', $this->getRight());
->where($this->getQualifiedLeftColumnName(), '<=', $this->getLeft())
->where($this->getQualifiedRightColumnName(), '>=', $this->getRight());
}

/**
Expand Down Expand Up @@ -723,8 +723,8 @@ public function getTrunks($columns = array('*')) {
*/
public function descendantsAndSelf() {
return $this->newNestedSetQuery()
->where($this->getLeftColumnName(), '>=', $this->getLeft())
->where($this->getLeftColumnName(), '<', $this->getRight());
->where($this->getQualifiedLeftColumnName(), '>=', $this->getLeft())
->where($this->getQualifiedLeftColumnName(), '<', $this->getRight());
}

/**
Expand Down