PHPXes-matrixFAQsJSXLCARSOpenCV2-CookbookESWebE

Català-Valencià - Catalan中文 - Chinese (Simplified)中文 - Chinese (Traditional)Česky - CzechDansk - DanishNederlands - DutchEnglish - EnglishSuomi - FinnishFrançais - FrenchDeutsch - Germanעברית - Hebrewहिंदी - HindiMagyar - HungarianBahasa Indonesia - IndonesianItaliano - Italian日本語 - Japanese한국어 - KoreanМакедонски - Macedonianमराठी - MarathiNorsk - NorwegianPolski - PolishPortuguês - PortuguesePortuguês - Portuguese (Brazil)Русский - RussianSlovenčina - SlovakSlovenščina - SlovenianEspañol - SpanishSvenska - SwedishTürkçe - TurkishУкраїнська - UkrainianOëzbekcha - Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/Db/Database.php @ 32

  → /trunk/Db/Database.php @ 31

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Last modification

• Rev 32 2012-07-11 10:33:56
• Author: PointedEars

• Log message:

  * Framework
  - Improved support for dabase-specific quotes
  - Added support for pre-quoted table/database references

Ignore whitespace Rev 32 → Rev 31

/trunk/Db/Database.php
21,8 → 21,6
*/
class Database extends AbstractModel
{
/* Access properties */
/**
* DSN of the database
* @var string
46,26 → 44,8
* @var array
*/
protected $_options = array();
/**
* Database-specific string to use for quoting a name or value
* left-hand side (for security reasons and to prevent a name
* from being parsed as a keyword).
* @var string
*/
protected $_leftQuote = '';
/**
* Database-specific string to use for quoting a name or value
* left-hand side (for security reasons and to prevent a name
* from being parsed as a keyword).
* @var string
*/
protected $_rightQuote = '';
/* Status properties */
/**
* Database connection
* @var PDO
*/
165,7 → 145,7
*/
public function escapeName($name)
{
return $this->_leftQuote . $name . $this->_rightQuote;
return $name;
}
/**
203,14 → 183,7
{
foreach ($array as $column => &$value)
{
$quotedColumn = $column;
if (strpos($column, $this->_leftQuote) === false
&& strpos($column, $this->_rightQuote) === false)
{
$quotedColumn = $this->_leftQuote . $column . $this->_rightQuote;
}
$value = $value . ' AS ' . $quotedColumn;
$value = $value . ' AS ' . $column;
}
return $array;
255,7 → 228,7
* @return array
* The escaped array
*/
protected function _escapeValueArray(array &$array, $suffix = '')
protected function _escapeValueArray(array &$array, $suffix = '', array &$escape = array('', ''))
{
$result = array();
277,7 → 250,7
$placeholder = '(' . implode(',', self::_expand($value, $column)) . ')';
}
$result[] = $this->_leftQuote . $column . $this->_rightQuote . "{$op}{$placeholder}{$suffix}";
$result[] = $escape[0] . $column . $escape[1] . "{$op}{$placeholder}{$suffix}";
}
return $result;