diff --git a/_register_database.php b/_register_database.php index 8e71385..552f933 100644 --- a/_register_database.php +++ b/_register_database.php @@ -1,6 +1,7 @@ array( @@ -19,8 +20,10 @@ $sqliteDatabaseAdapterRegistryFields = array( DatabaseAdapterRegistry::register( array( 'class' => 'SQLite3Database', + 'module' => 'sqlite3', 'title' => 'SQLite 3.3+ (using SQLite3)', - 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', + 'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php', + 'helperClass' => SQLiteDatabaseConfigurationHelper::class, 'supported' => class_exists('SQLite3'), 'missingExtensionText' => 'The SQLite3 PHP Extension is not available. Please install or enable it of them and refresh this page.', @@ -37,8 +40,10 @@ DatabaseAdapterRegistry::register( DatabaseAdapterRegistry::register( array( 'class' => 'SQLite3PDODatabase', + 'module' => 'sqlite3', 'title' => 'SQLite 3.3+ (using PDO)', - 'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php', + 'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php', + 'helperClass' => SQLiteDatabaseConfigurationHelper::class, 'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())), 'missingExtensionText' => 'Either the PDO Extension or the diff --git a/code/SQLiteDatabaseConfigurationHelper.php b/code/SQLiteDatabaseConfigurationHelper.php index d45ca1e..9376d15 100644 --- a/code/SQLiteDatabaseConfigurationHelper.php +++ b/code/SQLiteDatabaseConfigurationHelper.php @@ -20,6 +20,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper /** * Create a connection of the appropriate type * + * @skipUpgrade * @param array $databaseConfig * @param string $error Error message passed by value * @return mixed|null Either the connection object, or null if error @@ -27,7 +28,6 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper protected function createConnection($databaseConfig, &$error) { $error = null; - /** @skipUpgrade */ try { if (!file_exists($databaseConfig['path'])) { self::create_db_dir($databaseConfig['path']); @@ -49,7 +49,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper $conn = @new PDO("sqlite:$file"); break; default: - $error = 'Invalid connection type'; + $error = 'Invalid connection type: ' . $databaseConfig['type']; return null; }