summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-07 15:50:05 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-07 15:50:05 +0200
commite7608b264443bb9803e580f884c44fef46d00fba (patch)
treeae9391b5f636924e02a48fbc837720041fcbae02 /system/database
parent0e762b32a003dd8a9b805fb95ee7aeb3616c41e3 (diff)
Revert "Changed all db constructors to newer syntax, made insert_id() function more convenient for postgres on pdo driver"
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_cache.php2
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_forge.php2
-rw-r--r--system/database/DB_utility.php2
-rw-r--r--system/database/drivers/odbc/odbc_driver.php4
5 files changed, 6 insertions, 6 deletions
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index ad1c28d72..3bf065ca5 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -33,7 +33,7 @@ class CI_DB_Cache {
* Grabs the CI super object instance so we can access it.
*
*/
- function __construct(&$db)
+ function CI_DB_Cache(&$db)
{
// Assign the main CI object to $this->CI
// and load the file helper since we use it a lot
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index d7b63b9dc..237a4fcea 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -78,7 +78,7 @@ class CI_DB_driver {
*
* @param array
*/
- function __construct($params)
+ function CI_DB_driver($params)
{
if (is_array($params))
{
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 6bc40411b..0dd29c238 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -35,7 +35,7 @@ class CI_DB_forge {
* Grabs the CI super object instance so we can access it.
*
*/
- function __construct()
+ function CI_DB_forge()
{
// Assign the main database object to $this->db
$CI =& get_instance();
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 52196b7ce..a5f174f0a 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -33,7 +33,7 @@ class CI_DB_utility extends CI_DB_forge {
* Grabs the CI super object instance so we can access it.
*
*/
- function __construct()
+ function CI_DB_utility()
{
// Assign the main database object to $this->db
$CI =& get_instance();
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index bcd7937d9..08cd27b6c 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -48,9 +48,9 @@ class CI_DB_odbc_driver extends CI_DB {
var $_random_keyword;
- function __construct($params)
+ function CI_DB_odbc_driver($params)
{
- parent::__construct($params);
+ parent::CI_DB_driver($params);
$this->_random_keyword = ' RND('.time().')'; // database specific random keyword
}