Skip to content

Remove all code and docs related to the database cache feature #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MGatner merged 1 commit into from
Sep 6, 2020
Merged

Remove all code and docs related to the database cache feature #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/Config/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ class Database extends \CodeIgniter\Database\Config
'DBPrefix' => '',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -67,8 +65,6 @@ class Database extends \CodeIgniter\Database\Config
'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down
14 changes: 0 additions & 14 deletions system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,6 @@ abstract class BaseConnection implements ConnectionInterface
*/
protected $DBDebug = false;

/**
* Should we cache results?
*
* @var boolean
*/
protected $cacheOn = false;

/**
* Path to store cache files.
*
* @var string
*/
protected $cacheDir;

/**
* Character set
*
Expand Down
6 changes: 0 additions & 6 deletions tests/system/Database/BaseConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ class BaseConnectionTest extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 'test_',
'pConnect' => true,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -35,8 +33,6 @@ class BaseConnectionTest extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 'test_',
'pConnect' => true,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -59,8 +55,6 @@ public function testSavesConfigOptions()
$this->assertSame('MockDriver', $db->DBDriver);
$this->assertTrue($db->pConnect);
$this->assertTrue($db->DBDebug);
$this->assertFalse($db->cacheOn);
$this->assertSame('my/cacheDir', $db->cacheDir);
$this->assertSame('utf8', $db->charset);
$this->assertSame('utf8_general_ci', $db->DBCollat);
$this->assertSame('', $db->swapPre);
Expand Down
8 changes: 0 additions & 8 deletions tests/system/Database/ConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ class DatabaseConfig extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 'test_',
'pConnect' => true,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -41,8 +39,6 @@ class DatabaseConfig extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 't_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -63,8 +59,6 @@ class DatabaseConfig extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 't_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -85,8 +79,6 @@ class DatabaseConfig extends \CodeIgniter\Test\CIUnitTestCase
'DBPrefix' => 't_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => 'my/cacheDir',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down
6 changes: 0 additions & 6 deletions tests/travis/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
'DBPrefix' => 'db_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -33,8 +31,6 @@
'DBPrefix' => 'db_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -54,8 +50,6 @@
'DBPrefix' => 'db_',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down
10 changes: 0 additions & 10 deletions user_guide_src/source/database/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ prototype::
'DBPrefix' => '',
'pConnect' => TRUE,
'DBDebug' => TRUE,
'cacheOn' => FALSE,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down Expand Up @@ -84,8 +82,6 @@ These failovers can be specified by setting the failover for a connection like t
'DBPrefix' => '',
'pConnect' => TRUE,
'DBDebug' => TRUE,
'cacheOn' => FALSE,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand All @@ -102,8 +98,6 @@ These failovers can be specified by setting the failover for a connection like t
'DBPrefix' => '',
'pConnect' => TRUE,
'DBDebug' => TRUE,
'cacheOn' => FALSE,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down Expand Up @@ -131,8 +125,6 @@ example, to set up a "test" environment you would do this::
'DBPrefix' => '',
'pConnect' => TRUE,
'DBDebug' => TRUE,
'cacheOn' => FALSE,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down Expand Up @@ -198,8 +190,6 @@ Explanation of Values:
installations to share one database.
**pConnect** TRUE/FALSE (boolean) - Whether to use a persistent connection.
**DBDebug** TRUE/FALSE (boolean) - Whether database errors should be displayed.
**cacheOn** TRUE/FALSE (boolean) - Whether database query caching is enabled.
**cacheDir** The absolute server path to your database query cache directory.
**charset** The character set used in communicating with the database.
**DBCollat** The character collation used in communicating with the database

Expand Down
2 changes: 0 additions & 2 deletions user_guide_src/source/database/connecting.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ the same format as the groups are defined in the configuration file::
'DBPrefix' => '',
'pConnect' => false,
'DBDebug' => (ENVIRONMENT !== 'production'),
'cacheOn' => false,
'cacheDir' => '',
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
Expand Down
1 change: 0 additions & 1 deletion user_guide_src/source/libraries/sessions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@ an application - it is just another table in your database.
However, there are some conditions that must be met:

- You can NOT use a persistent connection.
- You can NOT use a connection with the *cacheOn* setting enabled.

In order to use the 'DatabaseHandler' session driver, you must also create this
table that we already mentioned and then set it as your
Expand Down