Author: sevein
Date: Sun Oct 10 09:39:27 2010
New Revision: 8042
Log:
Use defined QubitMenu table name constant. Fixes issue 1783.
Modified:
trunk/lib/model/QubitMenu.php
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Sun Oct 10 08:44:16 2010 (r8041)
+++ trunk/lib/model/QubitMenu.php Sun Oct 10 09:39:27 2010 (r8042)
@@ -252,10 +252,10 @@
public function insertBefore(QubitMenu $newMenu, $referenceMenu = null)
{
// TODO: Test if object already exists in hierarchy
- //$sql = "SELECT count(*) as exists FROM q_menu WHERE id =
".$newMenu->getId();
+ //$sql = "SELECT count(*) as exists FROM '.QubitMenu::TABLE_NAME.' WHERE
id = ".$newMenu->getId();
// Lock db, start transaction
- $sql = 'LOCK TABLE q_menu WRITE;';
+ $sql = 'LOCK TABLE '.QubitMenu::TABLE_NAME.' WRITE;';
// TODO: Currently NOT testing for $existingObject
$existingObject = false;
@@ -272,40 +272,40 @@
$newLft = $this->getRgt();
}
- $sql .= 'SELECT @oldlft := lft, @oldrgt := rgt FROM q_menu WHERE id =
'.$newMenu->getId().';';
+ $sql .= 'SELECT @oldlft := lft, @oldrgt := rgt FROM
'.QubitMenu::TABLE_NAME.' WHERE id = '.$newMenu->getId().';';
$sql .= 'SELECT @width := @oldrgt - @oldlft + 1;';
$sql .= 'SELECT @newlft := '.$newLft.';';
$sql .= 'SELECT @newrgt := @newlft + @width - 1;';
$sql .= 'SELECT @shift := @newlft - @oldlft;';
// Make room for $newMenu in new location
- $sql .= 'UPDATE q_menu SET lft = lft + @width WHERE lft >= @newlft;';
- $sql .= 'UPDATE q_menu SET rgt = rgt + @width WHERE rgt >= @newlft;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET lft = lft + @width WHERE
lft >= @newlft;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET rgt = rgt + @width WHERE
rgt >= @newlft;';
if ($newMenu->getLft() < $newLft)
{
// Move $newMenu (+ children) to new location
- $sql .= 'UPDATE q_menu SET lft = lft + @shift WHERE lft >= @oldlft AND
lft <= @oldrgt;';
- $sql .= 'UPDATE q_menu SET rgt = rgt + @shift WHERE rgt >= @oldlft AND
rgt <= @oldrgt;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET lft = lft + @shift WHERE
lft >= @oldlft AND lft <= @oldrgt;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET rgt = rgt + @shift WHERE
rgt >= @oldlft AND rgt <= @oldrgt;';
// Close gap left in $newMenu's old location
- $sql .= 'UPDATE q_menu SET lft = lft - @width WHERE lft > @oldrgt;';
- $sql .= 'UPDATE q_menu SET rgt = rgt - @width WHERE rgt > @oldrgt;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET lft = lft - @width WHERE
lft > @oldrgt;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET rgt = rgt - @width WHERE
rgt > @oldrgt;';
}
else
{
// Move $newMenu (+ children) to new location (taking into account that
// current lft/right values of $newMenu are + $width)
- $sql .= 'UPDATE q_menu SET lft = lft + @shift - @width WHERE lft >=
@oldlft + @width AND lft <= @oldrgt + @width;';
- $sql .= 'UPDATE q_menu SET rgt = rgt + @shift - @width WHERE rgt >=
@oldlft + @width AND rgt <= @oldrgt + @width;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET lft = lft + @shift -
@width WHERE lft >= @oldlft + @width AND lft <= @oldrgt + @width;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET rgt = rgt + @shift -
@width WHERE rgt >= @oldlft + @width AND rgt <= @oldrgt + @width;';
// Close gap left in $newMenu's old location
- $sql .= 'UPDATE q_menu SET lft = lft - @width WHERE lft > @oldrgt +
@width;';
- $sql .= 'UPDATE q_menu SET rgt = rgt - @width WHERE rgt > @oldrgt +
@width;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET lft = lft - @width WHERE
lft > @oldrgt + @width;';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET rgt = rgt - @width WHERE
rgt > @oldrgt + @width;';
}
// Update parent_id
- $sql .= 'UPDATE q_menu SET parent_id = '.$this->getId().' WHERE id =
'.$newMenu->getId().';';
+ $sql .= 'UPDATE '.QubitMenu::TABLE_NAME.' SET parent_id =
'.$this->getId().' WHERE id = '.$newMenu->getId().';';
}
$sql .= 'UNLOCK TABLES';
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
