[!!!][TASK] Extension manager: Drop "Download SQL Dump" 64/53764/3
authorChristian Kuhn <lolli@schwarzbu.ch>
Mon, 21 Aug 2017 15:05:08 +0000 (17:05 +0200)
committerBenni Mack <benni@typo3.org>
Tue, 22 Aug 2017 19:10:49 +0000 (21:10 +0200)
The em in "Installed Extensions" has a button "Download SQL Dump"
for all extensions that provide ext_tables.sql. On click, an sql
dump file is sent.

This feature is severely flawed:
* Dumps of extensions that add fields to existing tables contain
  a 'drop table' of these tables, the 'import into' statements are
  broken and only (try to) add these fields again. This easily
  leads to hazard in DB if importing such a dump.
* There are no charset specs and other meta data whatsoever in the dump.
* The dump is not dbal compatible, field definitions and imports
  are incomplete.

We assume nobody really used this feature in a sane way, even at
this prominent position in em. The lack of bug reports to this
broken feature and the fact there have been zero changes in this
area since main em refactoring years ago support this view.

There are way better options to retrieve proper data specifications:
* The list module has a csv export
* Ext:impexp supports export and import in a much better way
  including proper relation handling and other options.
* Low level db exports and backups should be done on cli or
  with more powerful guis like phpmyadmin or other db engine
  specific tools.

The feature is dropped without substitution.

The v8 backport of this patch will just remove the button from
the em list view, but keep all code.

Change-Id: Ia027e7498c5464af04c49675987a696ee3a06070
Resolves: #82148
Releases: master, 8.7
Reviewed-on: https://review.typo3.org/53764
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
14 files changed:
typo3/sysext/core/Documentation/Changelog/master/Breaking-82148-DownloadSQLDumpDroppedInEM.rst [new file with mode: 0644]
typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php [deleted file]
typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php [deleted file]
typo3/sysext/extensionmanager/Classes/ViewHelpers/ReloadSqlDataViewHelper.php
typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
typo3/sysext/extensionmanager/ext_tables.php
typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php [deleted file]
typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php
typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php [deleted file]
typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php [deleted file]

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82148-DownloadSQLDumpDroppedInEM.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82148-DownloadSQLDumpDroppedInEM.rst
new file mode 100644 (file)
index 0000000..7495d70
--- /dev/null
@@ -0,0 +1,38 @@
+.. include:: ../../Includes.txt
+
+==================================================
+Breaking: #82148 - Download SQL dump dropped in EM
+==================================================
+
+See :issue:`82148`
+
+Description
+===========
+
+The "Download SQL Dump" feature in extension manager list view has been dropped,
+it is no longer possible to download the dump file this button created.
+
+
+Impact
+======
+
+The button in the extension manager is gone along with various classes
+and methods that took care of the functionality:
+
+* Dropped class :php:`TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility`
+* Dropped class :php:`TYPO3\CMS\Extensionmanager\ViewHelpers\DownloadExtensionDataViewHelper`
+* Dropped class :php:`TYPO3\CMS\Install\Service\SqlExpectedSchemaService`
+* Dropped class :php:`TYPO3\CMS\Install\Service\SqlSchemaMigrationService`
+* Dropped method :php:`TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility->sendSqlDumpFileToBrowserAndDelete()`
+
+
+Migration
+=========
+
+The core provides the "Import / Export" extension to manage database data,
+furthermore the "List" module has an CSV export feature.
+
+For true database backups we recommend the CLI tools of the database engine
+or dedicated GUI applications for this task.
+
+.. index:: Backend, Database, PHP-API, FullyScanned
\ No newline at end of file
index f3d717e..5a8db9a 100644 (file)
@@ -158,26 +158,6 @@ class ActionController extends AbstractController
     }
 
     /**
-     * Download data of an extension as sql statements
-     *
-     * @param string $extension
-     * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
-     */
-    protected function downloadExtensionDataAction($extension)
-    {
-        $error = null;
-        $sqlData = $this->installUtility->getExtensionSqlDataDump($extension);
-        $dump = $sqlData['extTables'] . $sqlData['staticSql'];
-        $fileName = $extension . '_sqlDump.sql';
-        $filePath = PATH_site . 'typo3temp/var/ExtensionManager/' . $fileName;
-        $error = \TYPO3\CMS\Core\Utility\GeneralUtility::writeFileToTypo3tempDir($filePath, $dump);
-        if (is_string($error)) {
-            throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException($error, 1343048718);
-        }
-        $this->fileHandlingUtility->sendSqlDumpFileToBrowserAndDelete($filePath, $fileName);
-    }
-
-    /**
      * Reloads the static SQL data of an extension
      *
      * @param string $extension
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php
deleted file mode 100644 (file)
index 647a476..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-namespace TYPO3\CMS\Extensionmanager\Utility;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Utility for dealing with database related operations
- */
-class DatabaseUtility implements \TYPO3\CMS\Core\SingletonInterface
-{
-    /**
-     * @var string
-     */
-    const MULTI_LINEBREAKS = '
-
-
-';
-    /**
-     * Dump content for static tables
-     *
-     * @param array $dbFields
-     * @return string
-     */
-    public function dumpStaticTables($dbFields)
-    {
-        $out = '';
-        // Traverse the table list and dump each:
-        foreach ($dbFields as $table => $fields) {
-            if (is_array($dbFields[$table]['fields'])) {
-                $header = $this->dumpHeader();
-                $tableHeader = $this->dumpTableHeader($table, $dbFields[$table], true);
-                $insertStatements = $this->dumpTableContent($table, $dbFields[$table]['fields']);
-                $out .= $header . self::MULTI_LINEBREAKS . $tableHeader . self::MULTI_LINEBREAKS . $insertStatements . self::MULTI_LINEBREAKS;
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Header comments of the SQL dump file
-     *
-     * @return string Table header
-     */
-    protected function dumpHeader()
-    {
-        return trim('
-# TYPO3 Extension Manager dump 1.1
-#
-#--------------------------------------------------------
-');
-    }
-
-    /**
-     * Dump CREATE TABLE definition
-     *
-     * @param string $table
-     * @param array $fieldKeyInfo
-     * @param bool $dropTableIfExists
-     * @return string
-     */
-    protected function dumpTableHeader($table, array $fieldKeyInfo, $dropTableIfExists = false)
-    {
-        $lines = [];
-        $dump = '';
-        // Create field definitions
-        if (is_array($fieldKeyInfo['fields'])) {
-            foreach ($fieldKeyInfo['fields'] as $fieldN => $data) {
-                $lines[] = '  ' . $fieldN . ' ' . $data;
-            }
-        }
-        // Create index key definitions
-        if (is_array($fieldKeyInfo['keys'])) {
-            foreach ($fieldKeyInfo['keys'] as $fieldN => $data) {
-                $lines[] = '  ' . $data;
-            }
-        }
-        // Compile final output:
-        if (!empty($lines)) {
-            $dump = trim('
-#
-# Table structure for table "' . $table . '"
-#
-' . ($dropTableIfExists ? 'DROP TABLE IF EXISTS ' . $table . ';
-' : '') . 'CREATE TABLE ' . $table . ' (
-' . implode((',' . LF), $lines) . '
-);');
-        }
-        return $dump;
-    }
-
-    /**
-     * Dump table content
-     * Is DBAL compliant, but the dump format is written as MySQL standard.
-     * If the INSERT statements should be imported in a DBMS using other
-     * quoting than MySQL they must first be translated.
-     *
-     * @param string $table Table name
-     * @param array $fieldStructure Field structure
-     * @return string SQL Content of dump (INSERT statements)
-     */
-    protected function dumpTableContent($table, array $fieldStructure)
-    {
-        // Substitution of certain characters (borrowed from phpMySQL):
-        $search = ['\\', '\'', "\0", "\n", "\r", "\x1A"];
-        $replace = ['\\\\', '\\\'', '\\0', '\\n', '\\r', '\\Z'];
-        $lines = [];
-        // Select all rows from the table:
-        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table);
-        $queryBuilder->getRestrictions()
-            ->removeAll();
-        $result = $queryBuilder->select('*')
-            ->from($table)
-            ->execute();
-        // Traverse the selected rows and dump each row as a line in the file:
-        while ($row = $result->fetch()) {
-            $values = [];
-            foreach ($fieldStructure as $field => $structure) {
-                $values[] = isset($row[$field]) ? '\'' . str_replace($search, $replace, $row[$field]) . '\'' : 'NULL';
-            }
-            $lines[] = 'INSERT INTO ' . $table . ' VALUES (' . implode(', ', $values) . ');';
-        }
-        // Implode lines and return:
-        return implode(LF, $lines);
-    }
-}
index e3a09df..80d0f79 100644 (file)
@@ -515,27 +515,6 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * Sends the sql dump file to the browser and deletes it afterwards
-     *
-     * @param string $fileName
-     * @param string $downloadName
-     */
-    public function sendSqlDumpFileToBrowserAndDelete($fileName, $downloadName = '')
-    {
-        if ($downloadName === '') {
-            $downloadName = basename($fileName, '.sql');
-        } else {
-            $downloadName = basename($downloadName, '.sql');
-        }
-        header('Content-Type: text');
-        header('Content-Length: ' . filesize($fileName));
-        header('Content-Disposition: attachment; filename="' . $downloadName . '.sql"');
-        readfile($fileName);
-        unlink($fileName);
-        die;
-    }
-
-    /**
      * @param string $extensionKey
      */
     protected function reloadPackageInformation($extensionKey)
index 28c2fec..65b16b6 100644 (file)
@@ -33,11 +33,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
     public $objectManager;
 
     /**
-     * @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService
-     */
-    public $installToolSqlParser;
-
-    /**
      * @var \TYPO3\CMS\Extensionmanager\Utility\DependencyUtility
      */
     protected $dependencyUtility;
@@ -53,11 +48,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
     protected $listUtility;
 
     /**
-     * @var \TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility
-     */
-    protected $databaseUtility;
-
-    /**
      * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository
      */
     public $extensionRepository;
@@ -91,14 +81,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * @param \TYPO3\CMS\Install\Service\SqlSchemaMigrationService $installToolSqlParser
-     */
-    public function injectInstallToolSqlParser(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService $installToolSqlParser)
-    {
-        $this->installToolSqlParser = $installToolSqlParser;
-    }
-
-    /**
      * @param \TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility
      */
     public function injectDependencyUtility(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility)
@@ -123,14 +105,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * @param \TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility $databaseUtility
-     */
-    public function injectDatabaseUtility(\TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility $databaseUtility)
-    {
-        $this->databaseUtility = $databaseUtility;
-    }
-
-    /**
      * @param \TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository $extensionRepository
      */
     public function injectExtensionRepository(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository $extensionRepository)
@@ -523,38 +497,6 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * Get the data dump for an extension
-     *
-     * @param string $extension
-     * @return array
-     */
-    public function getExtensionSqlDataDump($extension)
-    {
-        $extension = $this->enrichExtensionWithDetails($extension);
-        $filePrefix = PATH_site . $extension['siteRelPath'];
-        $sqlData['extTables'] = $this->getSqlDataDumpForFile($filePrefix . 'ext_tables.sql');
-        $sqlData['staticSql'] = $this->getSqlDataDumpForFile($filePrefix . 'ext_tables_static+adt.sql');
-        return $sqlData;
-    }
-
-    /**
-     * Gets the sql data dump for a specific sql file (for example ext_tables.sql)
-     *
-     * @param string $sqlFile
-     * @return string
-     */
-    protected function getSqlDataDumpForFile($sqlFile)
-    {
-        $sqlData = '';
-        if (file_exists($sqlFile)) {
-            $sqlContent = file_get_contents($sqlFile);
-            $fieldDefinitions = $this->installToolSqlParser->getFieldDefinitions_fileContent($sqlContent);
-            $sqlData = $this->databaseUtility->dumpStaticTables($fieldDefinitions);
-        }
-        return $sqlData;
-    }
-
-    /**
      * Checks if an update for an extension is available which also resolves dependencies.
      *
      * @internal
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
deleted file mode 100644 (file)
index 9a65ecd..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Imaging\Icon;
-use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * view helper for displaying a download extension data link
- * @internal
- */
-class DownloadExtensionDataViewHelper extends Link\ActionViewHelper
-{
-    /**
-     * Initialize arguments
-     *
-     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
-     */
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-        $this->registerArgument('extension', 'array', '', true);
-    }
-
-    /**
-     * Renders an install link
-     *
-     * @return string the rendered a tag
-     */
-    public function render()
-    {
-        $extension = $this->arguments['extension'];
-        /** @var IconFactory $iconFactory */
-        $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-
-        $filePrefix = PATH_site . $extension['siteRelPath'];
-        if (!file_exists(($filePrefix . 'ext_tables.sql')) && !file_exists(($filePrefix . 'ext_tables_static+adt.sql'))) {
-            return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
-        }
-        $uriBuilder = $this->controllerContext->getUriBuilder();
-        $uriBuilder->reset();
-        $uri = $uriBuilder->uriFor('downloadExtensionData', [
-            'extension' => $extension['key']
-        ], 'Action');
-        $this->tag->addAttribute('href', $uri);
-        $cssClass = 'downloadExtensionData btn btn-default';
-        $this->tag->addAttribute('class', $cssClass);
-        $this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.downloadsql', 'extensionmanager'));
-        $this->tag->setContent($iconFactory->getIcon('actions-system-extension-sqldump', Icon::SIZE_SMALL)->render());
-        return $this->tag->render();
-    }
-}
index 631c426..966d289 100644 (file)
@@ -74,7 +74,6 @@ class ReloadSqlDataViewHelper extends Link\ActionViewHelper
         $uriBuilder->reset();
         $uri = $uriBuilder->uriFor('reloadExtensionData', ['extension' => $extension['key']], 'Action');
         $this->tag->addAttribute('href', $uri);
-        $this->tag->addAttribute('class', 'downloadExtensionData btn btn-default');
         $this->tag->addAttribute('title', LocalizationUtility::translate($languageKey, 'extensionmanager'));
         $this->tag->setContent($iconFactory->getIcon($iconIdentifier, Icon::SIZE_SMALL)->render());
 
index 9509e31..68c60d3 100644 (file)
@@ -92,7 +92,6 @@
                                                        <f:link.action action="downloadExtensionZip" controller="Action" arguments="{extension:extension.key}" title="{f:translate(key:'extensionList.downloadzip')}" class="btn btn-default">
                                                                <core:icon identifier="actions-system-extension-download" />
                                                        </f:link.action>
-                                                       <em:downloadExtensionData class="btn btn-default" extension="{extension}" />
                                                        <em:reloadSqlData class="btn btn-default" extension="{extension}" />
                                                </em:processAvailableActions>
                                        </div>
index 40c69b3..100f74c 100644 (file)
@@ -7,7 +7,7 @@ if (TYPO3_MODE === 'BE') {
         'tools',
         'extensionmanager', '', [
             'List' => 'index,unresolvedDependencies,ter,showAllVersions,distributions',
-            'Action' => 'toggleExtensionInstallationState,installExtensionWithoutSystemDependencyCheck,removeExtension,downloadExtensionZip,downloadExtensionData,reloadExtensionData',
+            'Action' => 'toggleExtensionInstallationState,installExtensionWithoutSystemDependencyCheck,removeExtension,downloadExtensionZip,reloadExtensionData',
             'Configuration' => 'showConfigurationForm,save,saveAndClose',
             'Download' => 'checkDependencies,installFromTer,installExtensionWithoutSystemDependencyCheck,installDistribution,updateExtension,updateCommentForUpdatableVersions',
             'UpdateScript' => 'show',
diff --git a/typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php b/typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php
deleted file mode 100644 (file)
index d5e34e4..0000000
+++ /dev/null
@@ -1,675 +0,0 @@
-<?php
-namespace TYPO3\CMS\Install\Service;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use Doctrine\DBAL\DBALException;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Verify TYPO3 DB table structure. Mainly used in install tool
- * compare wizard and extension manager.
- */
-class SqlSchemaMigrationService
-{
-    /**
-     * @constant Maximum field width of MySQL
-     */
-    const MYSQL_MAXIMUM_FIELD_WIDTH = 64;
-
-    /**
-     * @var string Prefix of deleted tables
-     */
-    protected $deletedPrefixKey = 'zzz_deleted_';
-
-    /**
-     * @var array Caching output "SHOW CHARACTER SET"
-     */
-    protected $character_sets = [];
-
-    /**
-     * Set prefix of deleted tables
-     *
-     * @param string $prefix Prefix string
-     */
-    public function setDeletedPrefixKey($prefix)
-    {
-        $this->deletedPrefixKey = $prefix;
-    }
-
-    /**
-     * Get prefix of deleted tables
-     *
-     * @return string
-     */
-    public function getDeletedPrefixKey()
-    {
-        return $this->deletedPrefixKey;
-    }
-
-    /**
-     * Reads the field definitions for the input SQL-file string
-     *
-     * @param string $fileContent Should be a string read from an SQL-file made with 'mysqldump [database_name] -d'
-     * @return array Array with information about table.
-     */
-    public function getFieldDefinitions_fileContent($fileContent)
-    {
-        $lines = GeneralUtility::trimExplode(LF, $fileContent, true);
-        $table = '';
-        $total = [];
-        foreach ($lines as $value) {
-            if ($value[0] === '#') {
-                // Ignore comments
-                continue;
-            }
-            if ($table === '') {
-                $parts = GeneralUtility::trimExplode(' ', $value, true);
-                if (strtoupper($parts[0]) === 'CREATE' && strtoupper($parts[1]) === 'TABLE') {
-                    $table = str_replace('`', '', $parts[2]);
-                    // tablenames are always lowercase on windows!
-                    if (TYPO3_OS === 'WIN') {
-                        $table = strtolower($table);
-                    }
-                }
-            } else {
-                if ($value[0] === ')' && substr($value, -1) === ';') {
-                    $ttype = [];
-                    if (preg_match('/(ENGINE|TYPE)[ ]*=[ ]*([a-zA-Z]*)/', $value, $ttype)) {
-                        $total[$table]['extra']['ENGINE'] = $ttype[2];
-                    }
-                    // Otherwise, just do nothing: If table engine is not defined, just accept the system default.
-                    // Set the collation, if specified
-                    if (preg_match('/(COLLATE)[ ]*=[ ]*([a-zA-z0-9_-]+)/', $value, $tcollation)) {
-                        $total[$table]['extra']['COLLATE'] = $tcollation[2];
-                    } else {
-                        // Otherwise, get the CHARACTER SET and try to find the default collation for it as returned by "SHOW CHARACTER SET" query (for details, see http://dev.mysql.com/doc/refman/5.1/en/charset-table.html)
-                        if (preg_match('/(CHARSET|CHARACTER SET)[ ]*=[ ]*([a-zA-z0-9_-]+)/', $value, $tcharset)) {
-                            // Note: Keywords "DEFAULT CHARSET" and "CHARSET" are the same, so "DEFAULT" can just be ignored
-                            $charset = $tcharset[2];
-                        } else {
-                            $charset = 'utf8';
-                        }
-                        $total[$table]['extra']['COLLATE'] = $this->getCollationForCharset($charset);
-                    }
-                    // Remove table marker and start looking for the next "CREATE TABLE" statement
-                    $table = '';
-                } else {
-                    // Strip trailing commas
-                    $lineV = preg_replace('/,$/', '', $value);
-                    $lineV = str_replace('`', '', $lineV);
-                    // Reduce multiple blanks and tabs except newline
-                    $lineV = preg_replace('/\h+/', ' ', $lineV);
-                    $parts = explode(' ', $lineV, 2);
-                    // Field definition
-                    if (!preg_match('/(PRIMARY|UNIQUE|FULLTEXT|SPATIAL|INDEX|KEY)/', $parts[0])) {
-                        // Make sure there is no default value when auto_increment is set
-                        if (stristr($parts[1], 'auto_increment')) {
-                            $parts[1] = preg_replace('/ default \'0\'/i', '', $parts[1]);
-                        }
-                        // "default" is always lower-case
-                        if (stristr($parts[1], ' DEFAULT ')) {
-                            $parts[1] = str_ireplace(' DEFAULT ', ' default ', $parts[1]);
-                        }
-                        // Change order of "default" and "NULL" statements
-                        $parts[1] = preg_replace('/(.*) (default .*) (NOT NULL)/', '$1 $3 $2', $parts[1]);
-                        $parts[1] = preg_replace('/(.*) (default .*) (NULL)/', '$1 $3 $2', $parts[1]);
-                        $key = $parts[0];
-                        $total[$table]['fields'][$key] = $parts[1];
-                    } else {
-                        // Key definition
-                        $search = ['/UNIQUE (INDEX|KEY)/', '/FULLTEXT (INDEX|KEY)/', '/SPATIAL (INDEX|KEY)/', '/INDEX/'];
-                        $replace = ['UNIQUE', 'FULLTEXT', 'SPATIAL', 'KEY'];
-                        $lineV = preg_replace($search, $replace, $lineV);
-                        if (preg_match('/PRIMARY|UNIQUE|FULLTEXT|SPATIAL/', $parts[0])) {
-                            $parts[1] = preg_replace('/^(KEY|INDEX) /', '', $parts[1]);
-                        }
-                        $newParts = explode(' ', $parts[1], 2);
-                        $key = $parts[0] === 'PRIMARY' ? $parts[0] : $newParts[0];
-                        $total[$table]['keys'][$key] = $lineV;
-                        // This is a protection against doing something stupid: Only allow clearing of cache_* and index_* tables.
-                        if (preg_match('/^(cache|index)_/', $table)) {
-                            // Suggest to truncate (clear) this table
-                            $total[$table]['extra']['CLEAR'] = 1;
-                        }
-                    }
-                }
-            }
-        }
-        return $total;
-    }
-
-    /**
-     * Look up the default collation for specified character set based on "SHOW CHARACTER SET" output
-     *
-     * @param string $charset Character set
-     * @return string Corresponding default collation
-     */
-    public function getCollationForCharset($charset)
-    {
-        // Load character sets, if not cached already
-        if (empty($this->character_sets)) {
-            $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionByName('Default');
-            $statement = $connection->query('SHOW CHARACTER SET');
-            $this->character_sets = [];
-            while ($row = $statement->fetch()) {
-                $this->character_sets[$row['Charset']] = $row;
-            }
-        }
-        $collation = '';
-        if (isset($this->character_sets[$charset]['Default collation'])) {
-            $collation = $this->character_sets[$charset]['Default collation'];
-        }
-        return $collation;
-    }
-
-    /**
-     * Reads the field definitions for the current database
-     *
-     * @return array Array with information about table.
-     */
-    public function getFieldDefinitions_database()
-    {
-        $total = [];
-        $tempKeys = [];
-        $tempKeysPrefix = [];
-        $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionByName('Default');
-        $statement = $connection->query('SHOW TABLE STATUS FROM `' . $connection->getDatabase() . '`');
-        $tables = [];
-        while ($theTable = $statement->fetch()) {
-            $tables[$theTable['Name']] = $theTable;
-        }
-        foreach ($tables as $tableName => $tableStatus) {
-            // Fields
-            $statement = $connection->query('SHOW FULL COLUMNS FROM `' . $tableName . '`');
-            $fieldInformation = [];
-            while ($fieldRow = $statement->fetch()) {
-                $fieldInformation[$fieldRow['Field']] = $fieldRow;
-            }
-            foreach ($fieldInformation as $fN => $fieldRow) {
-                $total[$tableName]['fields'][$fN] = $this->assembleFieldDefinition($fieldRow);
-            }
-            // Keys
-            $statement = $connection->query('SHOW KEYS FROM `' . $tableName . '`');
-            $keyInformation = [];
-            while ($keyRow = $statement->fetch()) {
-                $keyInformation[] = $keyRow;
-            }
-            foreach ($keyInformation as $keyRow) {
-                $keyName = $keyRow['Key_name'];
-                $colName = $keyRow['Column_name'];
-                if ($keyRow['Sub_part'] && $keyRow['Index_type'] !== 'SPATIAL') {
-                    $colName .= '(' . $keyRow['Sub_part'] . ')';
-                }
-                $tempKeys[$tableName][$keyName][$keyRow['Seq_in_index']] = $colName;
-                if ($keyName === 'PRIMARY') {
-                    $prefix = 'PRIMARY KEY';
-                } else {
-                    if ($keyRow['Index_type'] === 'FULLTEXT') {
-                        $prefix = 'FULLTEXT';
-                    } elseif ($keyRow['Index_type'] === 'SPATIAL') {
-                        $prefix = 'SPATIAL';
-                    } elseif ($keyRow['Non_unique']) {
-                        $prefix = 'KEY';
-                    } else {
-                        $prefix = 'UNIQUE';
-                    }
-                    $prefix .= ' ' . $keyName;
-                }
-                $tempKeysPrefix[$tableName][$keyName] = $prefix;
-            }
-            // Table status (storage engine, collaction, etc.)
-            if (is_array($tableStatus)) {
-                $tableExtraFields = [
-                    'Engine' => 'ENGINE',
-                    'Collation' => 'COLLATE'
-                ];
-                foreach ($tableExtraFields as $mysqlKey => $internalKey) {
-                    if (isset($tableStatus[$mysqlKey])) {
-                        $total[$tableName]['extra'][$internalKey] = $tableStatus[$mysqlKey];
-                    }
-                }
-            }
-        }
-        // Compile key information:
-        if (!empty($tempKeys)) {
-            foreach ($tempKeys as $table => $keyInf) {
-                foreach ($keyInf as $kName => $index) {
-                    ksort($index);
-                    $total[$table]['keys'][$kName] = $tempKeysPrefix[$table][$kName] . ' (' . implode(',', $index) . ')';
-                }
-            }
-        }
-        return $total;
-    }
-
-    /**
-     * Compares two arrays with field information and returns information about fields that are MISSING and fields that have CHANGED.
-     * FDsrc and FDcomp can be switched if you want the list of stuff to remove rather than update.
-     *
-     * @param array $FDsrc Field definitions, source (from getFieldDefinitions_fileContent())
-     * @param array $FDcomp Field definitions, comparison. (from getFieldDefinitions_database())
-     * @param string $onlyTableList Table names (in list) which is the ONLY one observed.
-     * @param bool $ignoreNotNullWhenComparing If set, this function ignores NOT NULL statements of the SQL file field definition when comparing current field definition from database with field definition from SQL file. This way, NOT NULL statements will be executed when the field is initially created, but the SQL parser will never complain about missing NOT NULL statements afterwards.
-     * @return array Returns an array with 1) all elements from $FDsrc that is not in $FDcomp (in key 'extra') and 2) all elements from $FDsrc that is different from the ones in $FDcomp
-     */
-    public function getDatabaseExtra($FDsrc, $FDcomp, $onlyTableList = '', $ignoreNotNullWhenComparing = false)
-    {
-        $extraArr = [];
-        $diffArr = [];
-        if (is_array($FDsrc)) {
-            foreach ($FDsrc as $table => $info) {
-                if ($onlyTableList === '' || GeneralUtility::inList($onlyTableList, $table)) {
-                    if (!isset($FDcomp[$table])) {
-                        // If the table was not in the FDcomp-array, the result array is loaded with that table.
-                        $extraArr[$table] = $info;
-                        $extraArr[$table]['whole_table'] = 1;
-                    } else {
-                        $keyTypes = explode(',', 'extra,fields,keys');
-                        foreach ($keyTypes as $theKey) {
-                            if (is_array($info[$theKey])) {
-                                foreach ($info[$theKey] as $fieldN => $fieldC) {
-                                    $fieldN = str_replace('`', '', $fieldN);
-                                    if ($fieldN === 'COLLATE') {
-                                        // @todo collation support is currently disabled (needs more testing)
-                                        continue;
-                                    }
-                                    if (!isset($FDcomp[$table][$theKey][$fieldN])) {
-                                        $extraArr[$table][$theKey][$fieldN] = $fieldC;
-                                    } else {
-                                        $fieldC = trim($fieldC);
-
-                                        // Lowercase the field type to surround false-positive schema changes to be
-                                        // reported just because of different caseing of characters
-                                        // The regex does just trigger for the first word followed by parentheses
-                                        // that contain a length. It does not trigger for e.g. "PRIMARY KEY" because
-                                        // "PRIMARY KEY" is being returned from the DB in upper case.
-                                        $fieldC = preg_replace_callback(
-                                            '/^([a-zA-Z0-9]+)(\([^)]*\)\s.*)/',
-                                            function ($matches) {
-                                                return strtolower($matches[1]) . $matches[2];
-                                            },
-                                            $fieldC
-                                        );
-
-                                        if ($ignoreNotNullWhenComparing) {
-                                            $fieldC = str_replace(' NOT NULL', '', $fieldC);
-                                            $FDcomp[$table][$theKey][$fieldN] = str_replace(' NOT NULL', '', $FDcomp[$table][$theKey][$fieldN]);
-                                        }
-                                        if ($fieldC !== $FDcomp[$table][$theKey][$fieldN]) {
-                                            $diffArr[$table][$theKey][$fieldN] = $fieldC;
-                                            $diffArr_cur[$table][$theKey][$fieldN] = $FDcomp[$table][$theKey][$fieldN];
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $output = [
-            'extra' => $extraArr,
-            'diff' => $diffArr,
-            'diff_currentValues' => $diffArr_cur
-        ];
-        return $output;
-    }
-
-    /**
-     * Returns an array with SQL-statements that is needed to update according to the diff-array
-     *
-     * @param array $diffArr Array with differences of current and needed DB settings. (from getDatabaseExtra())
-     * @param string $keyList List of fields in diff array to take notice of.
-     * @return array Array of SQL statements (organized in keys depending on type)
-     */
-    public function getUpdateSuggestions($diffArr, $keyList = 'extra,diff')
-    {
-        $statements = [];
-        $deletedPrefixKey = $this->deletedPrefixKey;
-        $deletedPrefixLength = strlen($deletedPrefixKey);
-        $remove = 0;
-        if ($keyList === 'remove') {
-            $remove = 1;
-            $keyList = 'extra';
-        }
-        $keyList = explode(',', $keyList);
-        foreach ($keyList as $theKey) {
-            if (is_array($diffArr[$theKey])) {
-                foreach ($diffArr[$theKey] as $table => $info) {
-                    $whole_table = [];
-                    if (isset($info['keys']) && is_array($info['keys'])) {
-                        foreach ($info['keys'] as $fN => $fV) {
-                            if (!$info['whole_table'] && $theKey === 'extra' && $remove) {
-                                $statement = 'ALTER TABLE ' . $table . ($fN === 'PRIMARY' ? ' DROP PRIMARY KEY' : ' DROP KEY ' . $fN) . ';';
-                                $statements['drop'][md5($statement)] = $statement;
-                            }
-                        }
-                    }
-                    if (is_array($info['fields'])) {
-                        foreach ($info['fields'] as $fN => $fV) {
-                            if ($info['whole_table']) {
-                                $whole_table[] = $fN . ' ' . $fV;
-                            } else {
-                                // Special case to work around MySQL problems when adding auto_increment fields:
-                                if (stristr($fV, 'auto_increment')) {
-                                    // The field can only be set "auto_increment" if there exists a PRIMARY key of that field already.
-                                    // The check does not look up which field is primary but just assumes it must be the field with the auto_increment value...
-                                    if (isset($info['keys']['PRIMARY'])) {
-                                        // Combine adding the field and the primary key into a single statement
-                                        $fV .= ', ADD PRIMARY KEY (' . $fN . ')';
-                                        unset($info['keys']['PRIMARY']);
-                                    } else {
-                                        // In the next step, attempt to clear the table once again (2 = force)
-                                        $info['extra']['CLEAR'] = 2;
-                                    }
-                                }
-                                if ($theKey === 'extra') {
-                                    if ($remove) {
-                                        if (substr($fN, 0, $deletedPrefixLength) !== $deletedPrefixKey) {
-                                            // we've to make sure we don't exceed the maximal length
-                                            $prefixedFieldName = $deletedPrefixKey . substr($fN, ($deletedPrefixLength - self::MYSQL_MAXIMUM_FIELD_WIDTH));
-                                            $statement = 'ALTER TABLE ' . $table . ' CHANGE ' . $fN . ' ' . $prefixedFieldName . ' ' . $fV . ';';
-                                            $statements['change'][md5($statement)] = $statement;
-                                        } else {
-                                            $statement = 'ALTER TABLE ' . $table . ' DROP ' . $fN . ';';
-                                            $statements['drop'][md5($statement)] = $statement;
-                                        }
-                                    } else {
-                                        $statement = 'ALTER TABLE ' . $table . ' ADD ' . $fN . ' ' . $fV . ';';
-                                        $statements['add'][md5($statement)] = $statement;
-                                    }
-                                } elseif ($theKey === 'diff') {
-                                    $statement = 'ALTER TABLE ' . $table . ' CHANGE ' . $fN . ' ' . $fN . ' ' . $fV . ';';
-                                    $statements['change'][md5($statement)] = $statement;
-                                    $statements['change_currentValue'][md5($statement)] = $diffArr['diff_currentValues'][$table]['fields'][$fN];
-                                }
-                            }
-                        }
-                    }
-                    if (is_array($info['keys'])) {
-                        foreach ($info['keys'] as $fN => $fV) {
-                            if ($info['whole_table']) {
-                                $whole_table[] = $fV;
-                            } else {
-                                if ($theKey === 'extra') {
-                                    if (!$remove) {
-                                        $statement = 'ALTER TABLE ' . $table . ' ADD ' . $fV . ';';
-                                        $statements['add'][md5($statement)] = $statement;
-                                    }
-                                } elseif ($theKey === 'diff') {
-                                    $statement = 'ALTER TABLE ' . $table . ($fN === 'PRIMARY' ? ' DROP PRIMARY KEY' : ' DROP KEY ' . $fN) . ';';
-                                    $statements['change'][md5($statement)] = $statement;
-                                    $statement = 'ALTER TABLE ' . $table . ' ADD ' . $fV . ';';
-                                    $statements['change'][md5($statement)] = $statement;
-                                }
-                            }
-                        }
-                    }
-                    if (is_array($info['extra'])) {
-                        $extras = [];
-                        $extras_currentValue = [];
-                        $clear_table = false;
-                        foreach ($info['extra'] as $fN => $fV) {
-                            // Only consider statements which are missing in the database but don't remove existing properties
-                            if (!$remove) {
-                                if (!$info['whole_table']) {
-                                    // If the whole table is created at once, we take care of this later by imploding all elements of $info['extra']
-                                    if ($fN === 'CLEAR') {
-                                        // Truncate table must happen later, not now
-                                        // Valid values for CLEAR: 1=only clear if keys are missing, 2=clear anyway (force)
-                                        if (!empty($info['keys']) || $fV == 2) {
-                                            $clear_table = true;
-                                        }
-                                        continue;
-                                    } else {
-                                        $extras[] = $fN . '=' . $fV;
-                                        $extras_currentValue[] = $fN . '=' . $diffArr['diff_currentValues'][$table]['extra'][$fN];
-                                    }
-                                }
-                            }
-                        }
-                        if ($clear_table) {
-                            $statement = 'TRUNCATE TABLE ' . $table . ';';
-                            $statements['clear_table'][md5($statement)] = $statement;
-                        }
-                        if (!empty($extras)) {
-                            $statement = 'ALTER TABLE ' . $table . ' ' . implode(' ', $extras) . ';';
-                            $statements['change'][md5($statement)] = $statement;
-                            $statements['change_currentValue'][md5($statement)] = implode(' ', $extras_currentValue);
-                        }
-                    }
-                    if ($info['whole_table']) {
-                        if ($remove) {
-                            if (substr($table, 0, $deletedPrefixLength) !== $deletedPrefixKey) {
-                                // we've to make sure we don't exceed the maximal length
-                                $prefixedTableName = $deletedPrefixKey . substr($table, ($deletedPrefixLength - self::MYSQL_MAXIMUM_FIELD_WIDTH));
-                                $statement = 'ALTER TABLE ' . $table . ' RENAME ' . $prefixedTableName . ';';
-                                $statements['change_table'][md5($statement)] = $statement;
-                            } else {
-                                $statement = 'DROP TABLE ' . $table . ';';
-                                $statements['drop_table'][md5($statement)] = $statement;
-                            }
-                            // Count
-                            $count = GeneralUtility::makeInstance(ConnectionPool::class)
-                                ->getConnectionByName('Default')
-                                ->count('*', $table, []);
-                            $statements['tables_count'][md5($statement)] = $count ? 'Records in table: ' . $count : '';
-                        } else {
-                            $statement = 'CREATE TABLE ' . $table . ' (
-' . implode(',
-', $whole_table) . '
-)';
-                            if ($info['extra']) {
-                                foreach ($info['extra'] as $k => $v) {
-                                    if ($k === 'COLLATE' || $k === 'CLEAR') {
-                                        // Skip these special statements.
-                                        // @todo collation support is currently disabled (needs more testing)
-                                        continue;
-                                    }
-                                    // Add extra attributes like ENGINE, CHARSET, etc.
-                                    $statement .= ' ' . $k . '=' . $v;
-                                }
-                            }
-                            $statement .= ';';
-                            $statements['create_table'][md5($statement)] = $statement;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $statements;
-    }
-
-    /**
-     * Converts a result row with field information into the SQL field definition string
-     *
-     * @param array $row MySQL result row
-     * @return string Field definition
-     */
-    public function assembleFieldDefinition($row)
-    {
-        $field = [$row['Type']];
-        if ($row['Null'] === 'NO') {
-            $field[] = 'NOT NULL';
-        }
-        if (!strstr($row['Type'], 'blob') && !strstr($row['Type'], 'text')) {
-            // Add a default value if the field is not auto-incremented (these fields never have a default definition)
-            if (!stristr($row['Extra'], 'auto_increment')) {
-                if ($row['Default'] === null) {
-                    $field[] = 'default NULL';
-                } else {
-                    $field[] = 'default \'' . addslashes($row['Default']) . '\'';
-                }
-            }
-        }
-        if ($row['Extra']) {
-            $field[] = $row['Extra'];
-        }
-        if (trim($row['Comment']) !== '') {
-            $field[] = "COMMENT '" . $row['Comment'] . "'";
-        }
-        return implode(' ', $field);
-    }
-
-    /**
-     * Returns an array where every entry is a single SQL-statement. Input must be formatted like an ordinary MySQL-dump files.
-     *
-     * @param string $sqlcode The SQL-file content. Provided that 1) every query in the input is ended with ';' and that a line in the file contains only one query or a part of a query.
-     * @param bool $removeNonSQL If set, non-SQL content (like comments and blank lines) is not included in the final output
-     * @param string $query_regex Regex to filter SQL lines to include
-     * @return array Array of SQL statements
-     */
-    public function getStatementArray($sqlcode, $removeNonSQL = false, $query_regex = '')
-    {
-        $sqlcodeArr = explode(LF, $sqlcode);
-        // Based on the assumption that the sql-dump has
-        $statementArray = [];
-        $statementArrayPointer = 0;
-        foreach ($sqlcodeArr as $line => $lineContent) {
-            $lineContent = trim($lineContent);
-            $is_set = 0;
-            // Auto_increment fields cannot have a default value!
-            if (stristr($lineContent, 'auto_increment')) {
-                $lineContent = preg_replace('/ default \'0\'/i', '', $lineContent);
-            }
-            if (!$removeNonSQL || $lineContent !== '' && $lineContent[0] !== '#' && substr($lineContent, 0, 2) !== '--') {
-                // '--' is seen as mysqldump comments from server version 3.23.49
-                $statementArray[$statementArrayPointer] .= $lineContent;
-                $is_set = 1;
-            }
-            if (substr($lineContent, -1) === ';') {
-                if (isset($statementArray[$statementArrayPointer])) {
-                    if (!trim($statementArray[$statementArrayPointer]) || $query_regex && !preg_match(('/' . $query_regex . '/i'), trim($statementArray[$statementArrayPointer]))) {
-                        unset($statementArray[$statementArrayPointer]);
-                    }
-                }
-                $statementArrayPointer++;
-            } elseif ($is_set) {
-                $statementArray[$statementArrayPointer] .= LF;
-            }
-        }
-        return $statementArray;
-    }
-
-    /**
-     * Returns tables to create and how many records in each
-     *
-     * @param array $statements Array of SQL statements to analyse.
-     * @param bool $insertCountFlag If set, will count number of INSERT INTO statements following that table definition
-     * @return array Array with table definitions in index 0 and count in index 1
-     */
-    public function getCreateTables($statements, $insertCountFlag = false)
-    {
-        $crTables = [];
-        $insertCount = [];
-        foreach ($statements as $line => $lineContent) {
-            $reg = [];
-            if (preg_match('/^create[[:space:]]*table[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i', substr($lineContent, 0, 100), $reg)) {
-                $table = trim($reg[1]);
-                if ($table) {
-                    // Table names are always lowercase on Windows!
-                    if (TYPO3_OS === 'WIN') {
-                        $table = strtolower($table);
-                    }
-                    $sqlLines = explode(LF, $lineContent);
-                    foreach ($sqlLines as $k => $v) {
-                        if (stristr($v, 'auto_increment')) {
-                            $sqlLines[$k] = preg_replace('/ default \'0\'/i', '', $v);
-                        }
-                    }
-                    $lineContent = implode(LF, $sqlLines);
-                    $crTables[$table] = $lineContent;
-                }
-            } elseif ($insertCountFlag && preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i', substr($lineContent, 0, 100), $reg)) {
-                $nTable = trim($reg[1]);
-                $insertCount[$nTable]++;
-            }
-        }
-        return [$crTables, $insertCount];
-    }
-
-    /**
-     * Extracts all insert statements from $statement array where content is inserted into $table
-     *
-     * @param array $statements Array of SQL statements
-     * @param string $table Table name
-     * @return array Array of INSERT INTO statements where table match $table
-     */
-    public function getTableInsertStatements($statements, $table)
-    {
-        $outStatements = [];
-        foreach ($statements as $line => $lineContent) {
-            $reg = [];
-            if (preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i', substr($lineContent, 0, 100), $reg)) {
-                $nTable = trim($reg[1]);
-                if ($nTable && $table === $nTable) {
-                    $outStatements[] = $lineContent;
-                }
-            }
-        }
-        return $outStatements;
-    }
-
-    /**
-     * Performs the queries passed from the input array.
-     *
-     * @param array $arr Array of SQL queries to execute.
-     * @param array $keyArr Array with keys that must match keys in $arr. Only where a key in this array is set and TRUE will the query be executed (meant to be passed from a form checkbox)
-     * @return mixed Array with error message from database if any occurred. Otherwise TRUE if everything was executed successfully.
-     */
-    public function performUpdateQueries($arr, $keyArr)
-    {
-        $result = [];
-        if (is_array($arr)) {
-            $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionByName('Default');
-            foreach ($arr as $key => $string) {
-                if (isset($keyArr[$key]) && $keyArr[$key]) {
-                    try {
-                        $connection->query($string);
-                    } catch (DBALException $e) {
-                        $result[$key] = $e->getMessage();
-                    }
-                }
-            }
-        }
-        if (!empty($result)) {
-            return $result;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Returns list of tables in the database
-     *
-     * @return array List of tables.
-     */
-    public function getListOfTables()
-    {
-        $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionByName('Default');
-        $statement = $connection->query('SHOW TABLE STATUS FROM `' . $connection->getDatabase() . '`');
-        $tables = [];
-        while ($theTable = $statement->fetch()) {
-            $tables[$theTable['Name']] = $theTable;
-        }
-        foreach ($tables as $key => &$value) {
-            $value = $key;
-        }
-        unset($value);
-        return $tables;
-    }
-}
index 3436c7a..ccaa22d 100644 (file)
@@ -324,6 +324,26 @@ return [
             'Deprecation-81600-UnusedExtbaseExceptions.rst',
         ],
     ],
+    'TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility' => [
+        'restFiles' => [
+            'Breaking-82148-DownloadSQLDumpDroppedInEM.rst',
+        ],
+    ],
+    'TYPO3\CMS\Extensionmanager\ViewHelpers\DownloadExtensionDataViewHelper' => [
+        'restFiles' => [
+            'Breaking-82148-DownloadSQLDumpDroppedInEM.rst',
+        ],
+    ],
+    'TYPO3\CMS\Install\Service\SqlExpectedSchemaService' => [
+        'restFiles' => [
+            'Breaking-82148-DownloadSQLDumpDroppedInEM.rst',
+        ],
+    ],
+    'TYPO3\CMS\Install\Service\SqlSchemaMigrationService' => [
+        'restFiles' => [
+            'Breaking-82148-DownloadSQLDumpDroppedInEM.rst',
+        ],
+    ],
 
     // Removed interfaces
     'TYPO3\CMS\Backend\Form\DatabaseFileIconsHookInterface' => [
index 7f11e5b..7eadd99 100644 (file)
@@ -1079,4 +1079,11 @@ return [
             'Deprecation-81540-DeprecateDocumentTemplateformWidth.rst',
         ],
     ],
+    'TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility->sendSqlDumpFileToBrowserAndDelete' => [
+        'numberOfMandatoryArguments' => 1,
+        'maximumNumberOfArguments' => 2,
+        'restFiles' => [
+            'Breaking-82148-DownloadSQLDumpDroppedInEM.rst',
+        ],
+    ]
 ];
diff --git a/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php
deleted file mode 100644 (file)
index af543ae..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-namespace TYPO3\CMS\Install\Tests\Functional;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Functional tests for the SQL schema migration service.
- */
-class SqlSchemaMigrationServiceTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
-{
-    /**
-     * @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService
-     */
-    protected $sqlSchemaMigrationService;
-
-    /**
-     * Initializes a SqlSchemaMigrationService instance.
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->sqlSchemaMigrationService = new \TYPO3\CMS\Install\Service\SqlSchemaMigrationService();
-    }
-
-    /**
-     * @test
-     *
-     * @group not-postgres
-     * @group not-mssql
-     */
-    public function columnAndKeyDeletionDoesNotReturnAnError()
-    {
-
-        // Get the current database fields.
-        $currentDatabaseSchema = $this->sqlSchemaMigrationService->getFieldDefinitions_database();
-
-        // Limit our scope to the be_users table:
-        $currentDatabaseSchemaForBeUsers = [];
-        $currentDatabaseSchemaForBeUsers['be_users'] = $currentDatabaseSchema['be_users'];
-        unset($currentDatabaseSchema);
-
-        // Create a key and a field that belongs to that key:
-        $expectedDatabaseSchemaForBeUsers = $currentDatabaseSchemaForBeUsers;
-        $expectedDatabaseSchemaForBeUsers['be_users']['fields']['functional_test_field_1'] = "tinyint(1) unsigned NOT NULL default '0'";
-        $expectedDatabaseSchemaForBeUsers['be_users']['keys']['functional_test_key_1'] = 'KEY functional_test_key_1 (functional_test_field_1)';
-        $createFieldDiff = $this->sqlSchemaMigrationService->getDatabaseExtra($expectedDatabaseSchemaForBeUsers, $currentDatabaseSchemaForBeUsers);
-        $createFieldDiff = $this->sqlSchemaMigrationService->getUpdateSuggestions($createFieldDiff);
-        $this->sqlSchemaMigrationService->performUpdateQueries($createFieldDiff['add'], $createFieldDiff['add']);
-
-        // Now remove the fields again (without the renaming step).
-        unset($currentDatabaseSchemaForBeUsers['be_users']['fields']['functional_test_field_1']);
-        unset($currentDatabaseSchemaForBeUsers['be_users']['keys']['functional_test_key_1']);
-        $this->sqlSchemaMigrationService->setDeletedPrefixKey('');
-        $removeFieldDiff = $this->sqlSchemaMigrationService->getDatabaseExtra($expectedDatabaseSchemaForBeUsers, $currentDatabaseSchemaForBeUsers);
-        $removeFieldDiff = $this->sqlSchemaMigrationService->getUpdateSuggestions($removeFieldDiff, 'remove');
-        $result = $this->sqlSchemaMigrationService->performUpdateQueries($removeFieldDiff['drop'], $removeFieldDiff['drop']);
-        $this->assertTrue($result, 'performUpdateQueries() did not return TRUE, this means an error occurred: ' . (is_array($result) ? array_pop($result) : ''));
-    }
-}
diff --git a/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
deleted file mode 100644 (file)
index 4f1c519..0000000
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-namespace TYPO3\CMS\Install\Tests\Unit\Service;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Install\Service\SqlSchemaMigrationService;
-
-/**
- * Test case
- */
-class SqlSchemaMigrationServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
-{
-    /**
-     * Get a SchemaService instance with mocked DBAL enable database connection, DBAL not enabled
-     *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
-     */
-    protected function getSqlSchemaMigrationService()
-    {
-        /** @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $databaseConnection */
-        $subject = $this->getAccessibleMock(SqlSchemaMigrationService::class, ['isDbalEnabled'], [], '', false);
-        $subject->expects($this->any())->method('isDbalEnabled')->will($this->returnValue(false));
-
-        return $subject;
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraFindsChangedFields()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(999) DEFAULT \'0\' NOT NULL'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(255) DEFAULT \'0\' NOT NULL'
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(999) DEFAULT \'0\' NOT NULL'
-                        ]
-                    ]
-                ],
-                'diff_currentValues' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(255) DEFAULT \'0\' NOT NULL'
-                        ]
-                    ]
-                ]
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraFindsChangedFieldsIncludingNull()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(999) NULL'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(255) NULL'
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(999) NULL'
-                        ]
-                    ]
-                ],
-                'diff_currentValues' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(255) NULL'
-                        ]
-                    ]
-                ]
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraFindsChangedFieldsIgnoreNotNull()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(999) DEFAULT \'0\' NOT NULL'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'varchar(255) DEFAULT \'0\' NOT NULL'
-                    ]
-                ]
-            ],
-            '',
-            true
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(999) DEFAULT \'0\''
-                        ]
-                    ]
-                ],
-                'diff_currentValues' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'varchar(255) DEFAULT \'0\''
-                        ]
-                    ]
-                ]
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraIgnoresCaseDifference()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'INT(11) DEFAULT \'0\' NOT NULL',
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'int(11) DEFAULT \'0\' NOT NULL',
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [],
-                'diff_currentValues' => null,
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraIgnoresCaseDifferenceButKeepsCaseInSetIntact()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'subtype' => 'SET(\'Tx_MyExt_Domain_Model_Xyz\',\'Tx_MyExt_Domain_Model_Abc\',\'\') NOT NULL DEFAULT \'\',',
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'subtype' => 'set(\'Tx_MyExt_Domain_Model_Xyz\',\'Tx_MyExt_Domain_Model_Abc\',\'\') NOT NULL DEFAULT \'\',',
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [],
-                'diff_currentValues' => null,
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraDoesNotLowercaseReservedWordsForTheComparison()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'PRIMARY KEY (md5hash)',
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'PRIMARY KEY (md5hash)'],
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [],
-                'diff_currentValues' => null,
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraFindsNewSpatialKeys()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'keys' => [
-                        'foo' => 'SPATIAL foo (foo)'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'keys' => []
-                ]
-            ]
-        );
-
-        $this->assertEquals(
-            $differenceArray,
-            [
-                'extra' => [
-                    'tx_foo' => [
-                        'keys' => [
-                            'foo' => 'SPATIAL foo (foo)'
-                        ]
-                    ]
-                ],
-                'diff' => [],
-                'diff_currentValues' => null
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function checkColumnDefinitionIfCommentIsSupplied()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $fieldDefinition = $subject->assembleFieldDefinition(
-            [
-                'Field' => 'uid',
-                'Type' => 'int(11)',
-                'Null' => 'NO',
-                'Key' => 'PRI',
-                'Default' => null,
-                'Extra' => 'auto_increment',
-                'Comment' => 'I am a comment',
-            ]
-        );
-
-        $this->assertSame(
-            'int(11) NOT NULL auto_increment COMMENT \'I am a comment\'',
-            $fieldDefinition
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function checkColumnDefinitionIfNoCommentIsSupplied()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $fieldDefinition = $subject->assembleFieldDefinition(
-            [
-                'Field' => 'uid',
-                'Type' => 'int(11)',
-                'Null' => 'NO',
-                'Key' => 'PRI',
-                'Default' => null,
-                'Extra' => 'auto_increment',
-            ]
-        );
-
-        $this->assertSame(
-            'int(11) NOT NULL auto_increment',
-            $fieldDefinition
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraIncludesEngineIfMySQLIsUsed()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'INT(11) DEFAULT \'0\' NOT NULL',
-                    ],
-                    'extra' => [
-                        'ENGINE' => 'InnoDB'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'int(11) DEFAULT \'0\' NOT NULL',
-                    ],
-                    'extra' => [
-                        'ENGINE' => 'InnoDB'
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertSame(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [],
-                'diff_currentValues' => null,
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraIncludesUnsignedAttributeIfMySQLIsUsed()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'INT(11) UNSIGNED DEFAULT \'0\' NOT NULL',
-                    ],
-                    'extra' => [
-                        'ENGINE' => 'InnoDB'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'fields' => [
-                        'foo' => 'int(11) DEFAULT \'0\' NOT NULL',
-                    ],
-                    'extra' => [
-                        'ENGINE' => 'InnoDB'
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertSame(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'int(11) UNSIGNED DEFAULT \'0\' NOT NULL',
-                        ],
-                    ]
-                ],
-                'diff_currentValues' => [
-                    'tx_foo' => [
-                        'fields' => [
-                            'foo' => 'int(11) DEFAULT \'0\' NOT NULL',
-                        ],
-                    ]
-                ]
-            ]
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function getDatabaseExtraComparesIndexPrefixLengthIfMySQLIsUsed()
-    {
-        $subject = $this->getSqlSchemaMigrationService();
-        $differenceArray = $subject->getDatabaseExtra(
-            [
-                'tx_foo' => [
-                    'keys' => [
-                        'foo' => 'KEY foo (foo(199))'
-                    ]
-                ]
-            ],
-            [
-                'tx_foo' => [
-                    'keys' => [
-                        'foo' => 'KEY foo (foo)'
-                    ]
-                ]
-            ]
-        );
-
-        $this->assertSame(
-            $differenceArray,
-            [
-                'extra' => [],
-                'diff' => [
-                    'tx_foo' => [
-                        'keys' => [
-                            'foo' => 'KEY foo (foo(199))'
-                        ]
-                    ]
-                ],
-                'diff_currentValues' => [
-                    'tx_foo' => [
-                        'keys' => [
-                            'foo' => 'KEY foo (foo)'
-                        ]
-                    ]
-                ]
-            ]
-        );
-    }
-}