Revert "Oci8 access modifiers"
This reverts commit 9f86f5cddea54e7fedf4be89d1d1cc90d1564488.
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index e7b744b..8d70406 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -53,33 +53,33 @@
class CI_DB_oci8_driver extends CI_DB {
- public $dbdriver = 'oci8';
+ var $dbdriver = 'oci8';
// The character used for excaping
- public $_escape_char = '"';
+ var $_escape_char = '"';
// clause and character used for LIKE escape sequences
- public $_like_escape_str = " escape '%s' ";
- public $_like_escape_chr = '!';
+ var $_like_escape_str = " escape '%s' ";
+ var $_like_escape_chr = '!';
/**
* The syntax to count rows is slightly different across different
* database engines, so this string appears in each driver and is
* used for the count_all() and count_all_results() functions.
*/
- public $_count_string = "SELECT COUNT(1) AS ";
- public $_random_keyword = ' ASC'; // not currently supported
+ var $_count_string = "SELECT COUNT(1) AS ";
+ var $_random_keyword = ' ASC'; // not currently supported
// Set "auto commit" by default
- public $_commit = OCI_COMMIT_ON_SUCCESS;
+ var $_commit = OCI_COMMIT_ON_SUCCESS;
// need to track statement id and cursor id
- public $stmt_id;
- public $curs_id;
+ var $stmt_id;
+ var $curs_id;
// if we use a limit, we will add a field that will
// throw off num_fields later
- public $limit_used;
+ var $limit_used;
/**
* Non-persistent database connection
@@ -214,7 +214,7 @@
* KEY OPTIONAL NOTES
* name no the name of the parameter should be in :<param_name> format
* value no the value of the parameter. If this is an OUT or IN OUT parameter,
- * this should be a reference to a publiciable
+ * this should be a reference to a variable
* type yes the type of the parameter
* length yes the max size of the parameter
*/
@@ -781,5 +781,7 @@
}
+
+
/* End of file oci8_driver.php */
-/* Location: ./system/database/drivers/oci8/oci8_driver.php */
\ No newline at end of file
+/* Location: ./system/database/drivers/oci8/oci8_driver.php */
diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php
index f9a90ff..7fcc809 100644
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/system/database/drivers/oci8/oci8_forge.php
@@ -39,10 +39,11 @@
/**
* Create database
*
+ * @access public
* @param string the database name
* @return bool
*/
- public function _create_database($name)
+ function _create_database($name)
{
return FALSE;
}
@@ -52,10 +53,11 @@
/**
* Drop database
*
+ * @access private
* @param string the database name
* @return bool
*/
- protected function _drop_database($name)
+ function _drop_database($name)
{
return FALSE;
}
@@ -142,9 +144,10 @@
/**
* Drop Table
*
+ * @access private
* @return bool
*/
- protected function _drop_table($table)
+ function _drop_table($table)
{
return FALSE;
}
@@ -157,6 +160,7 @@
* Generates a platform-specific query so that a table can be altered
* Called by add_column(), drop_column(), and column_alter(),
*
+ * @access private
* @param string the ALTER type (ADD, DROP, CHANGE)
* @param string the column name
* @param string the table name
@@ -166,7 +170,7 @@
* @param string the field after which we should add the new field
* @return object
*/
- protected function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')
+ 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);
@@ -208,11 +212,12 @@
*
* Generates a platform-specific query so that a table can be renamed
*
+ * @access private
* @param string the old table name
* @param string the new table name
* @return string
*/
- protected function _rename_table($table_name, $new_table_name)
+ 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);
}
@@ -220,4 +225,4 @@
}
/* End of file oci8_forge.php */
-/* Location: ./system/database/drivers/oci8/oci8_forge.php */
\ No newline at end of file
+/* Location: ./system/database/drivers/oci8/oci8_forge.php */
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index a14e32e..6f1b8b4 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -235,5 +235,6 @@
}
+
/* End of file oci8_result.php */
-/* Location: ./system/database/drivers/oci8/oci8_result.php */
\ No newline at end of file
+/* Location: ./system/database/drivers/oci8/oci8_result.php */
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index f4863c0..62dfb2f 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -39,9 +39,10 @@
/**
* List databases
*
+ * @access private
* @return bool
*/
- protected function _list_databases()
+ function _list_databases()
{
return FALSE;
}
@@ -53,10 +54,11 @@
*
* Generates a platform-specific query so that a table can be optimized
*
+ * @access private
* @param string the table name
* @return object
*/
- protected function _optimize_table($table)
+ function _optimize_table($table)
{
return FALSE; // Is this supported in Oracle?
}
@@ -68,10 +70,11 @@
*
* Generates a platform-specific query so that a table can be repaired
*
+ * @access private
* @param string the table name
* @return object
*/
- protected function _repair_table($table)
+ function _repair_table($table)
{
return FALSE; // Is this supported in Oracle?
}
@@ -81,10 +84,11 @@
/**
* Oracle Export
*
+ * @access private
* @param array Preferences
* @return mixed
*/
- protected function _backup($params = array())
+ function _backup($params = array())
{
// Currently unsupported
return $this->db->display_error('db_unsuported_feature');