From c8235c0f062f799966730c5e9421d9bc9cbdd397 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 6 Mar 2014 10:13:12 +1300 Subject: [PATCH] BUG Properly deprecate old 'memory' config setting --- _config.php | 2 ++ code/SQLite3Database.php | 10 ++++++++++ code/SQLitePDODatabase.php | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/_config.php b/_config.php index d765dee..dc121fc 100644 --- a/_config.php +++ b/_config.php @@ -1,5 +1,7 @@ enum_map = array(); $parameters = $this->parameters; + + if(!empty($parameters['memory'])) { + Deprecation::notice( + '1.4.0', + "\$databaseConfig['memory'] is deprecated. Use \$databaseConfig['path'] = ':memory:' instead.", + Deprecation::SCOPE_GLOBAL + ); + $parameters['path'] = ':memory:'; + } + $dbName = !isset($this->database) ? $parameters['database'] : $this->database; $file = $parameters['path']; diff --git a/code/SQLitePDODatabase.php b/code/SQLitePDODatabase.php index 2d015bc..89efadf 100644 --- a/code/SQLitePDODatabase.php +++ b/code/SQLitePDODatabase.php @@ -13,6 +13,16 @@ class SQLitePDODatabase extends SQLite3Database { function connectDatabase() { $this->enum_map = array(); $parameters = $this->parameters; + + if(!empty($parameters['memory'])) { + Deprecation::notice( + '1.4.0', + "\$databaseConfig['memory'] is deprecated. Use \$databaseConfig['path'] = ':memory:' instead.", + Deprecation::SCOPE_GLOBAL + ); + $parameters['path'] = ':memory:'; + } + $dbName = !isset($this->database) ? $parameters['database'] : $dbName=$this->database; $file = $parameters['path'];