Unverified Commit 27987af5 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3107155 by catch, effulgentsia, andypost, xjm, daffie, Gábor Hojtsy,... 

Issue #3107155 by catch, effulgentsia, andypost, xjm, daffie, Gábor Hojtsy, alexpott, mondrake: Raise SQLite version requirement to 3.26 in Drupal 9
parent 28b8b4e4

core/INSTALL.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Drupal requires: 
  - Percona Server 5.7.8 (or greater) (http://www.percona.com/). Percona

    Server is a backwards-compatible replacement for MySQL.

  - PostgreSQL 9.1.2 (or greater) (http://www.postgresql.org/).

  - SQLite 3.7.11 (or greater) (http://www.sqlite.org/).

  - SQLite 3.26 (or greater) (http://www.sqlite.org/).



For more detailed information about Drupal requirements, including a list of

PHP extensions and configurations that are required, see "System requirements"

core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php

+9 −1
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ 
 */

class Tasks extends InstallTasks {



  /**

   * Minimum required SQLite version.

   *

   * Use to build sqlite library with json1 option for JSON datatype support.

   * @see https://www.sqlite.org/json1.html

   */

  const SQLITE_MINIMUM_VERSION = '3.26';



  /**

   * {@inheritdoc}

   */
@@ -28,7 +36,7 @@ public function name() { 
   * {@inheritdoc}

   */

  public function minimumVersion() {

    return '3.7.11';

    return static::SQLITE_MINIMUM_VERSION;

  }



  /**

core/tests/Drupal/BuildTests/Framework/Tests/HtRouterTest.php

+6 −0
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 
namespace Drupal\BuildTests\Framework\Tests;



use Drupal\BuildTests\QuickStart\QuickStartTestBase;

use Drupal\Core\Database\Driver\sqlite\Install\Tasks;



/**

 * @coversDefaultClass \Drupal\BuildTests\Framework\BuildTestBase

 * @group Build

 * @requires extension pdo_sqlite

 */

class HtRouterTest extends QuickStartTestBase {
@@ -14,6 +16,10 @@ class HtRouterTest extends QuickStartTestBase { 
   * @covers ::instantiateServer

   */

  public function testHtRouter() {

    if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) {

      $this->markTestSkipped();

    }



    $this->copyCodebase();

    $this->executeCommand('COMPOSER_DISCARD_CHANGES=true composer install --no-dev --no-interaction');

    $this->assertErrorOutputContains('Generating autoload files');

core/tests/Drupal/Tests/Core/Command/QuickStartTest.php

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\Core\Command;



use Drupal\Core\Database\Driver\sqlite\Install\Tasks;

use Drupal\Core\Test\TestDatabase;

use Drupal\Tests\BrowserTestBase;

use GuzzleHttp\Client;
@@ -18,6 +19,7 @@ 
 *

 * @runTestsInSeparateProcesses

 * @preserveGlobalState disabled

 * @requires extension pdo_sqlite

 *

 * @group Command

 */
@@ -87,6 +89,9 @@ public function testQuickStartCommand() { 
    if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) < 0) {

      $this->markTestSkipped();

    }

    if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) {

      $this->markTestSkipped();

    }



    // Install a site using the standard profile to ensure the one time login

    // link generation works.
@@ -177,6 +182,9 @@ public function testQuickStartInstallAndServerCommands() { 
    if (version_compare(phpversion(), DRUPAL_MINIMUM_SUPPORTED_PHP) < 0) {

      $this->markTestSkipped();

    }

    if (version_compare(\SQLite3::version()['versionString'], Tasks::SQLITE_MINIMUM_VERSION) < 0) {

      $this->markTestSkipped();

    }



    // Install a site.

    $install_command = [