#946968 follow-up by Damien Tournoud: Refactor version check for databases.

3 files changed, 14 insertions, 8 deletions

diff --git a/includes/database/mysql/install.inc b/includes/database/mysql/install.inc
index 6965cb440..e0a3b510e 100644
--- a/includes/database/mysql/install.inc
+++ b/includes/database/mysql/install.inc
@@ -10,7 +10,6 @@
  * Specifies installation tasks for MySQL and equivalent databases.
  */
 class DatabaseTasks_mysql extends DatabaseTasks {
-
   /**
    * The PDO driver name for MySQL and equivalent databases.
    *
@@ -26,10 +25,10 @@ class DatabaseTasks_mysql extends DatabaseTasks {
   }
 
   /**
-   * Returns the minimum version for mysql.
+   * Returns the minimum version for MySQL.
    */
-  protected function minimumVersion() {
-    return DRUPAL_MINIMUM_MYSQL;
+  public function minimumVersion() {
+    return '5.0.15';
   }
 }
 
diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc
index 1ff69580e..65a50061f 100644
--- a/includes/database/pgsql/install.inc
+++ b/includes/database/pgsql/install.inc
@@ -31,8 +31,8 @@ class DatabaseTasks_pgsql extends DatabaseTasks {
     return 'PostgreSQL';
   }
 
-  protected function minimumVersion() {
-    return DRUPAL_MINIMUM_PGSQL;
+  public function minimumVersion() {
+    return '8.3';
   }
 
   /**
diff --git a/includes/database/sqlite/install.inc b/includes/database/sqlite/install.inc
index 07ce754f0..a872bc74d 100644
--- a/includes/database/sqlite/install.inc
+++ b/includes/database/sqlite/install.inc
@@ -8,11 +8,18 @@
 
 class DatabaseTasks_sqlite extends DatabaseTasks {
   protected $pdoDriver = 'sqlite';
+
   public function name() {
     return 'SQLite';
   }
-  protected function minimumVersion() {
-    return DRUPAL_MINIMUM_SQLITE;
+
+  /**
+   * Minimum engine version.
+   *
+   * @todo: consider upping to 3.6.8 in Drupal 8 to get SAVEPOINT support.
+   */
+  public function minimumVersion() {
+    return '3.3.7';
   }
 }