summaryrefslogtreecommitdiffstats
path: root/application/config/database.php
AgeCommit message (Collapse)AuthorFilesLines
2015-07-16Add 'ssl_verify' option for mysqli driverAndrey Andreev1-0/+1
MYSQLI_OPT_SSL_VERIFY_SERVER_CERT is an undocumented option that may not always be available. Reference: http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt?view=markup&pathrev=302897
2015-07-16Add SSL support for PDO_MYSQL tooAndrey Andreev1-1/+1
Related: #3896
2015-07-16[ci skip] Add note about colon-separated ssl_cipher listAndrey Andreev1-1/+1
2015-07-16Refactor proposed changes from PR #3896Andrey Andreev1-1/+10
2015-07-16Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into ↵Andrey Andreev1-0/+2
feature/mysqli_ssl
2015-07-04Standardized new linesCalvin Tam1-1/+0
2015-06-18Fixed a cleanup miss in the default database config file to follow the ↵Tim Nolte1-6/+1
recent SSL feature changes. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-06-18Removed db_options configuration item for implementation later. Changed 5 ↵Tim Nolte1-6/+1
new MySQLi SSL configuration options to a single ssl_options config item that is an array that will be read to set the individual SSL options. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-06-08Merge branch 'develop' into feature/mysqli-sslTim Nolte1-1/+1
2015-06-08Added new MySQLi parameters/info to default database config file. Fixed ↵Tim Nolte1-0/+12
missing new MySQLi parameters from database configuration documentation examples. Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
2015-05-27[ci skip] Default 'db_debug' value to depend on ENVIRONMENT settingAndrey Andreev1-1/+1
Related: #3884
2015-02-19Remove 'autoinit' DB settingAndrey Andreev1-2/+0
It doesn't make sense to do a load->database() call but not connect to the database. IIRC there was more stuff in CI_DB_driver::initialize() at some point, so that was probably the reason why the setting existed in the first place. However, now it only results in users making invalid bug reports because they don't understand the feature ... Examples during just the past 2 weeks: #3571 #3601 #3607
2015-01-26Remove license blocks in /application filesvlakoff1-36/+0
These blocks are annoying for the user and serve little to no purpose as the files are just config files, a boilerplate controller and some views.
2015-01-21Remove closing blocks at end of PHP filesvlakoff1-3/+0
2015-01-12Merge branch 'develop' into feature/sessionAndrey Andreev1-3/+3
2015-01-09Bulk (mostly documentation) updateAndrey Andreev1-3/+3
- Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450
2014-11-11Fix merge conflictsAndrey Andreev1-14/+25
2014-10-27[ci skip] Switch to MIT license; close #3293Andrey Andreev1-14/+25
2014-05-31Initial version of new Session libraryAndrey Andreev1-1/+1
2014-02-11"BASEPATH check" consistencydarwinel1-1/+3
As described in issue #2870 + A change in the „How to create a library” example in the user_guide
2014-02-112013 > 2014darwinel1-1/+1
Update copyright notices from 2013 to 2014. And update one calendar example in user_guide from year 2013/2014 to 2014/2015.
2014-01-20Polish changes from PR #2830Andrey Andreev1-9/+9
2014-01-19Fix whitespaces to tabs.Ahmedul Haque Abid1-1/+1
2014-01-19Added save_queries config setting in config/database.phpAhmedul Haque Abid1-0/+8
2013-01-01[ci skip] Happy new yearAndrey Andreev1-1/+1
2012-10-12Set MySQL client compression to FALSE by default (problems reported with ↵Andrey Andreev1-4/+6
it), fix some typos, add encrypted database connections support and fix SQLSRV CharacterSet setting
2012-08-20database added config optionMichiel Vugteveen1-0/+2
2012-07-05Rename the 'interbase' DB driver to 'ibase' in order to match PHP's function ↵Andrey Andreev1-2/+3
prefix
2012-06-26Revert default config value of db pconnect to TRUE (issue #793)Andrey Andreev1-2/+2
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-22/+25
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst
2012-04-17minor style fixTimothy Warren1-2/+2
2012-04-17Updated supported database driver listTimothy Warren1-1/+2
2012-04-04Make database config easier to work withTimothy Warren1-17/+19
2012-03-26Clear some spaces and fix some inconsistencies in application/ php filesAndrey Andreev1-3/+3
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon1-1/+1
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-02-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-4/+4
2012-02-09Added database.phpTaufan Aditya1-0/+2
2012-01-02Updating copyright date to 2012Greg Aker1-1/+1
2011-12-28Turn "pconnect" off by default.Phil Sturgeon1-1/+1
Some users were complaining this was effecting their performance and having it on by default can potentially cause issues with people who don't understand what it does. Having it off by default means people are only effected if they want to be, which is safer.
2011-12-24Changes "ie" to "e.g." mrw1-1/+1
The instruction is followed by an example database type, not a clarification of what database types in general are, so it should use "e.g."
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort1-1/+2
The DB_driver can now use failover databases if specified. If the main connection shouldn't connect for some reason the DB_driver will now try to connect to specified connections in the failover config. Example config: $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; $db['default']['char_set'] = 'utf8'; $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; $db['default']['failover'] = array(); $db['default']['failover'][0]['hostname'] = 'localhost1'; $db['default']['failover'][0]['username'] = ''; $db['default']['failover'][0]['password'] = ''; $db['default']['failover'][0]['database'] = ''; $db['default']['failover'][0]['dbdriver'] = 'mysql'; $db['default']['failover'][0]['dbprefix'] = ''; $db['default']['failover'][0]['pconnect'] = TRUE; $db['default']['failover'][0]['db_debug'] = TRUE; $db['default']['failover'][0]['cache_on'] = FALSE; $db['default']['failover'][0]['cachedir'] = ''; $db['default']['failover'][0]['char_set'] = 'utf8'; $db['default']['failover'][0]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][0]['swap_pre'] = ''; $db['default']['failover'][0]['autoinit'] = TRUE; $db['default']['failover'][0]['stricton'] = FALSE; $db['default']['failover'][0]['failover'] = array(); $db['default']['failover'][1]['hostname'] = 'localhost2'; $db['default']['failover'][1]['username'] = ''; $db['default']['failover'][1]['password'] = ''; $db['default']['failover'][1]['database'] = ''; $db['default']['failover'][1]['dbdriver'] = 'mysql'; $db['default']['failover'][1]['dbprefix'] = ''; $db['default']['failover'][1]['pconnect'] = TRUE; $db['default']['failover'][1]['db_debug'] = TRUE; $db['default']['failover'][1]['cache_on'] = FALSE; $db['default']['failover'][1]['cachedir'] = ''; $db['default']['failover'][1]['char_set'] = 'utf8'; $db['default']['failover'][1]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][1]['swap_pre'] = ''; $db['default']['failover'][1]['autoinit'] = TRUE; $db['default']['failover'][1]['stricton'] = FALSE; $db['default']['failover'][1]['failover'] = array(); Signed-off-by: Felix Balfoort <fhjbalfoort@gmail.com>
2011-10-21fixing typo in attribution blockDerek Jones1-1/+1
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones1-0/+25
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-08-23Got PDO workingTimothy Warren1-1/+1
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones1-1/+2
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones1-5/+5
broke the Typography class's string replacements, for instance
2011-05-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class ↵Derek Jones1-1/+2
property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
2011-04-25Fixed double-space typo.Razican1-5/+5
2011-04-19modified MySQL and MySQLi drivers to address a potential SQL injection ↵Derek Jones1-0/+6
attack vector when multi-byte character set connections are employed. (Does not impact Latin-1, UTF-8, etc. encodings)
2010-08-12single quotes instead of double quotes by default to prevent PHP from trying ↵Derek Allard1-14/+14
to parse a $ in a password as a variable.