summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rwxr-xr-x[-rw-r--r--]system/database/DB_active_rec.php4
-rwxr-xr-x[-rw-r--r--]system/database/DB_cache.php0
-rwxr-xr-x[-rw-r--r--]system/database/DB_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/DB_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/DB_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mssql/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mssql/mssql_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mssql/mssql_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mssql/mssql_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mssql/mssql_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysql/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysql/mysql_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysql/mysql_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysql/mysql_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysql/mysql_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysqli/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysqli/mysqli_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysqli/mysqli_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysqli/mysqli_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/mysqli/mysqli_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/oci8/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/oci8/oci8_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/oci8/oci8_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/oci8/oci8_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/oci8/oci8_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/odbc/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/odbc/odbc_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/odbc/odbc_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/odbc/odbc_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/odbc/odbc_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/postgre/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/postgre/postgre_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/postgre/postgre_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/postgre/postgre_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/postgre/postgre_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/sqlite/index.html0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/sqlite/sqlite_driver.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/sqlite/sqlite_forge.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/sqlite/sqlite_result.php0
-rwxr-xr-x[-rw-r--r--]system/database/drivers/sqlite/sqlite_utility.php0
-rwxr-xr-x[-rw-r--r--]system/database/index.html0
42 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 10febb1fc..841ede28e 100644..100755
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -255,7 +255,7 @@ class CI_DB_active_record extends CI_DB_driver {
*/
public function from($from)
{
- foreach ((array) $from as $val)
+ foreach ((array)$from as $val)
{
if (strpos($val, ',') !== FALSE)
{
@@ -1647,7 +1647,7 @@ class CI_DB_active_record extends CI_DB_driver {
if (strpos($table, " ") !== FALSE)
{
// if the alias is written with the AS keyword, remove it
- $table = preg_replace('/\s+AS\s+/i', ' ', $table);
+ $table = preg_replace('/ AS /i', ' ', $table);
// Grab the alias
$table = trim(strrchr($table, " "));
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index ad1c28d72..ad1c28d72 100644..100755
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 6bc40411b..6bc40411b 100644..100755
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 48d66c8e4..48d66c8e4 100644..100755
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 52196b7ce..52196b7ce 100644..100755
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
diff --git a/system/database/drivers/index.html b/system/database/drivers/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/index.html
+++ b/system/database/drivers/index.html
diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/mssql/index.html
+++ b/system/database/drivers/mssql/index.html
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index b39bd9360..b39bd9360 100644..100755
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php
index 70b20ecf8..70b20ecf8 100644..100755
--- a/system/database/drivers/mssql/mssql_forge.php
+++ b/system/database/drivers/mssql/mssql_forge.php
diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
index 2897ca5a5..2897ca5a5 100644..100755
--- a/system/database/drivers/mssql/mssql_result.php
+++ b/system/database/drivers/mssql/mssql_result.php
diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php
index 48ecbc72a..48ecbc72a 100644..100755
--- a/system/database/drivers/mssql/mssql_utility.php
+++ b/system/database/drivers/mssql/mssql_utility.php
diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/mysql/index.html
+++ b/system/database/drivers/mysql/index.html
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index f87cfea4b..f87cfea4b 100644..100755
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index c1cae136c..c1cae136c 100644..100755
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
index e1a6e93ca..e1a6e93ca 100644..100755
--- a/system/database/drivers/mysql/mysql_result.php
+++ b/system/database/drivers/mysql/mysql_result.php
diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index 48c4d6316..48c4d6316 100644..100755
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/mysqli/index.html
+++ b/system/database/drivers/mysqli/index.html
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index d3200f328..d3200f328 100644..100755
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index 260549457..260549457 100644..100755
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index 124d4e599..124d4e599 100644..100755
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index e17889b8c..e17889b8c 100644..100755
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/oci8/index.html
+++ b/system/database/drivers/oci8/index.html
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 930177e62..930177e62 100644..100755
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/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 3cd17585a..3cd17585a 100644..100755
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/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 3421278a5..3421278a5 100644..100755
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/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 854b467e1..854b467e1 100644..100755
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/odbc/index.html
+++ b/system/database/drivers/odbc/index.html
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index bcd7937d9..bcd7937d9 100644..100755
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php
index 3ec86b4e9..3ec86b4e9 100644..100755
--- a/system/database/drivers/odbc/odbc_forge.php
+++ b/system/database/drivers/odbc/odbc_forge.php
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index 5d64a464f..5d64a464f 100644..100755
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php
index d335bed99..d335bed99 100644..100755
--- a/system/database/drivers/odbc/odbc_utility.php
+++ b/system/database/drivers/odbc/odbc_utility.php
diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/postgre/index.html
+++ b/system/database/drivers/postgre/index.html
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 5367f9759..5367f9759 100644..100755
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php
index 91a1c6861..91a1c6861 100644..100755
--- a/system/database/drivers/postgre/postgre_forge.php
+++ b/system/database/drivers/postgre/postgre_forge.php
diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php
index e9a1d1607..e9a1d1607 100644..100755
--- a/system/database/drivers/postgre/postgre_result.php
+++ b/system/database/drivers/postgre/postgre_result.php
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index 741c52ea8..741c52ea8 100644..100755
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/drivers/sqlite/index.html
+++ b/system/database/drivers/sqlite/index.html
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 0cc898b38..0cc898b38 100644..100755
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php
index 56904082e..56904082e 100644..100755
--- a/system/database/drivers/sqlite/sqlite_forge.php
+++ b/system/database/drivers/sqlite/sqlite_forge.php
diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
index 7bd30db7c..7bd30db7c 100644..100755
--- a/system/database/drivers/sqlite/sqlite_result.php
+++ b/system/database/drivers/sqlite/sqlite_result.php
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 508023e2f..508023e2f 100644..100755
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
diff --git a/system/database/index.html b/system/database/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/system/database/index.html
+++ b/system/database/index.html