diff options
Diffstat (limited to 'system/database/drivers/odbc')
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 11 | ||||
| -rw-r--r-- | system/database/drivers/odbc/odbc_forge.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/odbc/odbc_result.php | 11 | ||||
| -rw-r--r-- | system/database/drivers/odbc/odbc_utility.php | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 47d3a340b..d0ad5a832 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -46,7 +46,7 @@ class CI_DB_odbc_driver extends CI_DB { protected $_escape_char = ''; // clause and character used for LIKE escape sequences - protected $_like_escape_str = ' {escape \'%s\'} '; + protected $_like_escape_str = " {escape '%s'} "; protected $_like_escape_chr = '!'; /** @@ -57,7 +57,7 @@ class CI_DB_odbc_driver extends CI_DB { protected $_count_string = 'SELECT COUNT(*) AS '; protected $_random_keyword; - function __construct($params) + public function __construct($params) { parent::__construct($params); @@ -305,8 +305,7 @@ class CI_DB_odbc_driver extends CI_DB { * * Generates a platform-specific query string so that the table names can be fetched * - * @access private - * @param boolean + * @param bool * @return string */ protected function _list_tables($prefix_limit = FALSE) @@ -412,7 +411,7 @@ class CI_DB_odbc_driver extends CI_DB { * This function implicitly groups FROM tables so there is no confusion * about operator precedence in harmony with SQL standards * - * @param string the table name + * @param array * @return string */ protected function _from_tables($tables) diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 49e5c3e72..162cef48c 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -71,7 +71,7 @@ class CI_DB_odbc_forge extends CI_DB_forge { * @param array the fields * @param mixed primary key(s) * @param mixed key(s) - * @param boolean should 'IF NOT EXISTS' be added to the SQL + * @param bool should 'IF NOT EXISTS' be added to the SQL * @return bool */ public function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists) diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 219d16fa3..04a7463a4 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -144,7 +144,7 @@ class CI_DB_odbc_result extends CI_DB_result { * this internally before fetching results to make sure the * result set starts at zero * - * @return array + * @return bool */ protected function _data_seek($n = 0) { @@ -184,6 +184,8 @@ class CI_DB_odbc_result extends CI_DB_result { : $this->_odbc_fetch_object($this->result_id); } + // -------------------------------------------------------------------- + /** * Result - object * @@ -192,7 +194,7 @@ class CI_DB_odbc_result extends CI_DB_result { * * @return object */ - private function _odbc_fetch_object(& $odbc_result) + protected function _odbc_fetch_object(& $odbc_result) { $rs = array(); if ( ! odbc_fetch_into($odbc_result, $rs)) @@ -210,6 +212,7 @@ class CI_DB_odbc_result extends CI_DB_result { return $rs_obj; } + // -------------------------------------------------------------------- /** * Result - array @@ -219,7 +222,7 @@ class CI_DB_odbc_result extends CI_DB_result { * * @return array */ - private function _odbc_fetch_array(& $odbc_result) + protected function _odbc_fetch_array(& $odbc_result) { $rs = array(); if ( ! odbc_fetch_into($odbc_result, $rs)) diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index e71bc5a03..eab636122 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * |