summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-02-21 00:58:24 +0100
committerTimothy Warren <tim@timshomepage.net>2012-02-21 00:58:24 +0100
commitdd044b317fc2db52f3812792a256497a2f0e94fb (patch)
treec4c3b0b92cf06dc4c16123ba58429d22175f5c6e /system
parent41a439bf75bdd277e153d44788b732cf2e8c7ee3 (diff)
More style fixes, replaced _protect_identifiers with protect_identifiers in db_forge
Diffstat (limited to 'system')
-rw-r--r--system/database/drivers/interbase/interbase_forge.php16
-rw-r--r--system/database/drivers/interbase/interbase_result.php6
2 files changed, 11 insertions, 11 deletions
diff --git a/system/database/drivers/interbase/interbase_forge.php b/system/database/drivers/interbase/interbase_forge.php
index d21a5551b..b8ea6a05d 100644
--- a/system/database/drivers/interbase/interbase_forge.php
+++ b/system/database/drivers/interbase/interbase_forge.php
@@ -79,7 +79,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
{
$sql = 'CREATE TABLE ';
- $sql .= $this->db->_protect_identifiers($table)."(";
+ $sql .= $this->db->protect_identifiers($table)."(";
$current_field_count = 0;
foreach ($fields as $field=>$attributes)
@@ -95,7 +95,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
{
$attributes = array_change_key_case($attributes, CASE_UPPER);
- $sql .= "\n\t".$this->db->_protect_identifiers($field);
+ $sql .= "\n\t".$this->db->protect_identifiers($field);
$sql .= ' '.$attributes['TYPE'];
@@ -138,7 +138,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
if (count($primary_keys) > 0)
{
- $primary_keys = $this->db->_protect_identifiers($primary_keys);
+ $primary_keys = $this->db->protect_identifiers($primary_keys);
$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";
}
@@ -148,11 +148,11 @@ class CI_DB_interbase_forge extends CI_DB_forge {
{
if (is_array($key))
{
- $key = $this->db->_protect_identifiers($key);
+ $key = $this->db->protect_identifiers($key);
}
else
{
- $key = array($this->db->_protect_identifiers($key));
+ $key = array($this->db->protect_identifiers($key));
}
$sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")";
@@ -195,7 +195,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
*/
protected function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')
{
- $sql = 'ALTER TABLE '.$this->db->_protect_identifiers($table)." $alter_type ".$this->db->_protect_identifiers($column_name);
+ $sql = 'ALTER TABLE '.$this->db->protect_identifiers($table)." $alter_type ".$this->db->protect_identifiers($column_name);
$sql .= " {$column_definition}";
@@ -215,7 +215,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
if ($after_field != '')
{
- $sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+ $sql .= ' AFTER ' . $this->db->protect_identifiers($after_field);
}
return $sql;
@@ -235,7 +235,7 @@ class CI_DB_interbase_forge extends CI_DB_forge {
*/
protected function _rename_table($table_name, $new_table_name)
{
- return 'ALTER TABLE '.$this->db->_protect_identifiers($table_name).' RENAME TO '.$this->db->_protect_identifiers($new_table_name);
+ return 'ALTER TABLE '.$this->db->protect_identifiers($table_name).' RENAME TO '.$this->db->protect_identifiers($new_table_name);
}
}
diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 01f0e52b2..be9cb6547 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -213,11 +213,11 @@ class CI_DB_interbase_result extends CI_DB_result {
{
$i = 0;
- foreach($this->result_array as $array)
+ foreach ($this->result_array as $array)
{
$this->result_object[$i] = new StdClass();
- foreach($array as $key => $val)
+ foreach ($array as $key => $val)
{
$this->result_object[$i]->{$key} = $val;
}
@@ -263,7 +263,7 @@ class CI_DB_interbase_result extends CI_DB_result {
// the result object to an array if need be
if (count($this->result_object) > 0)
{
- foreach($this->result_object as $obj)
+ foreach ($this->result_object as $obj)
{
$this->result_array[] = (array)$obj;
}