Merge pull request #3608 from michalsn/fix/remove_db_cache

Remove all code and docs related to the database cache feature
codeigniter4 · Sep 6, 2020 · 58e0fba · 58e0fba
2 parents 7b0c41e + 546ab54
commit 58e0fba
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 51 deletions.
diff --git a/app/Config/Database.php b/app/Config/Database.php
@@ -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'  => '',
@@ -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'  => '',

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -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
 	 *

diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
@@ -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'  => '',
@@ -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'  => '',
@@ -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);

diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
@@ -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'  => '',
@@ -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'  => '',
@@ -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'  => '',
@@ -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'  => '',

diff --git a/tests/travis/Database.php b/tests/travis/Database.php
@@ -12,8 +12,6 @@
 	   'DBPrefix' => 'db_',
 	   'pConnect' => false,
 	   'DBDebug'  => (ENVIRONMENT !== 'production'),
-	   'cacheOn'  => false,
-	   'cacheDir' => '',
 	   'charset'  => 'utf8',
 	   'DBCollat' => 'utf8_general_ci',
 	   'swapPre'  => '',
@@ -33,8 +31,6 @@
 	   'DBPrefix' => 'db_',
 	   'pConnect' => false,
 	   'DBDebug'  => (ENVIRONMENT !== 'production'),
-	   'cacheOn'  => false,
-	   'cacheDir' => '',
 	   'charset'  => 'utf8',
 	   'DBCollat' => 'utf8_general_ci',
 	   'swapPre'  => '',
@@ -54,8 +50,6 @@
 	   'DBPrefix' => 'db_',
 	   'pConnect' => false,
 	   'DBDebug'  => (ENVIRONMENT !== 'production'),
-	   'cacheOn'  => false,
-	   'cacheDir' => '',
 	   'charset'  => 'utf8',
 	   'DBCollat' => 'utf8_general_ci',
 	   'swapPre'  => '',

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
@@ -24,8 +24,6 @@ prototype::
 		'DBPrefix' => '',
 		'pConnect' => TRUE,
 		'DBDebug'  => TRUE,
-		'cacheOn'  => FALSE,
-		'cacheDir' => '',
 		'charset'  => 'utf8',
 		'DBCollat' => 'utf8_general_ci',
 		'swapPre'  => '',
@@ -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'  => '',
@@ -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'  => '',
@@ -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'  => '',
@@ -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
 

diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
@@ -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'  => '',

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
@@ -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