From 72638cf40ec82396e963b326c40446b084c2cff4 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 5 Jul 2016 16:27:01 +1200
Subject: [PATCH] BUG Fix incorrect upgrade / rules

---
 _register_database.php                     | 4 +++-
 code/SQLite3Database.php                   | 2 +-
 code/SQLiteDatabaseConfigurationHelper.php | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/_register_database.php b/_register_database.php
index 10de6ec..351c3f9 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -13,6 +13,7 @@ $sqliteDatabaseAdapterRegistryFields = array(
 );
 
 // Basic SQLLite3 Database
+/** @skipUpgrade */
 DatabaseAdapterRegistry::register(
 	array(
 		'class' => 'SQLite3Database',
@@ -30,13 +31,14 @@ DatabaseAdapterRegistry::register(
 );
 
 // PDO database
+/** @skipUpgrade */
 DatabaseAdapterRegistry::register(
 	array(
 		'class' => 'SQLite3PDODatabase',
 		'title' => 'SQLite 3.3+ (using PDO)',
 		'helperPath' => dirname(__FILE__).'/code/SQLiteDatabaseConfigurationHelper.php',
 		'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
 			<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.',
diff --git a/code/SQLite3Database.php b/code/SQLite3Database.php
index f6bc0d9..ac1ea08 100644
--- a/code/SQLite3Database.php
+++ b/code/SQLite3Database.php
@@ -62,7 +62,7 @@ class SQLite3Database extends SS_Database
      */
     public static function database_extension()
     {
-        return Config::inst()->get('SQLite3Database', 'database_extension');
+        return Config::inst()->get('SilverStripe\\SQLite\\SQLite3Database', 'database_extension');
     }
 
     /**
diff --git a/code/SQLiteDatabaseConfigurationHelper.php b/code/SQLiteDatabaseConfigurationHelper.php
index 24349b1..ffea6b6 100644
--- a/code/SQLiteDatabaseConfigurationHelper.php
+++ b/code/SQLiteDatabaseConfigurationHelper.php
@@ -29,6 +29,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
     protected function createConnection($databaseConfig, &$error)
     {
         $error = null;
+        /** @skipUpgrade */
         try {
             if (!file_exists($databaseConfig['path'])) {
                 self::create_db_dir($databaseConfig['path']);
@@ -149,6 +150,7 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
     {
         $version = 0;
 
+        /** @skipUpgrade */
         switch ($databaseConfig['type']) {
             case 'SQLite3Database':
                 $info = SQLite3::version();