tonyair/silverstripe-sqlite3
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-sqlite3 synced 2024-10-22 17:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix incorrect upgrade / rules

Browse Source
This commit is contained in:
Damian Mooyman 2016-07-05 16:27:01 +12:00
parent d09ab6bea4
commit 72638cf40e
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_register_database.php
View File

@ -13,6 +13,7 @@ $sqliteDatabaseAdapterRegistryFields = array(
); );
// Basic SQLLite3 Database // Basic SQLLite3 Database
/** @skipUpgrade */
DatabaseAdapterRegistry::register( DatabaseAdapterRegistry::register(
array( array(
'class' => 'SQLite3Database', 'class' => 'SQLite3Database',
@ -30,13 +31,14 @@ DatabaseAdapterRegistry::register(
); );
// PDO database // PDO database
/** @skipUpgrade */
DatabaseAdapterRegistry::register( DatabaseAdapterRegistry::register(
array( array(
'class' => 'SQLite3PDODatabase', 'class' => 'SQLite3PDODatabase',
'title' => 'SQLite 3.3+ (using PDO)', 'title' => 'SQLite 3.3+ (using PDO)',
'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())), 'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())),
'missingExtensionText' => 'missingExtensionText' =>
'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the 'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the
<a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a> <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a>
are unavailable. Please install or enable these and refresh this page.', are unavailable. Please install or enable these and refresh this page.',

2
code/SQLite3Database.php
View File

@ -62,7 +62,7 @@ class SQLite3Database extends SS_Database
*/ */
public static function database_extension() public static function database_extension()
{ {
return Config::inst()->get('SQLite3Database', 'database_extension'); return Config::inst()->get('SilverStripe\\SQLite\\SQLite3Database', 'database_extension');
} }
/** /**

2
code/SQLiteDatabaseConfigurationHelper.php
View File

@ -29,6 +29,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
protected function createConnection($databaseConfig, &$error) protected function createConnection($databaseConfig, &$error)
{ {
$error = null; $error = null;
/** @skipUpgrade */
try { try {
if (!file_exists($databaseConfig['path'])) { if (!file_exists($databaseConfig['path'])) {
self::create_db_dir($databaseConfig['path']); self::create_db_dir($databaseConfig['path']);
@ -149,6 +150,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
{ {
$version = 0; $version = 0;
/** @skipUpgrade */
switch ($databaseConfig['type']) { switch ($databaseConfig['type']) {
case 'SQLite3Database': case 'SQLite3Database':
$info = SQLite3::version(); $info = SQLite3::version();