From be676859e18bc1b29c28705bc6902f69aa72c236 Mon Sep 17 00:00:00 2001 From: João Date: Wed, 14 Jan 2015 09:10:41 +0000 Subject: var_export in DB.php outputting string When a DSN string is supplied and it contains parameters such as "db_debug=TRUE", var_export will currently output the parsable string representation of the variable. By setting the second parameter to TRUE, the output is killed. --- system/database/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/DB.php b/system/database/DB.php index fc9f4d0dc..a33627191 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -130,7 +130,7 @@ function &DB($params = '', $query_builder_override = NULL) { if (is_string($val) && in_array(strtoupper($val), array('TRUE', 'FALSE', 'NULL'))) { - $val = var_export($val); + $val = var_export($val, TRUE); } $params[$key] = $val; -- cgit v1.2.3-24-g4f1b From 1dc43aaefb341daaae10841e5ca2504ba9b03d7c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 20 Jan 2015 11:09:17 +0200 Subject: Remove error suppression from mysql_*connect() The suppression was kept so far because mysql_connect(), mysql_pconnect() emit E_DEPRECATION messages on PHP 5.5+. Well, we already default to 'mysqli' and there's no reason to use specifically 'mysql' on PHP 5.5, so we might as well let the deprecation notices appear and encourage users to switch drivers. --- system/database/drivers/mysql/mysql_driver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/database') diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 41cb14ba4..064cae223 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -132,8 +132,8 @@ class CI_DB_mysql_driver extends CI_DB { // Error suppression is necessary mostly due to PHP 5.5+ issuing E_DEPRECATED messages $this->conn_id = ($persistent === TRUE) - ? @mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) - : @mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); + ? mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags) + : mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags); // ---------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 90726b8c769ea75aec34814ddfa91655d488e6c3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 20 Jan 2015 12:39:22 +0200 Subject: [ci skip] Change some log messages' level 'Class Loaded' type of messages flood log files when log_threshold is set to 2 (debug). They're now logged as 'info' level. This is manually applying PR #1528, which was created to do the same thing, but became outdated. --- system/database/DB_driver.php | 2 +- system/database/DB_forge.php | 2 +- system/database/DB_utility.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'system/database') diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 185f930bf..11886757f 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -381,7 +381,7 @@ abstract class CI_DB_driver { } } - log_message('debug', 'Database Driver Class Initialized'); + log_message('info', 'Database Driver Class Initialized'); } // -------------------------------------------------------------------- diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 4ca980810..41f9bf5e2 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -167,7 +167,7 @@ abstract class CI_DB_forge { public function __construct(&$db) { $this->db =& $db; - log_message('debug', 'Database Forge Class Initialized'); + log_message('info', 'Database Forge Class Initialized'); } // -------------------------------------------------------------------- diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 963080fbb..4bf94d4dc 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -87,7 +87,7 @@ abstract class CI_DB_utility { public function __construct(&$db) { $this->db =& $db; - log_message('debug', 'Database Utility Class Initialized'); + log_message('info', 'Database Utility Class Initialized'); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 4cbe463b4c442e0e2dae2f43565e77f7ac5ecb86 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Wed, 21 Jan 2015 22:56:22 +0100 Subject: Remove closing blocks at end of PHP files --- system/database/DB.php | 3 --- system/database/DB_cache.php | 3 --- system/database/DB_driver.php | 3 --- system/database/DB_forge.php | 3 --- system/database/DB_query_builder.php | 3 --- system/database/DB_result.php | 3 --- system/database/DB_utility.php | 3 --- system/database/drivers/cubrid/cubrid_driver.php | 3 --- system/database/drivers/cubrid/cubrid_forge.php | 3 --- system/database/drivers/cubrid/cubrid_result.php | 3 --- system/database/drivers/cubrid/cubrid_utility.php | 3 --- system/database/drivers/ibase/ibase_driver.php | 3 --- system/database/drivers/ibase/ibase_forge.php | 3 --- system/database/drivers/ibase/ibase_result.php | 3 --- system/database/drivers/ibase/ibase_utility.php | 3 --- system/database/drivers/mssql/mssql_driver.php | 3 --- system/database/drivers/mssql/mssql_forge.php | 3 --- system/database/drivers/mssql/mssql_result.php | 3 --- system/database/drivers/mssql/mssql_utility.php | 3 --- system/database/drivers/mysql/mysql_driver.php | 3 --- system/database/drivers/mysql/mysql_forge.php | 3 --- system/database/drivers/mysql/mysql_result.php | 3 --- system/database/drivers/mysql/mysql_utility.php | 3 --- system/database/drivers/mysqli/mysqli_driver.php | 3 --- system/database/drivers/mysqli/mysqli_forge.php | 3 --- system/database/drivers/mysqli/mysqli_result.php | 3 --- system/database/drivers/mysqli/mysqli_utility.php | 3 --- system/database/drivers/oci8/oci8_driver.php | 3 --- system/database/drivers/oci8/oci8_forge.php | 3 --- system/database/drivers/oci8/oci8_result.php | 3 --- system/database/drivers/oci8/oci8_utility.php | 3 --- system/database/drivers/odbc/odbc_driver.php | 3 --- system/database/drivers/odbc/odbc_forge.php | 3 --- system/database/drivers/odbc/odbc_result.php | 3 --- system/database/drivers/odbc/odbc_utility.php | 3 --- system/database/drivers/pdo/pdo_driver.php | 3 --- system/database/drivers/pdo/pdo_forge.php | 3 --- system/database/drivers/pdo/pdo_result.php | 3 --- system/database/drivers/pdo/pdo_utility.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_4d_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_4d_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_informix_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_informix_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_oci_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_oci_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php | 3 --- system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php | 3 --- system/database/drivers/postgre/postgre_driver.php | 3 --- system/database/drivers/postgre/postgre_forge.php | 3 --- system/database/drivers/postgre/postgre_result.php | 3 --- system/database/drivers/postgre/postgre_utility.php | 3 --- system/database/drivers/sqlite/sqlite_driver.php | 3 --- system/database/drivers/sqlite/sqlite_forge.php | 3 --- system/database/drivers/sqlite/sqlite_result.php | 3 --- system/database/drivers/sqlite/sqlite_utility.php | 3 --- system/database/drivers/sqlite3/sqlite3_driver.php | 3 --- system/database/drivers/sqlite3/sqlite3_forge.php | 3 --- system/database/drivers/sqlite3/sqlite3_result.php | 3 --- system/database/drivers/sqlite3/sqlite3_utility.php | 3 --- system/database/drivers/sqlsrv/sqlsrv_driver.php | 3 --- system/database/drivers/sqlsrv/sqlsrv_forge.php | 3 --- system/database/drivers/sqlsrv/sqlsrv_result.php | 3 --- system/database/drivers/sqlsrv/sqlsrv_utility.php | 3 --- 79 files changed, 237 deletions(-) (limited to 'system/database') diff --git a/system/database/DB.php b/system/database/DB.php index a33627191..d411b679e 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -215,6 +215,3 @@ function &DB($params = '', $query_builder_override = NULL) return $DB; } - -/* End of file DB.php */ -/* Location: ./system/database/DB.php */ \ No newline at end of file diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php index 8f5317293..223055f60 100644 --- a/system/database/DB_cache.php +++ b/system/database/DB_cache.php @@ -219,6 +219,3 @@ class CI_DB_Cache { } } - -/* End of file DB_cache.php */ -/* Location: ./system/database/DB_cache.php */ \ No newline at end of file diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 11886757f..dd93abc11 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1906,6 +1906,3 @@ abstract class CI_DB_driver { } } - -/* End of file DB_driver.php */ -/* Location: ./system/database/DB_driver.php */ \ No newline at end of file diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index 41f9bf5e2..c8d773c98 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -1033,6 +1033,3 @@ abstract class CI_DB_forge { } } - -/* End of file DB_forge.php */ -/* Location: ./system/database/DB_forge.php */ \ No newline at end of file diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 80b25f71b..c9377e082 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2723,6 +2723,3 @@ abstract class CI_DB_query_builder extends CI_DB_driver { } } - -/* End of file DB_query_builder.php */ -/* Location: ./system/database/DB_query_builder.php */ \ No newline at end of file diff --git a/system/database/DB_result.php b/system/database/DB_result.php index 3f26b8aae..af58e3c39 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -664,6 +664,3 @@ class CI_DB_result { } } - -/* End of file DB_result.php */ -/* Location: ./system/database/DB_result.php */ \ No newline at end of file diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 4bf94d4dc..774d51533 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -421,6 +421,3 @@ abstract class CI_DB_utility { } } - -/* End of file DB_utility.php */ -/* Location: ./system/database/DB_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php index 438b48a5c..402117978 100644 --- a/system/database/drivers/cubrid/cubrid_driver.php +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -421,6 +421,3 @@ class CI_DB_cubrid_driver extends CI_DB { } } - -/* End of file cubrid_driver.php */ -/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php index a4dde8f10..9484e94e1 100644 --- a/system/database/drivers/cubrid/cubrid_forge.php +++ b/system/database/drivers/cubrid/cubrid_forge.php @@ -225,6 +225,3 @@ class CI_DB_cubrid_forge extends CI_DB_forge { } } - -/* End of file cubrid_forge.php */ -/* Location: ./system/database/drivers/cubrid/cubrid_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php index 193b98b92..e666bab56 100644 --- a/system/database/drivers/cubrid/cubrid_result.php +++ b/system/database/drivers/cubrid/cubrid_result.php @@ -175,6 +175,3 @@ class CI_DB_cubrid_result extends CI_DB_result { } } - -/* End of file cubrid_result.php */ -/* Location: ./system/database/drivers/cubrid/cubrid_result.php */ \ No newline at end of file diff --git a/system/database/drivers/cubrid/cubrid_utility.php b/system/database/drivers/cubrid/cubrid_utility.php index ca76cf98f..de7d71568 100644 --- a/system/database/drivers/cubrid/cubrid_utility.php +++ b/system/database/drivers/cubrid/cubrid_utility.php @@ -77,6 +77,3 @@ class CI_DB_cubrid_utility extends CI_DB_utility { return $this->db->display_error('db_unsupported_feature'); } } - -/* End of file cubrid_utility.php */ -/* Location: ./system/database/drivers/cubrid/cubrid_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php index 20c5d9c57..529c320cd 100644 --- a/system/database/drivers/ibase/ibase_driver.php +++ b/system/database/drivers/ibase/ibase_driver.php @@ -402,6 +402,3 @@ class CI_DB_ibase_driver extends CI_DB { } } - -/* End of file ibase_driver.php */ -/* Location: ./system/database/drivers/ibase/ibase_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/ibase/ibase_forge.php b/system/database/drivers/ibase/ibase_forge.php index 828739fb5..0e748c710 100644 --- a/system/database/drivers/ibase/ibase_forge.php +++ b/system/database/drivers/ibase/ibase_forge.php @@ -249,6 +249,3 @@ class CI_DB_ibase_forge extends CI_DB_forge { } } - -/* End of file ibase_forge.php */ -/* Location: ./system/database/drivers/ibase/ibase_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/ibase/ibase_result.php b/system/database/drivers/ibase/ibase_result.php index 1b6bbd72a..991146f45 100644 --- a/system/database/drivers/ibase/ibase_result.php +++ b/system/database/drivers/ibase/ibase_result.php @@ -159,6 +159,3 @@ class CI_DB_ibase_result extends CI_DB_result { } } - -/* End of file ibase_result.php */ -/* Location: ./system/database/drivers/ibase/ibase_result.php */ \ No newline at end of file diff --git a/system/database/drivers/ibase/ibase_utility.php b/system/database/drivers/ibase/ibase_utility.php index 9dca599a8..79d2788e5 100644 --- a/system/database/drivers/ibase/ibase_utility.php +++ b/system/database/drivers/ibase/ibase_utility.php @@ -67,6 +67,3 @@ class CI_DB_ibase_utility extends CI_DB_utility { } } - -/* End of file ibase_utility.php */ -/* Location: ./system/database/drivers/ibase/ibase_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 1aeff1d5a..8f15d8d69 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -529,6 +529,3 @@ class CI_DB_mssql_driver extends CI_DB { } } - -/* End of file mssql_driver.php */ -/* Location: ./system/database/drivers/mssql/mssql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php index 94d6332fb..84406a016 100644 --- a/system/database/drivers/mssql/mssql_forge.php +++ b/system/database/drivers/mssql/mssql_forge.php @@ -144,6 +144,3 @@ class CI_DB_mssql_forge extends CI_DB_forge { } } - -/* End of file mssql_forge.php */ -/* Location: ./system/database/drivers/mssql/mssql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index 0f6dcd21e..8828dc9e6 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -196,6 +196,3 @@ class CI_DB_mssql_result extends CI_DB_result { } } - -/* End of file mssql_result.php */ -/* Location: ./system/database/drivers/mssql/mssql_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php index a587f5d8f..1040b5e41 100644 --- a/system/database/drivers/mssql/mssql_utility.php +++ b/system/database/drivers/mssql/mssql_utility.php @@ -75,6 +75,3 @@ class CI_DB_mssql_utility extends CI_DB_utility { } } - -/* End of file mssql_utility.php */ -/* Location: ./system/database/drivers/mssql/mssql_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 064cae223..f8e9b6d61 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -495,6 +495,3 @@ class CI_DB_mysql_driver extends CI_DB { } } - -/* End of file mysql_driver.php */ -/* Location: ./system/database/drivers/mysql/mysql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php index d90f003e3..cb90065f2 100644 --- a/system/database/drivers/mysql/mysql_forge.php +++ b/system/database/drivers/mysql/mysql_forge.php @@ -241,6 +241,3 @@ class CI_DB_mysql_forge extends CI_DB_forge { } } - -/* End of file mysql_forge.php */ -/* Location: ./system/database/drivers/mysql/mysql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index aeed07c2c..26aaddd32 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.php @@ -197,6 +197,3 @@ class CI_DB_mysql_result extends CI_DB_result { } } - -/* End of file mysql_result.php */ -/* Location: ./system/database/drivers/mysql/mysql_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index 2ec4da4b2..55857ab08 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -209,6 +209,3 @@ class CI_DB_mysql_utility extends CI_DB_utility { } } - -/* End of file mysql_utility.php */ -/* Location: ./system/database/drivers/mysql/mysql_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 4370986bf..898f80e37 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -484,6 +484,3 @@ class CI_DB_mysqli_driver extends CI_DB { } } - -/* End of file mysqli_driver.php */ -/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php index 29a8b4cef..196afa845 100644 --- a/system/database/drivers/mysqli/mysqli_forge.php +++ b/system/database/drivers/mysqli/mysqli_forge.php @@ -242,6 +242,3 @@ class CI_DB_mysqli_forge extends CI_DB_forge { } } - -/* End of file mysqli_forge.php */ -/* Location: ./system/database/drivers/mysqli/mysqli_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index e1e94cd1d..d648828bd 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -184,6 +184,3 @@ class CI_DB_mysqli_result extends CI_DB_result { } } - -/* End of file mysqli_result.php */ -/* Location: ./system/database/drivers/mysqli/mysqli_result.php */ \ No newline at end of file diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index afa863e86..04fcd1ded 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -211,6 +211,3 @@ class CI_DB_mysqli_utility extends CI_DB_utility { } } - -/* End of file mysqli_utility.php */ -/* Location: ./system/database/drivers/mysqli/mysqli_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index f57e042c5..b87b41112 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -708,6 +708,3 @@ class CI_DB_oci8_driver extends CI_DB { } } - -/* End of file oci8_driver.php */ -/* Location: ./system/database/drivers/oci8/oci8_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index f215d9534..80100977a 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -147,6 +147,3 @@ class CI_DB_oci8_forge extends CI_DB_forge { } } - -/* End of file oci8_forge.php */ -/* Location: ./system/database/drivers/oci8/oci8_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index ffcb2d73d..9ec54cc5c 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -227,6 +227,3 @@ class CI_DB_oci8_result extends CI_DB_result { } } - -/* End of file oci8_result.php */ -/* Location: ./system/database/drivers/oci8/oci8_result.php */ \ No newline at end of file diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php index fcec02bd2..90022a8c1 100644 --- a/system/database/drivers/oci8/oci8_utility.php +++ b/system/database/drivers/oci8/oci8_utility.php @@ -66,6 +66,3 @@ class CI_DB_oci8_utility extends CI_DB_utility { } } - -/* End of file oci8_utility.php */ -/* Location: ./system/database/drivers/oci8/oci8_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 28a81e92f..f5d77a147 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -372,6 +372,3 @@ class CI_DB_odbc_driver extends CI_DB { } } - -/* End of file odbc_driver.php */ -/* Location: ./system/database/drivers/odbc/odbc_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php index 77338e83f..45c5dc108 100644 --- a/system/database/drivers/odbc/odbc_forge.php +++ b/system/database/drivers/odbc/odbc_forge.php @@ -84,6 +84,3 @@ class CI_DB_odbc_forge extends CI_DB_forge { } } - -/* End of file odbc_forge.php */ -/* Location: ./system/database/drivers/odbc/odbc_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index bfd928106..10b93d4fc 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -266,6 +266,3 @@ if ( ! function_exists('odbc_fetch_object')) return $rs_object; } } - -/* End of file odbc_result.php */ -/* Location: ./system/database/drivers/odbc/odbc_result.php */ \ No newline at end of file diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php index d155d015e..0e6c23328 100644 --- a/system/database/drivers/odbc/odbc_utility.php +++ b/system/database/drivers/odbc/odbc_utility.php @@ -61,6 +61,3 @@ class CI_DB_odbc_utility extends CI_DB_utility { } } - -/* End of file odbc_utility.php */ -/* Location: ./system/database/drivers/odbc/odbc_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index 0e727991d..68aeb0eef 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -398,6 +398,3 @@ class CI_DB_pdo_driver extends CI_DB { } } - -/* End of file pdo_driver.php */ -/* Location: ./system/database/drivers/pdo/pdo_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/pdo_forge.php b/system/database/drivers/pdo/pdo_forge.php index 92e2e172e..eedd9722d 100644 --- a/system/database/drivers/pdo/pdo_forge.php +++ b/system/database/drivers/pdo/pdo_forge.php @@ -63,6 +63,3 @@ class CI_DB_pdo_forge extends CI_DB_forge { protected $_drop_table_if = FALSE; } - -/* End of file pdo_forge.php */ -/* Location: ./system/database/drivers/pdo/pdo_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php index 93eaa3c72..fe26fea6e 100644 --- a/system/database/drivers/pdo/pdo_result.php +++ b/system/database/drivers/pdo/pdo_result.php @@ -196,6 +196,3 @@ class CI_DB_pdo_result extends CI_DB_result { } } - -/* End of file pdo_result.php */ -/* Location: ./system/database/drivers/pdo/pdo_result.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/pdo_utility.php b/system/database/drivers/pdo/pdo_utility.php index e9b80a47d..72169c3ca 100644 --- a/system/database/drivers/pdo/pdo_utility.php +++ b/system/database/drivers/pdo/pdo_utility.php @@ -61,6 +61,3 @@ class CI_DB_pdo_utility extends CI_DB_utility { } } - -/* End of file pdo_utility.php */ -/* Location: ./system/database/drivers/pdo/pdo_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php index d2266685d..cf5a0c77f 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php @@ -198,6 +198,3 @@ class CI_DB_pdo_4d_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_4d_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_4d_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php index 76d9ea91e..9ede03e10 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php @@ -215,6 +215,3 @@ class CI_DB_pdo_4d_forge extends CI_DB_4d_forge { } } - -/* End of file pdo_4d_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_4d_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php index 9ed66314b..98ac89f3d 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php @@ -248,6 +248,3 @@ class CI_DB_pdo_cubrid_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_cubrid_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php index 94dd1e219..15b100d9b 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php @@ -225,6 +225,3 @@ class CI_DB_pdo_cubrid_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_cubrid_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php index d1d42875a..c8d7c770d 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php @@ -330,6 +330,3 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_dblib_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php index 70f843516..d3dd9032e 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php @@ -142,6 +142,3 @@ class CI_DB_pdo_dblib_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_dblib_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php index 5fffd5a44..3bd5c9354 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php @@ -261,6 +261,3 @@ class CI_DB_pdo_firebird_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_firebird_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php index 1e4f39f39..ad28a6550 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php @@ -235,6 +235,3 @@ class CI_DB_pdo_firebird_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_firebird_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php index 17a7732fc..5dba26ec9 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php @@ -242,6 +242,3 @@ class CI_DB_pdo_ibm_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_ibm_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php index 47e6d1c6f..d1b5f92c9 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php @@ -152,6 +152,3 @@ class CI_DB_pdo_ibm_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_ibm_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php b/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php index 01e32f5f4..9f8c017a5 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php @@ -307,6 +307,3 @@ class CI_DB_pdo_informix_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_informix_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_informix_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php index 45a18a3d1..22bdf6104 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php @@ -161,6 +161,3 @@ class CI_DB_pdo_informix_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_informix_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_informix_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php index e4e4fa069..67dc5f5ec 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php @@ -264,6 +264,3 @@ class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_mysql_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php index 1f007e7f4..c90712a99 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php @@ -256,6 +256,3 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_mysql_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php b/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php index b80da33c2..d17e311f7 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php @@ -293,6 +293,3 @@ class CI_DB_pdo_oci_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_oci_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_oci_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php index 64065e875..e2078cf39 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php @@ -147,6 +147,3 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_oci_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_oci_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php index c5e5a4ca1..51c70b630 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php @@ -264,6 +264,3 @@ class CI_DB_pdo_odbc_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_odbc_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php index 6fc9839b4..291352982 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php @@ -68,6 +68,3 @@ class CI_DB_pdo_odbc_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_odbc_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php index 158c5d2eb..2dd41ca87 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php @@ -377,6 +377,3 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_pgsql_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php index 2b4985497..b4a6160a8 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php @@ -208,6 +208,3 @@ class CI_DB_pdo_pgsql_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_pgsql_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php index e1c8670a9..f07f49f84 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php @@ -203,6 +203,3 @@ class CI_DB_pdo_sqlite_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_sqlite_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php index e09db10f0..28faaddb7 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php @@ -235,6 +235,3 @@ class CI_DB_pdo_sqlite_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_sqlite_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php index ac3513560..b5bdbf91a 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php @@ -367,6 +367,3 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver { } } - -/* End of file pdo_sqlsrv_driver.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php index 92f38af92..602a1d426 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php @@ -142,6 +142,3 @@ class CI_DB_pdo_sqlsrv_forge extends CI_DB_pdo_forge { } } - -/* End of file pdo_sqlsrv_forge.php */ -/* Location: ./system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index fa5934972..3f3e3f018 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -641,6 +641,3 @@ class CI_DB_postgre_driver extends CI_DB { } } - -/* End of file postgre_driver.php */ -/* Location: ./system/database/drivers/postgre/postgre_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php index 85f4ad72b..d26e84cbc 100644 --- a/system/database/drivers/postgre/postgre_forge.php +++ b/system/database/drivers/postgre/postgre_forge.php @@ -203,6 +203,3 @@ class CI_DB_postgre_forge extends CI_DB_forge { } } - -/* End of file postgre_forge.php */ -/* Location: ./system/database/drivers/postgre/postgre_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index cfb64d372..a8ad24edf 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -180,6 +180,3 @@ class CI_DB_postgre_result extends CI_DB_result { } } - -/* End of file postgre_result.php */ -/* Location: ./system/database/drivers/postgre/postgre_result.php */ \ No newline at end of file diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php index 8252a39d4..7c6c02590 100644 --- a/system/database/drivers/postgre/postgre_utility.php +++ b/system/database/drivers/postgre/postgre_utility.php @@ -76,6 +76,3 @@ class CI_DB_postgre_utility extends CI_DB_utility { return $this->db->display_error('db_unsupported_feature'); } } - -/* End of file postgre_utility.php */ -/* Location: ./system/database/drivers/postgre/postgre_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 2137bade0..9d9caa0b4 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -355,6 +355,3 @@ class CI_DB_sqlite_driver extends CI_DB { } } - -/* End of file sqlite_driver.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php index 92721a97f..2bba330c0 100644 --- a/system/database/drivers/sqlite/sqlite_forge.php +++ b/system/database/drivers/sqlite/sqlite_forge.php @@ -203,6 +203,3 @@ class CI_DB_sqlite_forge extends CI_DB_forge { } } - -/* End of file sqlite_forge.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php index 3b42a6dc0..487d00366 100644 --- a/system/database/drivers/sqlite/sqlite_result.php +++ b/system/database/drivers/sqlite/sqlite_result.php @@ -162,6 +162,3 @@ class CI_DB_sqlite_result extends CI_DB_result { } } - -/* End of file sqlite_result.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_result.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php index 7b0b2cbeb..9cb454274 100644 --- a/system/database/drivers/sqlite/sqlite_utility.php +++ b/system/database/drivers/sqlite/sqlite_utility.php @@ -59,6 +59,3 @@ class CI_DB_sqlite_utility extends CI_DB_utility { } } - -/* End of file sqlite_utility.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php index 27d2bbfff..fdbe94939 100644 --- a/system/database/drivers/sqlite3/sqlite3_driver.php +++ b/system/database/drivers/sqlite3/sqlite3_driver.php @@ -358,6 +358,3 @@ class CI_DB_sqlite3_driver extends CI_DB { } } - -/* End of file sqlite3_driver.php */ -/* Location: ./system/database/drivers/sqlite3/sqlite3_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite3/sqlite3_forge.php b/system/database/drivers/sqlite3/sqlite3_forge.php index b1f3169c2..69f65b6f3 100644 --- a/system/database/drivers/sqlite3/sqlite3_forge.php +++ b/system/database/drivers/sqlite3/sqlite3_forge.php @@ -222,6 +222,3 @@ class CI_DB_sqlite3_forge extends CI_DB_forge { } } - -/* End of file sqlite3_forge.php */ -/* Location: ./system/database/drivers/sqlite3/sqlite3_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php index 179bcc895..f5c24672e 100644 --- a/system/database/drivers/sqlite3/sqlite3_result.php +++ b/system/database/drivers/sqlite3/sqlite3_result.php @@ -192,6 +192,3 @@ class CI_DB_sqlite3_result extends CI_DB_result { } } - -/* End of file sqlite3_result.php */ -/* Location: ./system/database/drivers/sqlite3/sqlite3_result.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlite3/sqlite3_utility.php b/system/database/drivers/sqlite3/sqlite3_utility.php index 3cd7faaa4..336f68754 100644 --- a/system/database/drivers/sqlite3/sqlite3_utility.php +++ b/system/database/drivers/sqlite3/sqlite3_utility.php @@ -59,6 +59,3 @@ class CI_DB_sqlite3_utility extends CI_DB_utility { } } - -/* End of file sqlite3_utility.php */ -/* Location: ./system/database/drivers/sqlite3/sqlite3_utility.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php index 078aaec3d..8f17c8f96 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_driver.php +++ b/system/database/drivers/sqlsrv/sqlsrv_driver.php @@ -569,6 +569,3 @@ class CI_DB_sqlsrv_driver extends CI_DB { } } - -/* End of file sqlsrv_driver.php */ -/* Location: ./system/database/drivers/sqlsrv/sqlsrv_driver.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php index 63c4f7e7f..b22b60a4a 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_forge.php +++ b/system/database/drivers/sqlsrv/sqlsrv_forge.php @@ -142,6 +142,3 @@ class CI_DB_sqlsrv_forge extends CI_DB_forge { } } - -/* End of file sqlsrv_forge.php */ -/* Location: ./system/database/drivers/sqlsrv/sqlsrv_forge.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php index 8ec2a9f42..d2be926aa 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_result.php +++ b/system/database/drivers/sqlsrv/sqlsrv_result.php @@ -191,6 +191,3 @@ class CI_DB_sqlsrv_result extends CI_DB_result { } } - -/* End of file sqlsrv_result.php */ -/* Location: ./system/database/drivers/sqlsrv/sqlsrv_result.php */ \ No newline at end of file diff --git a/system/database/drivers/sqlsrv/sqlsrv_utility.php b/system/database/drivers/sqlsrv/sqlsrv_utility.php index 8fa0e68d6..77cf0aaf3 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_utility.php +++ b/system/database/drivers/sqlsrv/sqlsrv_utility.php @@ -75,6 +75,3 @@ class CI_DB_sqlsrv_utility extends CI_DB_utility { } } - -/* End of file sqlsrv_utility.php */ -/* Location: ./system/database/drivers/sqlsrv/sqlsrv_utility.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 4070a63b74a515d2998d63989db57a15a1d9f742 Mon Sep 17 00:00:00 2001 From: Gwenael G Date: Fri, 23 Jan 2015 18:09:36 +0100 Subject: This $comment_clause local variable is declared but never used. --- system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'system/database') diff --git a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php index c90712a99..e8e24c6b3 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php @@ -199,8 +199,6 @@ class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge { $extra_clause = ' FIRST'; } - $comment_clause = isset($field['comment']) ? ' COMMENT ' . $field['comment'] : ''; - return $this->db->escape_identifiers($field['name']) .(empty($field['new_name']) ? '' : ' '.$this->db->escape_identifiers($field['new_name'])) .' '.$field['type'].$field['length'] -- cgit v1.2.3-24-g4f1b From 2f58ea641fd0a571688b164c5ee7f5fa65051684 Mon Sep 17 00:00:00 2001 From: Gwenael G Date: Fri, 23 Jan 2015 18:11:50 +0100 Subject: Fix error extends class name --- system/database/drivers/pdo/subdrivers/pdo_4d_forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php index 9ede03e10..9dc692c1e 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php @@ -44,7 +44,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/database/ */ -class CI_DB_pdo_4d_forge extends CI_DB_4d_forge { +class CI_DB_pdo_4d_forge extends CI_DB_pdo_forge { /** * CREATE DATABASE statement -- cgit v1.2.3-24-g4f1b From f1294cb402dc35db9c9b26441807d851d0449970 Mon Sep 17 00:00:00 2001 From: Gwenael G Date: Fri, 23 Jan 2015 18:19:32 +0100 Subject: Corrected loop with the $c variable --- system/database/drivers/sqlite3/sqlite3_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php index f5c24672e..387481b7f 100644 --- a/system/database/drivers/sqlite3/sqlite3_result.php +++ b/system/database/drivers/sqlite3/sqlite3_result.php @@ -98,7 +98,7 @@ class CI_DB_sqlite3_result extends CI_DB_result { ); $retval = array(); - for ($i = 0, $c = $this->num_fields(); $i < $this->num_fields(); $i++) + for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) { $retval[$i] = new stdClass(); $retval[$i]->name = $this->result_id->columnName($i); -- cgit v1.2.3-24-g4f1b From 9305a8bfe5d23850ab521faf8d1fd5e414e037c7 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Jan 2015 12:09:58 +0200 Subject: Close #3509 Not really a bug, but ... --- system/database/drivers/mysqli/mysqli_driver.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'system/database') diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 898f80e37..d16c98a68 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -125,6 +125,10 @@ class CI_DB_mysqli_driver extends CI_DB { $client_flags = ($this->compress === TRUE) ? MYSQLI_CLIENT_COMPRESS : 0; $mysqli = mysqli_init(); + $mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); + $mysqli->options(MYSQLI_OPT_READ_TIMEOUT, 5); + $mysqli->options(MYSQLI_OPT_RECONNECT, 1); + if ($this->stricton) { $mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode="STRICT_ALL_TABLES"'); -- cgit v1.2.3-24-g4f1b From 2a05fa6f9b65ceec277e13086fba3198f343eba2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Jan 2015 12:14:24 +0200 Subject: Apparently MYSQLI_OPT_READ_TIMEOUT doesn't work on PHP --- system/database/drivers/mysqli/mysqli_driver.php | 1 - 1 file changed, 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index d16c98a68..5541eef66 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -126,7 +126,6 @@ class CI_DB_mysqli_driver extends CI_DB { $mysqli = mysqli_init(); $mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - $mysqli->options(MYSQLI_OPT_READ_TIMEOUT, 5); $mysqli->options(MYSQLI_OPT_RECONNECT, 1); if ($this->stricton) -- cgit v1.2.3-24-g4f1b From 9ef0170126feb0b13a33abc42e6da7dbfa0a2ef3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Jan 2015 12:17:10 +0200 Subject: ... and neither does MYSQLI_OPT_RECONNECT --- system/database/drivers/mysqli/mysqli_driver.php | 1 - 1 file changed, 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 5541eef66..908f54bee 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -126,7 +126,6 @@ class CI_DB_mysqli_driver extends CI_DB { $mysqli = mysqli_init(); $mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - $mysqli->options(MYSQLI_OPT_RECONNECT, 1); if ($this->stricton) { -- cgit v1.2.3-24-g4f1b From b993b4b9703f29043f5cd5f1f406e675e04e814e Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Wed, 28 Jan 2015 12:22:38 -0500 Subject: fix typo in comments --- system/database/drivers/mysqli/mysqli_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 908f54bee..22a8ba678 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -436,7 +436,7 @@ class CI_DB_mysqli_driver extends CI_DB { * Error * * Returns an array containing code and message of the last - * database error that has occured. + * database error that has occurred. * * @return array */ -- cgit v1.2.3-24-g4f1b From b83a3d2890f8bae182901e78f660a4fe620b3f2b Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Thu, 29 Jan 2015 11:42:50 -0500 Subject: fix typo in comments --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index dd93abc11..a0803f170 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1643,7 +1643,7 @@ abstract class CI_DB_driver { /** * Close DB Connection * - * This method would be overriden by most of the drivers. + * This method would be overridden by most of the drivers. * * @return void */ -- cgit v1.2.3-24-g4f1b From ba6bd220d9ff5976caf979cb70ffb0a005020eba Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Thu, 29 Jan 2015 11:43:25 -0500 Subject: fix typo in comments --- system/database/DB_forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php index c8d773c98..f6ee2a63a 100644 --- a/system/database/DB_forge.php +++ b/system/database/DB_forge.php @@ -828,7 +828,7 @@ abstract class CI_DB_forge { */ protected function _attr_type(&$attributes) { - // Usually overriden by drivers + // Usually overridden by drivers } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 93e78132a0b6b78febeeb619e2d9d4a7f92d9bb5 Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Thu, 29 Jan 2015 11:43:56 -0500 Subject: fix typo in comments --- system/database/DB_query_builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index c9377e082..79cbfb3ad 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1699,7 +1699,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { * Groups tables in FROM clauses if needed, so there is no confusion * about operator precedence. * - * Note: This is only used (and overriden) by MySQL and CUBRID. + * Note: This is only used (and overridden) by MySQL and CUBRID. * * @return string */ -- cgit v1.2.3-24-g4f1b From c9982e4d38e30202f8c4253df296dc6000fdbcd2 Mon Sep 17 00:00:00 2001 From: Claudio Galdiolo Date: Thu, 29 Jan 2015 11:46:05 -0500 Subject: fix typo in comments --- system/database/DB_result.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'system/database') diff --git a/system/database/DB_result.php b/system/database/DB_result.php index af58e3c39..746f2a110 100644 --- a/system/database/DB_result.php +++ b/system/database/DB_result.php @@ -556,7 +556,7 @@ class CI_DB_result { /** * Number of fields in the result set * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @return int */ @@ -572,7 +572,7 @@ class CI_DB_result { * * Generates an array of column names. * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @return array */ @@ -588,7 +588,7 @@ class CI_DB_result { * * Generates an array of objects containing field meta-data. * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @return array */ @@ -602,7 +602,7 @@ class CI_DB_result { /** * Free the result * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @return void */ @@ -620,7 +620,7 @@ class CI_DB_result { * this internally before fetching results to make sure the * result set starts at zero. * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @param int $n * @return bool @@ -637,7 +637,7 @@ class CI_DB_result { * * Returns the result set as an array. * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @return array */ @@ -653,7 +653,7 @@ class CI_DB_result { * * Returns the result set as an object. * - * Overriden by driver result classes. + * Overridden by driver result classes. * * @param string $class_name * @return object -- cgit v1.2.3-24-g4f1b From 8dc37cb1963450fa400fb339d44360ec2da17722 Mon Sep 17 00:00:00 2001 From: Gwenael Gallon Date: Tue, 3 Feb 2015 01:00:42 +0100 Subject: Fix a wrong var name in class CI_DB_pdo_4d_forge::_attr_type --- system/database/drivers/pdo/subdrivers/pdo_4d_forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php index 9dc692c1e..6b420540c 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php @@ -164,7 +164,7 @@ class CI_DB_pdo_4d_forge extends CI_DB_pdo_forge { $attributes['TYPE'] = 'INT'; return; case 'BIGINT': - $attribites['TYPE'] = 'INT64'; + $attributes['TYPE'] = 'INT64'; return; default: return; } -- cgit v1.2.3-24-g4f1b From 8194ce50c3eae0f371e338d9093b99e2ff1b4d16 Mon Sep 17 00:00:00 2001 From: Gabriel Potkány Date: Wed, 4 Feb 2015 10:34:24 +0100 Subject: Fix typos in func names --- system/database/drivers/mssql/mssql_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php index 8828dc9e6..c1c42a486 100644 --- a/system/database/drivers/mssql/mssql_result.php +++ b/system/database/drivers/mssql/mssql_result.php @@ -107,7 +107,7 @@ class CI_DB_mssql_result extends CI_DB_result { public function field_data() { $retval = array(); - for ($i = 0, $c = $this->num_field(); $i < $c; $i++) + for ($i = 0, $c = $this->num_fields(); $i < $c; $i++) { $field = mssql_fetch_field($this->result_id, $i); -- cgit v1.2.3-24-g4f1b