Changeset 196
- Timestamp:
- 06/11/2007 04:08:46 PM (19 months ago)
- Location:
- trunk/system/database
- Files:
-
- 5 modified
-
DB.php (modified) (1 diff)
-
DB_driver.php (modified) (6 diffs)
-
drivers/mysql/mysql_driver.php (modified) (3 diffs)
-
drivers/mysqli/mysqli_driver.php (modified) (2 diffs)
-
drivers/postgre/postgre_driver.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/system/database/DB.php
r180 r196 80 80 $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; 81 81 $DB =& new $driver($params); 82 83 // Set the charachter set if config option is set 84 if ($params['charset'] != FALSE) 85 { 86 $DB->_set_charset($params['charset']); 87 } 88 82 89 83 return $DB; 90 84 } -
trunk/system/database/DB_driver.php
r183 r196 45 45 var $dbprefix = ''; 46 46 var $port = ''; 47 var $charset = ''; 47 48 var $pconnect = FALSE; 48 49 var $conn_id = FALSE; … … 63 64 var $CACHE; // The cache class object 64 65 65 66 66 // These are use with Oracle 67 67 var $stmt_id; … … 69 69 var $limit_used; 70 70 71 72 73 71 /** 74 72 * Constructor. Accepts one parameter containing the database … … 91 89 92 90 /** 93 * Initialize Database Settings 94 * 95 * @access private Called by the constructor91 * Initialize Database Settings, called by the constructor 92 * 93 * @access private 96 94 * @param mixed 97 95 * @return void … … 101 99 if (is_array($params)) 102 100 { 103 $defaults = array( 104 'hostname' => '', 105 'username' => '', 106 'password' => '', 107 'database' => '', 108 'conn_id' => FALSE, 109 'dbdriver' => 'mysql', 110 'dbprefix' => '', 111 'port' => '', 112 'pconnect' => FALSE, 113 'db_debug' => FALSE, 114 'cachedir' => '', 115 'cache_on' => FALSE 116 ); 117 118 foreach ($defaults as $key => $val) 119 { 120 $this->$key = ( ! isset($params[$key])) ? $val : $params[$key]; 101 $params += array 102 ( 103 'hostname' => '', 104 'username' => '', 105 'password' => '', 106 'database' => '', 107 'conn_id' => FALSE, 108 'dbdriver' => 'mysql', 109 'dbprefix' => '', 110 'port' => '', 111 'pconnect' => FALSE, 112 'db_debug' => FALSE, 113 'cachedir' => '', 114 'cache_on' => FALSE, 115 'charset' => '' 116 ); 117 118 foreach ($params as $key => $val) 119 { 120 $this->$key = $val; 121 121 } 122 122 } … … 176 176 } 177 177 } 178 179 // Set the character set 180 $this->set_charset(); 178 181 179 182 return TRUE; -
trunk/system/database/drivers/mysql/mysql_driver.php
r186 r196 85 85 86 86 /** 87 * Set database charset 88 * 89 * @access public 90 * @return bool 91 */ 92 function set_charset() 93 { 94 if ($this->charset != '') 95 { 96 return $this->simple_query("SET NAMES '" . $this->charset . "'"); 97 } 98 else 99 { 100 return TRUE; 101 } 102 } 103 104 // -------------------------------------------------------------------- 105 106 /** 87 107 * Version number query string 88 108 * … … 92 112 function _version() 93 113 { 94 return "SELECT version() AS ver";114 return 'SELECT version() AS ver'; 95 115 } 96 116 … … 471 491 } 472 492 473 /**474 * Set Charset475 *476 * @access public477 * @return bool478 */479 function _set_charset($charset)480 {481 $this->query("SET NAMES '" . $charset . "'");482 483 //$query = $this->query("show variables like 'char%'");484 //echo "<pre>" . print_r($query->result(), true) . "</pre>"; die;485 486 return true;487 }488 493 } 489 494 -
trunk/system/database/drivers/mysqli/mysqli_driver.php
r186 r196 87 87 88 88 /** 89 * Set database charset 90 * 91 * @access public 92 * @return bool 93 */ 94 function set_charset() 95 { 96 if ($this->charset != '') 97 { 98 return @mysqli_set_charset($this->conn_id, $this->charset); 99 } 100 else 101 { 102 return TRUE; 103 } 104 } 105 106 // -------------------------------------------------------------------- 107 108 /** 89 109 * Version number query string 90 110 * … … 474 494 @mysqli_close($conn_id); 475 495 } 476 477 /**478 * Set Charset479 *480 * @access public481 * @return bool482 */483 function _set_charset($charset)484 {485 $this->query("SET NAMES '" . $charset . "'");486 487 //$query = $this->query("show variables like 'char%'");488 //echo "<pre>" . print_r($query->result(), true) . "</pre>"; die;489 490 return true;491 }492 496 493 497 } 494 498 495 499 ?> -
trunk/system/database/drivers/postgre/postgre_driver.php
r186 r196 83 83 84 84 /** 85 * Set database charset 86 * 87 * @access public 88 * @return bool 89 */ 90 function set_charset() 91 { 92 if ($this->charset != '') 93 { 94 return $this->simple_query("SET NAMES '" . $this->charset . "'"); 95 } 96 else 97 { 98 return TRUE; 99 } 100 } 101 102 // -------------------------------------------------------------------- 103 104 /** 85 105 * Version number query string 86 106 * … … 487 507 } 488 508 489 /**490 * Set Charset491 *492 * @access public493 * @return bool494 */495 function _set_charset($charset)496 {497 $this->query("SET NAMES '" . $charset . "'");498 499 //$query = $this->query("show variables like 'char%'");500 //echo "<pre>" . print_r($query->result(), true) . "</pre>"; die;501 502 return true;503 }504 509 } 505 510
