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/MySQLDB.php @ 67

  → /trunk/Db/MySQLDB.php @ 68

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Last modification

• Rev 68 2013-08-12 16:03:57
• Author: PointedEars

• Log message:

  * Db/Database.php
    - Added general support for the `port' parameter
    
  * Db/Database.php, Db/MySQLDB.php
    - Added support for the `port' and `unix_socket' parameters

Ignore whitespace Rev 67 → Rev 68

/trunk/Db/MySQLDB.php
11,6 → 11,18
protected $_host;
/**
* Database port on the host
* @var int
*/
protected $_port;
/**
* MySQL Unix socket (shouldn't be used with host or port).
* @var string
*/
protected $_unix_socket;
/**
* Database name
* @var string
*/
48,9 → 60,20
public function __construct()
{
$this->readConfig();
$dbconfig = $this->readConfig();
if ($dbconfig === false)
{
return;
}
if (isset($dbconfig['unix_socket']))
{
$this->_unix_socket = $dbconfig['unix_socket'];
}
$this->_dsn = "mysql:host={$this->_host}"
. (!is_null($this->_port) ? ";port={$this->_port}" : '')
. (!is_null($this->_unix_socket) ? ";unix_socket={$this->_unix_socket}" : '')
. (!is_null($this->_dbname) ? ";dbname={$this->_dbname}" : '')
. (!is_null($this->_charset) ? ";charset={$this->_charset}" : '');