summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc/odbc_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-20 13:49:56 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-20 13:49:56 +0100
commit87230286b2948cf580e21f426824a974210d7595 (patch)
tree3f0098f4f8b65ff61d60a333351d847387670596 /system/database/drivers/odbc/odbc_driver.php
parent5e18e891a14400a96f9b4af36925457b79b62005 (diff)
parent6ea625e7f31b65838f1829408d37ac26009c79bc (diff)
Merge upstream branch
Diffstat (limited to 'system/database/drivers/odbc/odbc_driver.php')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php11
1 files changed, 5 insertions, 6 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)