summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php2
-rw-r--r--system/database/DB_cache.php2
-rw-r--r--system/database/DB_driver.php6
-rw-r--r--system/database/DB_result.php2
-rw-r--r--system/database/drivers/mssql/mssql_driver.php2
-rw-r--r--system/database/drivers/mysql/mysql_driver.php2
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php2
-rw-r--r--system/database/drivers/oci8/oci8_driver.php2
-rw-r--r--system/database/drivers/odbc/odbc_driver.php2
-rw-r--r--system/database/drivers/postgre/postgre_driver.php2
-rw-r--r--system/database/drivers/sqlite/sqlite_driver.php2
11 files changed, 13 insertions, 13 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 1fa4f9557..8db6161af 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -804,7 +804,7 @@ class CI_DB_active_record extends CI_DB_driver {
/**
* Object to Array
*
- * Takes an object as input and convers the class variables to array key/vals
+ * Takes an object as input and converts the class variables to array key/vals
*
* @access public
* @param object
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index aee5ce6fa..b469b0e1e 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -82,7 +82,7 @@ class CI_DB_Cache {
// --------------------------------------------------------------------
/**
- * Retreive a cached query
+ * Retrieve a cached query
*
* The URI being requested will become the name of the cache sub-folder.
* An MD5 hash of the SQL statement will become the cache file name
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index a24bd20d8..8a7b88f18 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -368,7 +368,7 @@ class CI_DB_driver {
/**
* Simple Query
- * This is a simiplified version of the query() function. Internally
+ * This is a simplified version of the query() function. Internally
* we only use it when running transaction commands since they do
* not require all the features of the main query() function.
*
@@ -535,7 +535,7 @@ class CI_DB_driver {
* Calculate the aggregate query elapsed time
*
* @access public
- * @param intiger The number of decimal places
+ * @param integer The number of decimal places
* @return integer
*/
function elapsed_time($decimals = 6)
@@ -1021,7 +1021,7 @@ class CI_DB_driver {
* @param string the error message
* @param string any "swap" values
* @param boolean whether to localize the message
- * @return string sends the application/errror_db.php template
+ * @return string sends the application/error_db.php template
*/
function display_error($error = '', $swap = '', $native = FALSE)
{
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 4e8c4fc76..d02bfb96e 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -63,7 +63,7 @@ class CI_DB_result {
return $this->result_object;
}
- if ($this->num_rows == 0)
+ if ($this->numerous == 0)
{
return array();
}
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index cb2f48dc3..4dc8792ca 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -277,7 +277,7 @@ class CI_DB_mssql_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * List columnn query
+ * List column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 253627cd9..20311ffa0 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -311,7 +311,7 @@ class CI_DB_mysql_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 4fd9f3aaa..ea2adbea9 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -303,7 +303,7 @@ class CI_DB_mysqli_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 794405a03..4f5470c1a 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -418,7 +418,7 @@ class CI_DB_oci8_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 4bd6e1106..17a6dfbd0 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -278,7 +278,7 @@ class CI_DB_odbc_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 340d65046..f74e652d5 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -305,7 +305,7 @@ class CI_DB_postgre_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 9da50b676..fd9fd2c50 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -297,7 +297,7 @@ class CI_DB_sqlite_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Show columnn query
+ * Show column query
*
* Generates a platform-specific query string so that the column names can be fetched
*