summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-03-20 00:08:29 +0100
committerTimothy Warren <tim@timshomepage.net>2012-03-20 00:08:29 +0100
commit0c2747151f0cd32b6188ecd8c1dcdcdb6fe44792 (patch)
tree7abd34cf4b912ac960b1b8a28f95433b147d9e04
parent8c1b2dc39d104774b3a7be87dc41f2b702bb883c (diff)
Revert "Added access modifiers to the rest of the Cubrid classes"
-rw-r--r--system/database/drivers/cubrid/cubrid_forge.php21
-rw-r--r--system/database/drivers/cubrid/cubrid_result.php23
-rw-r--r--system/database/drivers/cubrid/cubrid_utility.php8
3 files changed, 33 insertions, 19 deletions
diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 6bfc7c28f..7d606ea36 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -39,10 +39,11 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
/**
* Create database
*
+ * @access private
* @param string the database name
* @return bool
*/
- protected function _create_database($name)
+ function _create_database($name)
{
// CUBRID does not allow to create a database in SQL. The GUI tools
// have to be used for this purpose.
@@ -54,10 +55,11 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
/**
* Drop database
*
+ * @access private
* @param string the database name
* @return bool
*/
- protected function _drop_database($name)
+ function _drop_database($name)
{
// CUBRID does not allow to drop a database in SQL. The GUI tools
// have to be used for this purpose.
@@ -69,10 +71,11 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
/**
* Process Fields
*
+ * @access private
* @param mixed the fields
* @return string
*/
- protected function _process_fields($fields)
+ function _process_fields($fields)
{
$current_field_count = 0;
$sql = '';
@@ -169,6 +172,7 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
/**
* Create Table
*
+ * @access private
* @param string the table name
* @param mixed the fields
* @param mixed primary key(s)
@@ -176,7 +180,7 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
* @param boolean should 'IF NOT EXISTS' be added to the SQL
* @return bool
*/
- protected function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
+ function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
{
$sql = 'CREATE TABLE ';
@@ -228,9 +232,10 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
/**
* Drop Table
*
+ * @access private
* @return string
*/
- protected function _drop_table($table)
+ function _drop_table($table)
{
return "DROP TABLE IF EXISTS ".$this->db->_escape_identifiers($table);
}
@@ -243,13 +248,14 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
* 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 array fields
* @param string the field after which we should add the new field
* @return object
*/
- protected function _alter_table($alter_type, $table, $fields, $after_field = '')
+ function _alter_table($alter_type, $table, $fields, $after_field = '')
{
$sql = 'ALTER TABLE '.$this->db->protect_identifiers($table).' '.$alter_type.' ';
@@ -276,11 +282,12 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
*
* 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 'RENAME TABLE '.$this->db->protect_identifiers($table_name).' AS '.$this->db->protect_identifiers($new_table_name);
}
diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php
index c7a7632aa..a7eeb8a39 100644
--- a/system/database/drivers/cubrid/cubrid_result.php
+++ b/system/database/drivers/cubrid/cubrid_result.php
@@ -41,9 +41,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
/**
* Number of rows in the result set
*
+ * @access public
* @return integer
*/
- public function num_rows()
+ function num_rows()
{
return @cubrid_num_rows($this->result_id);
}
@@ -53,9 +54,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
/**
* Number of fields in the result set
*
+ * @access public
* @return integer
*/
- public function num_fields()
+ function num_fields()
{
return @cubrid_num_fields($this->result_id);
}
@@ -67,9 +69,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
*
* Generates an array of column names
*
+ * @access public
* @return array
*/
- public function list_fields()
+ function list_fields()
{
return cubrid_column_names($this->result_id);
}
@@ -81,9 +84,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
*
* Generates an array of objects containing field meta-data
*
+ * @access public
* @return array
*/
- public function field_data()
+ function field_data()
{
$retval = array();
@@ -145,7 +149,7 @@ class CI_DB_cubrid_result extends CI_DB_result {
*
* @return null
*/
- public function free_result()
+ function free_result()
{
if(is_resource($this->result_id) ||
get_resource_type($this->result_id) == "Unknown" &&
@@ -165,9 +169,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
* this internally before fetching results to make sure the
* result set starts at zero
*
+ * @access private
* @return array
*/
- protected function _data_seek($n = 0)
+ function _data_seek($n = 0)
{
return cubrid_data_seek($this->result_id, $n);
}
@@ -179,9 +184,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
*
* Returns the result set as an array
*
+ * @access private
* @return array
*/
- protected function _fetch_assoc()
+ function _fetch_assoc()
{
return cubrid_fetch_assoc($this->result_id);
}
@@ -193,9 +199,10 @@ class CI_DB_cubrid_result extends CI_DB_result {
*
* Returns the result set as an object
*
+ * @access private
* @return object
*/
- protected function _fetch_object()
+ function _fetch_object()
{
return cubrid_fetch_object($this->result_id);
}
diff --git a/system/database/drivers/cubrid/cubrid_utility.php b/system/database/drivers/cubrid/cubrid_utility.php
index de28e6335..a13c0a5e4 100644
--- a/system/database/drivers/cubrid/cubrid_utility.php
+++ b/system/database/drivers/cubrid/cubrid_utility.php
@@ -42,7 +42,7 @@ class CI_DB_cubrid_utility extends CI_DB_utility {
* @access private
* @return array
*/
- protected function _list_databases()
+ function _list_databases()
{
// CUBRID does not allow to see the list of all databases on the
// server. It is the way its architecture is designed. Every
@@ -71,7 +71,7 @@ class CI_DB_cubrid_utility extends CI_DB_utility {
* @return object
* @link http://www.cubrid.org/manual/840/en/Optimize%20Database
*/
- protected function _optimize_table($table)
+ function _optimize_table($table)
{
// No SQL based support in CUBRID as of version 8.4.0. Database or
// table optimization can be performed using CUBRID Manager
@@ -91,7 +91,7 @@ class CI_DB_cubrid_utility extends CI_DB_utility {
* @return object
* @link http://www.cubrid.org/manual/840/en/Checking%20Database%20Consistency
*/
- protected function _repair_table($table)
+ function _repair_table($table)
{
// Not supported in CUBRID as of version 8.4.0. Database or
// table consistency can be checked using CUBRID Manager
@@ -107,7 +107,7 @@ class CI_DB_cubrid_utility extends CI_DB_utility {
* @param array Preferences
* @return mixed
*/
- protected function _backup($params = array())
+ function _backup($params = array())
{
// No SQL based support in CUBRID as of version 8.4.0. Database or
// table backup can be performed using CUBRID Manager