summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/postgre
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-27 20:02:53 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-27 20:02:53 +0100
commit2b3edbddf2398f225836d5763d112f331fe607ed (patch)
treebd9a5df6b3b8d607d0a6e0b385c2e23900b76e4f /system/database/drivers/postgre
parentc25c3d3d61ff38a348224252c1b3c9041e50ac32 (diff)
parent0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff)
Merge upstream branch and fix private methods to be protected
Diffstat (limited to 'system/database/drivers/postgre')
-rw-r--r--system/database/drivers/postgre/postgre_driver.php2
-rw-r--r--system/database/drivers/postgre/postgre_forge.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 4e35cd6d7..4779799a4 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -66,7 +66,7 @@ class CI_DB_postgre_driver extends CI_DB {
*
* @return void
*/
- private function __construct($params)
+ public function __construct($params)
{
parent::__construct($params);
diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php
index 5af834b8d..f9c79bf29 100644
--- a/system/database/drivers/postgre/postgre_forge.php
+++ b/system/database/drivers/postgre/postgre_forge.php
@@ -66,7 +66,7 @@ class CI_DB_postgre_forge extends CI_DB_forge {
* @param mixed the fields
* @return string
*/
- private function _process_fields($fields, $primary_keys = array())
+ protected function _process_fields($fields, $primary_keys = array())
{
$sql = '';
$current_field_count = 0;