dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Protect $table and $alias in DbQuery

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11354 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-19 13:15:53 +00:00
parent d601a74b8b
commit 5e60b5eada
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/db/DbQuery.php
+16 -10
View File
@@ -89,44 +89,50 @@ class DbQueryCore
/**
* Add LEFT JOIN clause
* E.g. $this->leftJoin('product p ON ...')
*
* @param string $join Table followed by ON claused
* @param string $table Table name (without prefix)
* @param string $alias Table alias
* @param string $on ON clause
*/
public function leftJoin($table, $alias = null, $on = null)
{
return $this->join('LEFT JOIN `'._DB_PREFIX_.$table.'`'.($alias ? ' '.$alias : '').($on ? ' ON '.$on : ''));
return $this->join('LEFT JOIN `'._DB_PREFIX_.bqSQL($table).'`'.($alias ? ' '.pSQL($alias) : '').($on ? ' ON '.$on : ''));
}
/**
* Add INNER JOIN clause
* E.g. $this->innerJoin('product p ON ...')
*
* @param string $join Table followed by ON claused
* @param string $table Table name (without prefix)
* @param string $alias Table alias
* @param string $on ON clause
*/
public function innerJoin($table, $alias = null, $on = null)
{
return $this->join('INNER JOIN `'._DB_PREFIX_.$table.'`'.($alias ? ' '.$alias : '').($on ? ' ON '.$on : ''));
return $this->join('INNER JOIN `'._DB_PREFIX_.bqSQL($table).'`'.($alias ? ' '.pSQL($alias) : '').($on ? ' ON '.$on : ''));
}
/**
* Add LEFT OUTER JOIN clause
*
* @param string $join Table followed by ON claused
* @param string $table Table name (without prefix)
* @param string $alias Table alias
* @param string $on ON clause
*/
public function leftOuterJoin($table, $alias = null, $on = null)
{
return $this->join('LEFT OUTER JOIN `'._DB_PREFIX_.$table.'`'.($alias ? ' '.$alias : '').($on ? ' ON '.$on : ''));
return $this->join('LEFT OUTER JOIN `'._DB_PREFIX_.bqSQL($table).'`'.($alias ? ' '.pSQL($alias) : '').($on ? ' ON '.$on : ''));
}
/**
* Add NATURAL JOIN clause
*
* @param string $join
* @param string $table Table name (without prefix)
* @param string $alias Table alias
*/
public function naturalJoin($table, $alias = null, $on = null)
public function naturalJoin($table, $alias = null)
{
return $this->join('NATURAL JOIN `'._DB_PREFIX_.$table.'`'.($alias ? ' '.$alias : '').($on ? ' ON '.$on : ''));
return $this->join('NATURAL JOIN `'._DB_PREFIX_.bqSQL($table).'`'.($alias ? ' '.pSQL($alias) : ''));
}
/**