webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-23 18:29:15 +03:00
Code Activity

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
This commit is contained in:
Maurício Meneghini Fauth
2026-07-18 15:26:39 -03:00
parent d7a918eddf a016b28c7a
commit 6f427d8785
16 changed files with 164 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
psalm-baseline.xml
View File

@@ -2996,13 +2996,13 @@
<code><![CDATA[$_POST['field_null'][$i] ?? 'NO']]></code>
<code><![CDATA[$_POST['field_type'][$i]]]></code>
<code><![CDATA[$_POST['field_virtuality'][$i] ?? '']]></code>
<code><![CDATA[$_POST['fulltext_indexes']]]></code>
<code><![CDATA[$_POST['indexes']]]></code>
<code><![CDATA[$_POST['primary_indexes']]]></code>
<code><![CDATA[$_POST['spatial_indexes']]]></code>
<code><![CDATA[$_POST['fulltext_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['primary_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['spatial_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['tbl_collation']]]></code>
<code><![CDATA[$_POST['tbl_storage_engine']]]></code>
<code><![CDATA[$_POST['unique_indexes']]]></code>
<code><![CDATA[$_POST['unique_indexes'] ?? '[]']]></code>
</PossiblyInvalidArgument>
<PossiblyInvalidCast>
<code><![CDATA[$_POST['comment']]]></code>
@@ -3019,13 +3019,13 @@
<code><![CDATA[$_POST['field_virtuality'][$i] ?? '']]></code>
<code><![CDATA[$_POST['field_where']]]></code>
<code><![CDATA[$_POST['field_where']]]></code>
<code><![CDATA[$_POST['fulltext_indexes']]]></code>
<code><![CDATA[$_POST['indexes']]]></code>
<code><![CDATA[$_POST['primary_indexes']]]></code>
<code><![CDATA[$_POST['spatial_indexes']]]></code>
<code><![CDATA[$_POST['fulltext_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['primary_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['spatial_indexes'] ?? '[]']]></code>
<code><![CDATA[$_POST['tbl_collation']]]></code>
<code><![CDATA[$_POST['tbl_storage_engine']]]></code>
<code><![CDATA[$_POST['unique_indexes']]]></code>
<code><![CDATA[$_POST['unique_indexes'] ?? '[]']]></code>
</PossiblyInvalidCast>
<PossiblyInvalidIterator>
<code><![CDATA[$_POST['partitions']]]></code>

2
resources/js/modules/common.ts
View File

@@ -1,4 +1,4 @@
import { sprintf } from "locutus/php/strings/sprintf";
import { sprintf } from 'locutus/php/strings/sprintf';
/**
* Holds common parameters such as server, db, table, etc

48
resources/sql/create_tables.sql
View File

@@ -18,7 +18,7 @@
-- Database : `phpmyadmin`
--
CREATE DATABASE IF NOT EXISTS `phpmyadmin`
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
USE phpmyadmin;
-- --------------------------------------------------------
@@ -40,12 +40,12 @@ CREATE TABLE IF NOT EXISTS `pma__bookmark` (
`id` int(10) unsigned NOT NULL auto_increment,
`dbase` varchar(255) NOT NULL default '',
`user` varchar(255) NOT NULL default '',
`label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
`label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '',
`query` text NOT NULL,
PRIMARY KEY (`id`)
)
COMMENT='Bookmarks'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -58,8 +58,8 @@ CREATE TABLE IF NOT EXISTS `pma__column_info` (
`db_name` varchar(64) NOT NULL default '',
`table_name` varchar(64) NOT NULL default '',
`column_name` varchar(64) NOT NULL default '',
`comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
`mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
`comment` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '',
`mimetype` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '',
`transformation` varchar(255) NOT NULL default '',
`transformation_options` varchar(255) NOT NULL default '',
`input_transformation` varchar(255) NOT NULL default '',
@@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS `pma__column_info` (
UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
)
COMMENT='Column information for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `pma__history` (
KEY `username` (`username`,`db`,`table`,`timevalue`)
)
COMMENT='SQL history for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -98,12 +98,12 @@ CREATE TABLE IF NOT EXISTS `pma__history` (
CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (
`db_name` varchar(64) NOT NULL default '',
`page_nr` int(10) unsigned NOT NULL auto_increment,
`page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
`page_descr` varchar(50) COLLATE utf8mb4_general_ci NOT NULL default '',
PRIMARY KEY (`page_nr`),
KEY `db_name` (`db_name`)
)
COMMENT='PDF relation pages for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -117,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `pma__recent` (
PRIMARY KEY (`username`)
)
COMMENT='Recently accessed tables'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -131,7 +131,7 @@ CREATE TABLE IF NOT EXISTS `pma__favorite` (
PRIMARY KEY (`username`)
)
COMMENT='Favorite tables'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -148,7 +148,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` (
PRIMARY KEY (`username`,`db_name`,`table_name`)
)
COMMENT='Tables'' UI preferences'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -167,7 +167,7 @@ CREATE TABLE IF NOT EXISTS `pma__relation` (
KEY `foreign_field` (`foreign_db`,`foreign_table`)
)
COMMENT='Relation table'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -184,7 +184,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_coords` (
PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`)
)
COMMENT='Table coordinates for phpMyAdmin PDF output'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -199,7 +199,7 @@ CREATE TABLE IF NOT EXISTS `pma__table_info` (
PRIMARY KEY (`db_name`,`table_name`)
)
COMMENT='Table information for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -221,7 +221,7 @@ CREATE TABLE IF NOT EXISTS `pma__tracking` (
PRIMARY KEY (`db_name`,`table_name`,`version`)
)
COMMENT='Database changes tracking for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS `pma__userconfig` (
PRIMARY KEY (`username`)
)
COMMENT='User preferences storage for phpMyAdmin'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -250,7 +250,7 @@ CREATE TABLE IF NOT EXISTS `pma__users` (
PRIMARY KEY (`username`,`usergroup`)
)
COMMENT='Users and their assignments to user groups'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -265,7 +265,7 @@ CREATE TABLE IF NOT EXISTS `pma__usergroups` (
PRIMARY KEY (`usergroup`,`tab`,`allowed`)
)
COMMENT='User groups with configured menu items'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -282,7 +282,7 @@ CREATE TABLE IF NOT EXISTS `pma__navigationhiding` (
PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)
)
COMMENT='Hidden items of navigation tree'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -300,7 +300,7 @@ CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)
)
COMMENT='Saved searches'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -320,7 +320,7 @@ CREATE TABLE IF NOT EXISTS `pma__central_columns` (
PRIMARY KEY (`db_name`,`col_name`)
)
COMMENT='Central list of columns'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -334,7 +334,7 @@ CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
PRIMARY KEY (`username`)
)
COMMENT='Settings related to Designer'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-- --------------------------------------------------------
@@ -352,4 +352,4 @@ CREATE TABLE IF NOT EXISTS `pma__export_templates` (
UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`)
)
COMMENT='Saved export templates'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;

3
src/Controllers/Table/GetFieldController.php
View File

@@ -100,7 +100,8 @@ final readonly class GetFieldController implements InvocableController
/* Grab data */
$sql = 'SELECT ' . Util::backquote($transformKey)
. ' FROM ' . Util::backquote(Current::$table)
. ' WHERE ' . $whereClause . ';';
. ' WHERE ' . $whereClause
. ' LIMIT 1;';
$result = $this->dbi->fetchValue($sql);
/* Check return code */

32
src/Display/Results.php
View File

@@ -44,6 +44,7 @@ use PhpMyAdmin\Utils\Gis;
use function __;
use function array_filter;
use function array_key_exists;
use function array_map;
use function array_merge;
use function array_shift;
@@ -199,6 +200,9 @@ class Results
/** @var list<string|null> */
private static array $row = [];
/** @var array<string, string|null> */
private array $foreignKeyDisplayCache = [];
/**
* @param string $db the database name
* @param string $table the table name
@@ -3576,27 +3580,25 @@ class Results
*/
private function getFromForeign(ForeignKeyRelatedTable $fieldInfo, string $whereComparison): string|null
{
$dispsql = 'SELECT '
. Util::backquote($fieldInfo->displayField)
. ' FROM '
. Util::backquote($fieldInfo->database)
. '.'
. Util::backquote($fieldInfo->table)
. ' WHERE '
. Util::backquote($fieldInfo->field)
. $whereComparison;
$dispsql = 'SELECT ' . Util::backquote($fieldInfo->displayField)
. ' FROM ' . Util::backquote($fieldInfo->database) . '.' . Util::backquote($fieldInfo->table)
. ' WHERE ' . Util::backquote($fieldInfo->field) . $whereComparison
. ' LIMIT 1';
if (array_key_exists($dispsql, $this->foreignKeyDisplayCache)) {
return $this->foreignKeyDisplayCache[$dispsql];
}
$dispval = $this->dbi->fetchValue($dispsql);
if ($dispval === false) {
return __('Link not found!');
$dispval = __('Link not found!');
} elseif ($dispval !== null) {
// Truncate values that are too long, see: #17902
$dispval = $this->getPartialText($dispval);
}
if ($dispval === null) {
return null;
}
$this->foreignKeyDisplayCache[$dispsql] = $dispval;
// Truncate values that are too long, see: #17902
return $this->getPartialText($dispval);
return $dispval;
}
/**

9
src/InsertEdit.php
View File

@@ -922,7 +922,8 @@ class InsertEdit
. ' FROM ' . Util::backquote($foreigner['foreign_db'])
. '.' . Util::backquote($foreigner['foreign_table'])
. ' WHERE ' . Util::backquote($foreigner['foreign_field'])
. $whereComparison;
. $whereComparison
. ' LIMIT 1';
$dispresult = $this->dbi->tryQuery($dispsql);
if ($dispresult && $dispresult->numRows() > 0) {
return (string) $dispresult->fetchValue();
@@ -1138,7 +1139,8 @@ class InsertEdit
$protectedValue = $this->dbi->fetchValue(
'SELECT ' . Util::backquote($editField->columnName)
. ' FROM ' . Util::backquote(Current::$table)
. ' WHERE ' . $whereClause,
. ' WHERE ' . $whereClause
. ' LIMIT 1;',
);
$protectedValue = is_string($protectedValue) ? $protectedValue : '';
}
@@ -1294,7 +1296,8 @@ class InsertEdit
. Util::backquote($columnName)
. ' FROM ' . Util::backquote($db) . '.'
. Util::backquote($table)
. ' WHERE ' . $_POST['where_clause'][0];
. ' WHERE ' . $_POST['where_clause'][0]
. ' LIMIT 1';
$result = $this->dbi->tryQuery($sqlForRealValue);

2
src/Sql.php
View File

@@ -320,7 +320,7 @@ class Sql
string $whereClause,
): string {
$row = $this->dbi->fetchSingleRow(sprintf(
'SELECT `%s` FROM `%s`.`%s` WHERE %s',
'SELECT `%s` FROM `%s`.`%s` WHERE %s LIMIT 1',
$column,
$db,
$table,

140
tests/unit/ConfigStorage/RelationTest.php
View File

@@ -369,9 +369,9 @@ class RelationTest extends AbstractTestCase
. '`id` int(10) unsigned NOT NULL auto_increment,'
. ' `dbase` varchar(255) NOT NULL default \'\','
. ' `user` varchar(255) NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `query` text NOT NULL, PRIMARY KEY (`id`) )'
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -384,7 +384,7 @@ class RelationTest extends AbstractTestCase
. ' `foreign_field` varchar(64) NOT NULL default \'\','
. ' PRIMARY KEY (`master_db`,`master_table`,`master_field`),'
. ' KEY `foreign_field` (`foreign_db`,`foreign_table`) ) COMMENT=\'Relation table\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -393,7 +393,7 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__table_info` ( '
. '`db_name` varchar(64) NOT NULL default \'\', `table_name` varchar(64) NOT NULL default \'\','
. ' `display_field` varchar(64) NOT NULL default \'\', PRIMARY KEY (`db_name`,`table_name`) )'
. ' COMMENT=\'Table information for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Table information for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
@@ -406,7 +406,7 @@ class RelationTest extends AbstractTestCase
. ' `y` float unsigned NOT NULL default \'0\','
. ' PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) )'
. ' COMMENT=\'Table coordinates for phpMyAdmin PDF output\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -414,9 +414,9 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__pdf_pages`'
. ' -- CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( '
. '`db_name` varchar(64) NOT NULL default \'\', `page_nr` int(10) unsigned NOT NULL auto_increment,'
. ' `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default \'\', PRIMARY KEY (`page_nr`),'
. ' `page_descr` varchar(50) COLLATE utf8mb4_general_ci NOT NULL default \'\', PRIMARY KEY (`page_nr`),'
. ' KEY `db_name` (`db_name`) ) COMMENT=\'PDF relation pages for phpMyAdmin\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -425,14 +425,14 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__column_info` ( '
. '`id` int(5) unsigned NOT NULL auto_increment, `db_name` varchar(64) NOT NULL default \'\','
. ' `table_name` varchar(64) NOT NULL default \'\', `column_name` varchar(64) NOT NULL default \'\','
. ' `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `comment` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `mimetype` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `transformation` varchar(255) NOT NULL default \'\','
. ' `transformation_options` varchar(255) NOT NULL default \'\','
. ' `input_transformation` varchar(255) NOT NULL default \'\','
. ' `input_transformation_options` varchar(255) NOT NULL default \'\','
. ' PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) )'
. ' COMMENT=\'Column information for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Column information for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -443,7 +443,7 @@ class RelationTest extends AbstractTestCase
. ' `db` varchar(64) NOT NULL default \'\', `table` varchar(64) NOT NULL default \'\','
. ' `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, `sqlquery` text NOT NULL,'
. ' PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) )'
. ' COMMENT=\'SQL history for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'SQL history for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -451,7 +451,7 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__recent` '
. '-- CREATE TABLE IF NOT EXISTS `pma__recent` ( '
. '`username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) )'
. ' COMMENT=\'Recently accessed tables\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Recently accessed tables\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -459,7 +459,7 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__favorite` '
. '-- CREATE TABLE IF NOT EXISTS `pma__favorite` ( '
. '`username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) )'
. ' COMMENT=\'Favorite tables\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Favorite tables\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -470,7 +470,7 @@ class RelationTest extends AbstractTestCase
. ' `table_name` varchar(64) NOT NULL, `prefs` text NOT NULL,'
. ' `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,'
. ' PRIMARY KEY (`username`,`db_name`,`table_name`) ) COMMENT=\'Tables\'\' UI preferences\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -489,7 +489,7 @@ class RelationTest extends AbstractTestCase
. ' default NULL, `tracking_active` int(1) unsigned NOT NULL'
. ' default \'1\', PRIMARY KEY (`db_name`,`table_name`,`version`) )'
. ' COMMENT=\'Database changes tracking for phpMyAdmin\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -499,7 +499,7 @@ class RelationTest extends AbstractTestCase
. '`username` varchar(64) NOT NULL, `usergroup` varchar(64) NOT NULL,'
. ' PRIMARY KEY (`username`,`usergroup`) )'
. ' COMMENT=\'Users and their assignments to user groups\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -510,7 +510,7 @@ class RelationTest extends AbstractTestCase
. ' `allowed` enum(\'Y\',\'N\') NOT NULL DEFAULT \'N\','
. ' PRIMARY KEY (`usergroup`,`tab`,`allowed`) )'
. ' COMMENT=\'User groups with configured menu items\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -521,7 +521,7 @@ class RelationTest extends AbstractTestCase
. ' NOT NULL, `item_type` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL,'
. ' `table_name` varchar(64) NOT NULL,'
. ' PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) )'
. ' COMMENT=\'Hidden items of navigation tree\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Hidden items of navigation tree\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -532,7 +532,7 @@ class RelationTest extends AbstractTestCase
. ' `db_name` varchar(64) NOT NULL default \'\', `search_name` varchar(64) NOT NULL default \'\','
. ' `search_data` text NOT NULL, PRIMARY KEY (`id`),'
. ' UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) )'
. ' COMMENT=\'Saved searches\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Saved searches\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -543,7 +543,7 @@ class RelationTest extends AbstractTestCase
. ' `col_length` text, `col_collation` varchar(64) NOT NULL, `col_isNull` boolean NOT NULL,'
. ' `col_extra` varchar(255) default \'\', `col_default` text,'
. ' PRIMARY KEY (`db_name`,`col_name`) )'
. ' COMMENT=\'Central list of columns\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Central list of columns\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -552,7 +552,7 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( '
. '`username` varchar(64) NOT NULL, `settings_data` text NOT NULL,'
. ' PRIMARY KEY (`username`) )'
. ' COMMENT=\'Settings related to Designer\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Settings related to Designer\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -563,7 +563,7 @@ class RelationTest extends AbstractTestCase
. ' `export_type` varchar(10) NOT NULL, `template_name` varchar(64) NOT NULL,'
. ' `template_data` text NOT NULL, PRIMARY KEY (`id`),'
. ' UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) )'
. ' COMMENT=\'Saved export templates\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Saved export templates\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
@@ -648,9 +648,9 @@ class RelationTest extends AbstractTestCase
. '`id` int(10) unsigned NOT NULL auto_increment,'
. ' `dbase` varchar(255) NOT NULL default \'\','
. ' `user` varchar(255) NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `query` text NOT NULL, PRIMARY KEY (`id`) )'
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -663,7 +663,7 @@ class RelationTest extends AbstractTestCase
. ' `foreign_field` varchar(64) NOT NULL default \'\','
. ' PRIMARY KEY (`master_db`,`master_table`,`master_field`),'
. ' KEY `foreign_field` (`foreign_db`,`foreign_table`) ) COMMENT=\'Relation table\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -672,7 +672,7 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__table_info` ( '
. '`db_name` varchar(64) NOT NULL default \'\', `table_name` varchar(64) NOT NULL default \'\','
. ' `display_field` varchar(64) NOT NULL default \'\', PRIMARY KEY (`db_name`,`table_name`) )'
. ' COMMENT=\'Table information for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Table information for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
@@ -685,7 +685,7 @@ class RelationTest extends AbstractTestCase
. ' `y` float unsigned NOT NULL default \'0\','
. ' PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) )'
. ' COMMENT=\'Table coordinates for phpMyAdmin PDF output\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -693,9 +693,9 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__pdf_pages`'
. ' -- CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( '
. '`db_name` varchar(64) NOT NULL default \'\', `page_nr` int(10) unsigned NOT NULL auto_increment,'
. ' `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default \'\', PRIMARY KEY (`page_nr`),'
. ' `page_descr` varchar(50) COLLATE utf8mb4_general_ci NOT NULL default \'\', PRIMARY KEY (`page_nr`),'
. ' KEY `db_name` (`db_name`) ) COMMENT=\'PDF relation pages for phpMyAdmin\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -704,14 +704,14 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__column_info` ( '
. '`id` int(5) unsigned NOT NULL auto_increment, `db_name` varchar(64) NOT NULL default \'\','
. ' `table_name` varchar(64) NOT NULL default \'\', `column_name` varchar(64) NOT NULL default \'\','
. ' `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `comment` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `mimetype` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `transformation` varchar(255) NOT NULL default \'\','
. ' `transformation_options` varchar(255) NOT NULL default \'\','
. ' `input_transformation` varchar(255) NOT NULL default \'\','
. ' `input_transformation_options` varchar(255) NOT NULL default \'\','
. ' PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) )'
. ' COMMENT=\'Column information for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Column information for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -722,7 +722,7 @@ class RelationTest extends AbstractTestCase
. ' `db` varchar(64) NOT NULL default \'\', `table` varchar(64) NOT NULL default \'\','
. ' `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, `sqlquery` text NOT NULL,'
. ' PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) )'
. ' COMMENT=\'SQL history for phpMyAdmin\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'SQL history for phpMyAdmin\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -730,7 +730,7 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__recent` '
. '-- CREATE TABLE IF NOT EXISTS `pma__recent` ( '
. '`username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) )'
. ' COMMENT=\'Recently accessed tables\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Recently accessed tables\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -738,7 +738,7 @@ class RelationTest extends AbstractTestCase
. ' Table structure for table `pma__favorite` '
. '-- CREATE TABLE IF NOT EXISTS `pma__favorite` ( '
. '`username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) )'
. ' COMMENT=\'Favorite tables\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Favorite tables\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -749,7 +749,7 @@ class RelationTest extends AbstractTestCase
. ' `table_name` varchar(64) NOT NULL, `prefs` text NOT NULL,'
. ' `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,'
. ' PRIMARY KEY (`username`,`db_name`,`table_name`) ) COMMENT=\'Tables\'\' UI preferences\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -768,7 +768,7 @@ class RelationTest extends AbstractTestCase
. ' default NULL, `tracking_active` int(1) unsigned NOT NULL'
. ' default \'1\', PRIMARY KEY (`db_name`,`table_name`,`version`) )'
. ' COMMENT=\'Database changes tracking for phpMyAdmin\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -778,7 +778,7 @@ class RelationTest extends AbstractTestCase
. '`username` varchar(64) NOT NULL, `usergroup` varchar(64) NOT NULL,'
. ' PRIMARY KEY (`username`,`usergroup`) )'
. ' COMMENT=\'Users and their assignments to user groups\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -789,7 +789,7 @@ class RelationTest extends AbstractTestCase
. ' `allowed` enum(\'Y\',\'N\') NOT NULL DEFAULT \'N\','
. ' PRIMARY KEY (`usergroup`,`tab`,`allowed`) )'
. ' COMMENT=\'User groups with configured menu items\''
. ' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -800,7 +800,7 @@ class RelationTest extends AbstractTestCase
. ' NOT NULL, `item_type` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL,'
. ' `table_name` varchar(64) NOT NULL,'
. ' PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) )'
. ' COMMENT=\'Hidden items of navigation tree\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Hidden items of navigation tree\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -811,7 +811,7 @@ class RelationTest extends AbstractTestCase
. ' `db_name` varchar(64) NOT NULL default \'\', `search_name` varchar(64) NOT NULL default \'\','
. ' `search_data` text NOT NULL, PRIMARY KEY (`id`),'
. ' UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) )'
. ' COMMENT=\'Saved searches\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Saved searches\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -822,7 +822,7 @@ class RelationTest extends AbstractTestCase
. ' `col_length` text, `col_collation` varchar(64) NOT NULL, `col_isNull` boolean NOT NULL,'
. ' `col_extra` varchar(255) default \'\', `col_default` text,'
. ' PRIMARY KEY (`db_name`,`col_name`) )'
. ' COMMENT=\'Central list of columns\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Central list of columns\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -831,7 +831,7 @@ class RelationTest extends AbstractTestCase
. ' -- CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( '
. '`username` varchar(64) NOT NULL, `settings_data` text NOT NULL,'
. ' PRIMARY KEY (`username`) )'
. ' COMMENT=\'Settings related to Designer\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Settings related to Designer\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
$dummyDbi->addResult(
@@ -842,7 +842,7 @@ class RelationTest extends AbstractTestCase
. ' `export_type` varchar(10) NOT NULL, `template_name` varchar(64) NOT NULL,'
. ' `template_data` text NOT NULL, PRIMARY KEY (`id`),'
. ' UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) )'
. ' COMMENT=\'Saved export templates\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Saved export templates\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
true,
);
@@ -913,9 +913,9 @@ class RelationTest extends AbstractTestCase
. '`id` int(10) unsigned NOT NULL auto_increment,'
. ' `dbase` varchar(255) NOT NULL default \'\','
. ' `user` varchar(255) NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\','
. ' `label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\','
. ' `query` text NOT NULL, PRIMARY KEY (`id`) )'
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
. ' COMMENT=\'Bookmarks\' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
false,
);
$dummyDbi->addSelectDb('db_pma');
@@ -1037,12 +1037,12 @@ class RelationTest extends AbstractTestCase
' `id` int(10) unsigned NOT NULL auto_increment,',
' `dbase` varchar(255) NOT NULL default \'\',',
' `user` varchar(255) NOT NULL default \'\',',
' `label` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\',',
' `label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\',',
' `query` text NOT NULL,',
' PRIMARY KEY (`id`)',
')',
' COMMENT=\'Bookmarks\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__column_info' => implode("\n", [
'',
@@ -1058,8 +1058,8 @@ class RelationTest extends AbstractTestCase
' `db_name` varchar(64) NOT NULL default \'\',',
' `table_name` varchar(64) NOT NULL default \'\',',
' `column_name` varchar(64) NOT NULL default \'\',',
' `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\',',
' `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default \'\',',
' `comment` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\',',
' `mimetype` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default \'\',',
' `transformation` varchar(255) NOT NULL default \'\',',
' `transformation_options` varchar(255) NOT NULL default \'\',',
' `input_transformation` varchar(255) NOT NULL default \'\',',
@@ -1068,7 +1068,7 @@ class RelationTest extends AbstractTestCase
' UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)',
')',
' COMMENT=\'Column information for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__history' => implode("\n", [
'',
@@ -1090,7 +1090,7 @@ class RelationTest extends AbstractTestCase
' KEY `username` (`username`,`db`,`table`,`timevalue`)',
')',
' COMMENT=\'SQL history for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__pdf_pages' => implode("\n", [
'',
@@ -1104,12 +1104,12 @@ class RelationTest extends AbstractTestCase
'CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (',
' `db_name` varchar(64) NOT NULL default \'\',',
' `page_nr` int(10) unsigned NOT NULL auto_increment,',
' `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default \'\',',
' `page_descr` varchar(50) COLLATE utf8mb4_general_ci NOT NULL default \'\',',
' PRIMARY KEY (`page_nr`),',
' KEY `db_name` (`db_name`)',
')',
' COMMENT=\'PDF relation pages for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__recent' => implode("\n", [
'',
@@ -1126,7 +1126,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`)',
')',
' COMMENT=\'Recently accessed tables\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__favorite' => implode("\n", [
'',
@@ -1143,7 +1143,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`)',
')',
' COMMENT=\'Favorite tables\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__table_uiprefs' => implode("\n", [
'',
@@ -1163,7 +1163,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`,`db_name`,`table_name`)',
')',
' COMMENT=\'Tables\'\' UI preferences\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__relation' => implode("\n", [
'',
@@ -1185,7 +1185,7 @@ class RelationTest extends AbstractTestCase
' KEY `foreign_field` (`foreign_db`,`foreign_table`)',
')',
' COMMENT=\'Relation table\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__table_coords' => implode("\n", [
'',
@@ -1205,7 +1205,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`)',
')',
' COMMENT=\'Table coordinates for phpMyAdmin PDF output\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__table_info' => implode("\n", [
'',
@@ -1223,7 +1223,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`db_name`,`table_name`)',
')',
' COMMENT=\'Table information for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__tracking' => implode("\n", [
'',
@@ -1252,7 +1252,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`db_name`,`table_name`,`version`)',
')',
' COMMENT=\'Database changes tracking for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__userconfig' => implode("\n", [
'',
@@ -1270,7 +1270,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`)',
')',
' COMMENT=\'User preferences storage for phpMyAdmin\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__users' => implode("\n", [
'',
@@ -1287,7 +1287,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`,`usergroup`)',
')',
' COMMENT=\'Users and their assignments to user groups\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__usergroups' => implode("\n", [
'',
@@ -1305,7 +1305,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`usergroup`,`tab`,`allowed`)',
')',
' COMMENT=\'User groups with configured menu items\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__navigationhiding' => implode("\n", [
'',
@@ -1325,7 +1325,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)',
')',
' COMMENT=\'Hidden items of navigation tree\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__savedsearches' => implode("\n", [
'',
@@ -1346,7 +1346,7 @@ class RelationTest extends AbstractTestCase
' UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)',
')',
' COMMENT=\'Saved searches\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__central_columns' => implode("\n", [
'',
@@ -1369,7 +1369,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`db_name`,`col_name`)',
')',
' COMMENT=\'Central list of columns\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__designer_settings' => implode("\n", [
'',
@@ -1386,7 +1386,7 @@ class RelationTest extends AbstractTestCase
' PRIMARY KEY (`username`)',
')',
' COMMENT=\'Settings related to Designer\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
'pma__export_templates' => implode("\n", [
'',
@@ -1407,7 +1407,7 @@ class RelationTest extends AbstractTestCase
' UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`)',
')',
' COMMENT=\'Saved export templates\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]),
];
@@ -1435,7 +1435,7 @@ class RelationTest extends AbstractTestCase
' UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`)',
')',
' COMMENT=\'Saved export templates\'',
' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;',
' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;',
]);
self::assertSame(

38
tests/unit/Controllers/CheckRelationsControllerTest.php
View File

@@ -80,25 +80,25 @@ final class CheckRelationsControllerTest extends AbstractTestCase
$dbiDummy->addResult('SHOW TABLES FROM `phpmyadmin`;', []);
$dbiDummy->addResult('SHOW TABLES FROM `phpmyadmin`;', []);
$dbiDummy->addSelectDb('phpmyadmin');
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__bookmark` -- CREATE TABLE IF NOT EXISTS `pma__bookmark` ( `id` int(10) unsigned NOT NULL auto_increment, `dbase` varchar(255) NOT NULL default '', `user` varchar(255) NOT NULL default '', `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '', `query` text NOT NULL, PRIMARY KEY (`id`) ) COMMENT='Bookmarks' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__relation` -- CREATE TABLE IF NOT EXISTS `pma__relation` ( `master_db` varchar(64) NOT NULL default '', `master_table` varchar(64) NOT NULL default '', `master_field` varchar(64) NOT NULL default '', `foreign_db` varchar(64) NOT NULL default '', `foreign_table` varchar(64) NOT NULL default '', `foreign_field` varchar(64) NOT NULL default '', PRIMARY KEY (`master_db`,`master_table`,`master_field`), KEY `foreign_field` (`foreign_db`,`foreign_table`) ) COMMENT='Relation table' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_info` -- CREATE TABLE IF NOT EXISTS `pma__table_info` ( `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `display_field` varchar(64) NOT NULL default '', PRIMARY KEY (`db_name`,`table_name`) ) COMMENT='Table information for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_coords` -- CREATE TABLE IF NOT EXISTS `pma__table_coords` ( `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `pdf_page_number` int(11) NOT NULL default '0', `x` float unsigned NOT NULL default '0', `y` float unsigned NOT NULL default '0', PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) ) COMMENT='Table coordinates for phpMyAdmin PDF output' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__pdf_pages` -- CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( `db_name` varchar(64) NOT NULL default '', `page_nr` int(10) unsigned NOT NULL auto_increment, `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '', PRIMARY KEY (`page_nr`), KEY `db_name` (`db_name`) ) COMMENT='PDF relation pages for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__column_info` -- CREATE TABLE IF NOT EXISTS `pma__column_info` ( `id` int(5) unsigned NOT NULL auto_increment, `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `column_name` varchar(64) NOT NULL default '', `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '', `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '', `transformation` varchar(255) NOT NULL default '', `transformation_options` varchar(255) NOT NULL default '', `input_transformation` varchar(255) NOT NULL default '', `input_transformation_options` varchar(255) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) ) COMMENT='Column information for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__history` -- CREATE TABLE IF NOT EXISTS `pma__history` ( `id` bigint(20) unsigned NOT NULL auto_increment, `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) ) COMMENT='SQL history for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__recent` -- CREATE TABLE IF NOT EXISTS `pma__recent` ( `username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Recently accessed tables' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__favorite` -- CREATE TABLE IF NOT EXISTS `pma__favorite` ( `username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Favorite tables' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_uiprefs` -- CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( `username` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, `prefs` text NOT NULL, `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`username`,`db_name`,`table_name`) ) COMMENT='Tables'' UI preferences' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__tracking` -- CREATE TABLE IF NOT EXISTS `pma__tracking` ( `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, `version` int(10) unsigned NOT NULL, `date_created` datetime NOT NULL, `date_updated` datetime NOT NULL, `schema_snapshot` text NOT NULL, `schema_sql` text, `data_sql` longtext, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) ) COMMENT='Database changes tracking for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__userconfig` -- CREATE TABLE IF NOT EXISTS `pma__userconfig` ( `username` varchar(64) NOT NULL, `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `config_data` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='User preferences storage for phpMyAdmin' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__users` -- CREATE TABLE IF NOT EXISTS `pma__users` ( `username` varchar(64) NOT NULL, `usergroup` varchar(64) NOT NULL, PRIMARY KEY (`username`,`usergroup`) ) COMMENT='Users and their assignments to user groups' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__usergroups` -- CREATE TABLE IF NOT EXISTS `pma__usergroups` ( `usergroup` varchar(64) NOT NULL, `tab` varchar(64) NOT NULL, `allowed` enum('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`usergroup`,`tab`,`allowed`) ) COMMENT='User groups with configured menu items' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__navigationhiding` -- CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( `username` varchar(64) NOT NULL, `item_name` varchar(64) NOT NULL, `item_type` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) ) COMMENT='Hidden items of navigation tree' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__savedsearches` -- CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( `id` int(5) unsigned NOT NULL auto_increment, `username` varchar(64) NOT NULL default '', `db_name` varchar(64) NOT NULL default '', `search_name` varchar(64) NOT NULL default '', `search_data` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) ) COMMENT='Saved searches' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__central_columns` -- CREATE TABLE IF NOT EXISTS `pma__central_columns` ( `db_name` varchar(64) NOT NULL, `col_name` varchar(64) NOT NULL, `col_type` varchar(64) NOT NULL, `col_length` text, `col_collation` varchar(64) NOT NULL, `col_isNull` boolean NOT NULL, `col_extra` varchar(255) default '', `col_default` text, PRIMARY KEY (`db_name`,`col_name`) ) COMMENT='Central list of columns' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__designer_settings` -- CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( `username` varchar(64) NOT NULL, `settings_data` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Settings related to Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__export_templates` -- CREATE TABLE IF NOT EXISTS `pma__export_templates` ( `id` int(5) unsigned NOT NULL AUTO_INCREMENT, `username` varchar(64) NOT NULL, `export_type` varchar(10) NOT NULL, `template_name` varchar(64) NOT NULL, `template_data` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) ) COMMENT='Saved export templates' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__bookmark` -- CREATE TABLE IF NOT EXISTS `pma__bookmark` ( `id` int(10) unsigned NOT NULL auto_increment, `dbase` varchar(255) NOT NULL default '', `user` varchar(255) NOT NULL default '', `label` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '', `query` text NOT NULL, PRIMARY KEY (`id`) ) COMMENT='Bookmarks' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__relation` -- CREATE TABLE IF NOT EXISTS `pma__relation` ( `master_db` varchar(64) NOT NULL default '', `master_table` varchar(64) NOT NULL default '', `master_field` varchar(64) NOT NULL default '', `foreign_db` varchar(64) NOT NULL default '', `foreign_table` varchar(64) NOT NULL default '', `foreign_field` varchar(64) NOT NULL default '', PRIMARY KEY (`master_db`,`master_table`,`master_field`), KEY `foreign_field` (`foreign_db`,`foreign_table`) ) COMMENT='Relation table' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_info` -- CREATE TABLE IF NOT EXISTS `pma__table_info` ( `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `display_field` varchar(64) NOT NULL default '', PRIMARY KEY (`db_name`,`table_name`) ) COMMENT='Table information for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_coords` -- CREATE TABLE IF NOT EXISTS `pma__table_coords` ( `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `pdf_page_number` int(11) NOT NULL default '0', `x` float unsigned NOT NULL default '0', `y` float unsigned NOT NULL default '0', PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) ) COMMENT='Table coordinates for phpMyAdmin PDF output' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__pdf_pages` -- CREATE TABLE IF NOT EXISTS `pma__pdf_pages` ( `db_name` varchar(64) NOT NULL default '', `page_nr` int(10) unsigned NOT NULL auto_increment, `page_descr` varchar(50) COLLATE utf8mb4_general_ci NOT NULL default '', PRIMARY KEY (`page_nr`), KEY `db_name` (`db_name`) ) COMMENT='PDF relation pages for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__column_info` -- CREATE TABLE IF NOT EXISTS `pma__column_info` ( `id` int(5) unsigned NOT NULL auto_increment, `db_name` varchar(64) NOT NULL default '', `table_name` varchar(64) NOT NULL default '', `column_name` varchar(64) NOT NULL default '', `comment` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '', `mimetype` varchar(255) COLLATE utf8mb4_general_ci NOT NULL default '', `transformation` varchar(255) NOT NULL default '', `transformation_options` varchar(255) NOT NULL default '', `input_transformation` varchar(255) NOT NULL default '', `input_transformation_options` varchar(255) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) ) COMMENT='Column information for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__history` -- CREATE TABLE IF NOT EXISTS `pma__history` ( `id` bigint(20) unsigned NOT NULL auto_increment, `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) ) COMMENT='SQL history for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__recent` -- CREATE TABLE IF NOT EXISTS `pma__recent` ( `username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Recently accessed tables' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__favorite` -- CREATE TABLE IF NOT EXISTS `pma__favorite` ( `username` varchar(64) NOT NULL, `tables` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Favorite tables' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__table_uiprefs` -- CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` ( `username` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, `prefs` text NOT NULL, `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`username`,`db_name`,`table_name`) ) COMMENT='Tables'' UI preferences' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__tracking` -- CREATE TABLE IF NOT EXISTS `pma__tracking` ( `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, `version` int(10) unsigned NOT NULL, `date_created` datetime NOT NULL, `date_updated` datetime NOT NULL, `schema_snapshot` text NOT NULL, `schema_sql` text, `data_sql` longtext, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) ) COMMENT='Database changes tracking for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__userconfig` -- CREATE TABLE IF NOT EXISTS `pma__userconfig` ( `username` varchar(64) NOT NULL, `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `config_data` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='User preferences storage for phpMyAdmin' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__users` -- CREATE TABLE IF NOT EXISTS `pma__users` ( `username` varchar(64) NOT NULL, `usergroup` varchar(64) NOT NULL, PRIMARY KEY (`username`,`usergroup`) ) COMMENT='Users and their assignments to user groups' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__usergroups` -- CREATE TABLE IF NOT EXISTS `pma__usergroups` ( `usergroup` varchar(64) NOT NULL, `tab` varchar(64) NOT NULL, `allowed` enum('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`usergroup`,`tab`,`allowed`) ) COMMENT='User groups with configured menu items' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__navigationhiding` -- CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( `username` varchar(64) NOT NULL, `item_name` varchar(64) NOT NULL, `item_type` varchar(64) NOT NULL, `db_name` varchar(64) NOT NULL, `table_name` varchar(64) NOT NULL, PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`) ) COMMENT='Hidden items of navigation tree' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__savedsearches` -- CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( `id` int(5) unsigned NOT NULL auto_increment, `username` varchar(64) NOT NULL default '', `db_name` varchar(64) NOT NULL default '', `search_name` varchar(64) NOT NULL default '', `search_data` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) ) COMMENT='Saved searches' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__central_columns` -- CREATE TABLE IF NOT EXISTS `pma__central_columns` ( `db_name` varchar(64) NOT NULL, `col_name` varchar(64) NOT NULL, `col_type` varchar(64) NOT NULL, `col_length` text, `col_collation` varchar(64) NOT NULL, `col_isNull` boolean NOT NULL, `col_extra` varchar(255) default '', `col_default` text, PRIMARY KEY (`db_name`,`col_name`) ) COMMENT='Central list of columns' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__designer_settings` -- CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( `username` varchar(64) NOT NULL, `settings_data` text NOT NULL, PRIMARY KEY (`username`) ) COMMENT='Settings related to Designer' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addResult("-- -------------------------------------------------------- -- -- Table structure for table `pma__export_templates` -- CREATE TABLE IF NOT EXISTS `pma__export_templates` ( `id` int(5) unsigned NOT NULL AUTO_INCREMENT, `username` varchar(64) NOT NULL, `export_type` varchar(10) NOT NULL, `template_name` varchar(64) NOT NULL, `template_data` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) ) COMMENT='Saved export templates' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;", true);
$dbiDummy->addSelectDb('phpmyadmin');
$dbiDummy->addResult('SHOW TABLES FROM `phpmyadmin`;', [['pma__bookmark'], ['pma__central_columns'], ['pma__column_info'], ['pma__designer_settings'], ['pma__export_templates'], ['pma__favorite'], ['pma__history'], ['pma__navigationhiding'], ['pma__pdf_pages'], ['pma__recent'], ['pma__relation'], ['pma__savedsearches'], ['pma__table_coords'], ['pma__table_info'], ['pma__table_uiprefs'], ['pma__tracking'], ['pma__userconfig'], ['pma__usergroups'], ['pma__users']]);
$dbiDummy->addResult('SELECT NULL FROM `pma__table_info` LIMIT 0', []);

10
tests/unit/Controllers/Database/Fixtures/Export-testController.html
View File

@@ -2390,11 +2390,11 @@
<li class="list-group-item"><label for="text_sql_header_comment" class="form-label">Additional custom header comment (\n splits lines):</label><input class="form-control" type="text" name="sql_header_comment" value="" id="text_sql_header_comment">
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_dates" value="y" id="checkbox_sql_dates" ><label class="form-check-label" for="checkbox_sql_dates">Include a timestamp of when databases were created, last updated, and last checked</label></div>
</ul>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_use_transaction" value="y" id="checkbox_sql_use_transaction" checked><label class="form-check-label" for="checkbox_sql_use_transaction">Enclose export in a transaction</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fmysqldump.html%23option_mysqldump_single-transaction" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_disable_fk" value="y" id="checkbox_sql_disable_fk" ><label class="form-check-label" for="checkbox_sql_disable_fk">Disable foreign key checks</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fserver-system-variables.html%23sysvar_foreign_key_checks" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_use_transaction" value="y" id="checkbox_sql_use_transaction" checked><label class="form-check-label" for="checkbox_sql_use_transaction">Enclose export in a transaction</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fmysqldump.html%23option_mysqldump_single-transaction" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_disable_fk" value="y" id="checkbox_sql_disable_fk" ><label class="form-check-label" for="checkbox_sql_disable_fk">Disable foreign key checks</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fserver-system-variables.html%23sysvar_foreign_key_checks" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_views_as_tables" value="y" id="checkbox_sql_views_as_tables" ><label class="form-check-label" for="checkbox_sql_views_as_tables">Export views as tables</label></div>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_metadata" value="y" id="checkbox_sql_metadata" ><label class="form-check-label" for="checkbox_sql_metadata">Export metadata</label></div>
<li class="list-group-item"><label for="select_sql_compatibility" class="form-label">Database system or older MySQL server to maximize output compatibility with:</label><select class="form-select" name="sql_compatibility" id="select_sql_compatibility"><option value="NONE" selected>NONE</option><option value="ANSI">ANSI</option><option value="DB2">DB2</option><option value="MAXDB">MAXDB</option><option value="MYSQL323">MYSQL323</option><option value="MYSQL40">MYSQL40</option><option value="MSSQL">MSSQL</option><option value="ORACLE">ORACLE</option><option value="TRADITIONAL">TRADITIONAL</option></select><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fsql-mode.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><label for="select_sql_compatibility" class="form-label">Database system or older MySQL server to maximize output compatibility with:</label><select class="form-select" name="sql_compatibility" id="select_sql_compatibility"><option value="NONE" selected>NONE</option><option value="ANSI">ANSI</option><option value="DB2">DB2</option><option value="MAXDB">MAXDB</option><option value="MYSQL323">MYSQL323</option><option value="MYSQL40">MYSQL40</option><option value="MSSQL">MSSQL</option><option value="ORACLE">ORACLE</option><option value="TRADITIONAL">TRADITIONAL</option></select><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fsql-mode.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check"><input type="radio" name="sql_structure_or_data" class="form-check-input" value="structure" id="radio_sql_structure_or_data_structure"><label class="form-check-label" for="radio_sql_structure_or_data_structure">structure</label></div><div class="form-check"><input type="radio" name="sql_structure_or_data" class="form-check-input" value="data" id="radio_sql_structure_or_data_data"><label class="form-check-label" for="radio_sql_structure_or_data_data">data</label></div><div class="form-check"><input type="radio" name="sql_structure_or_data" class="form-check-input" value="structure_and_data" id="radio_sql_structure_or_data_structure_and_data" checked><label class="form-check-label" for="radio_sql_structure_or_data_structure_and_data">structure and data</label></div>
<li class="list-group-item"><ul class="list-group" id="ul_sql_structure_or_data">
</ul>
@@ -2426,8 +2426,8 @@
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_truncate" value="y" id="checkbox_sql_truncate" ><label class="form-check-label" for="checkbox_sql_truncate">Truncate table before insert</label></div>
<li class="list-group-item">Instead of <code>INSERT</code> statements, use:
<li class="list-group-item"><ul class="list-group" id="ul_sql_insert_alternatives">
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_delayed" value="y" id="checkbox_sql_delayed" ><label class="form-check-label" for="checkbox_sql_delayed"><code>INSERT DELAYED</code> statements</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Finsert-delayed.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_ignore" value="y" id="checkbox_sql_ignore" ><label class="form-check-label" for="checkbox_sql_ignore"><code>INSERT IGNORE</code> statements</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Finsert.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_delayed" value="y" id="checkbox_sql_delayed" ><label class="form-check-label" for="checkbox_sql_delayed"><code>INSERT DELAYED</code> statements</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Finsert-delayed.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_ignore" value="y" id="checkbox_sql_ignore" ><label class="form-check-label" for="checkbox_sql_ignore"><code>INSERT IGNORE</code> statements</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Finsert.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
</ul>
<li class="list-group-item"><label for="select_sql_type" class="form-label">Function to use when dumping data:</label><select class="form-select" name="sql_type" id="select_sql_type"><option value="INSERT" selected>INSERT</option><option value="UPDATE">UPDATE</option><option value="REPLACE">REPLACE</option></select>
<li class="list-group-item">Syntax to use when inserting data:

4
tests/unit/Controllers/Database/Fixtures/Import-testController.html
View File

@@ -800,8 +800,8 @@
<div id="sql_options" class="format_specific_options"><h3>SQL</h3>
<div id="sql_general_opts"><ul class="list-group">
<li class="list-group-item"><label for="select_sql_compatibility" class="form-label">SQL compatibility mode:</label><select class="form-select" name="sql_compatibility" id="select_sql_compatibility"><option value="NONE" selected>NONE</option><option value="ANSI">ANSI</option><option value="DB2">DB2</option><option value="MAXDB">MAXDB</option><option value="MYSQL323">MYSQL323</option><option value="MYSQL40">MYSQL40</option><option value="MSSQL">MSSQL</option><option value="ORACLE">ORACLE</option><option value="TRADITIONAL">TRADITIONAL</option></select><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fsql-mode.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_no_auto_value_on_zero" value="y" id="checkbox_sql_no_auto_value_on_zero" checked><label class="form-check-label" for="checkbox_sql_no_auto_value_on_zero">Do not use <code>AUTO_INCREMENT</code> for zero values</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fsql-mode.html%23sqlmode_no_auto_value_on_zero" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><label for="select_sql_compatibility" class="form-label">SQL compatibility mode:</label><select class="form-select" name="sql_compatibility" id="select_sql_compatibility"><option value="NONE" selected>NONE</option><option value="ANSI">ANSI</option><option value="DB2">DB2</option><option value="MAXDB">MAXDB</option><option value="MYSQL323">MYSQL323</option><option value="MYSQL40">MYSQL40</option><option value="MSSQL">MSSQL</option><option value="ORACLE">ORACLE</option><option value="TRADITIONAL">TRADITIONAL</option></select><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fsql-mode.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
<li class="list-group-item"><div class="form-check form-switch"><input class="form-check-input" type="checkbox" role="switch" name="sql_no_auto_value_on_zero" value="y" id="checkbox_sql_no_auto_value_on_zero" checked><label class="form-check-label" for="checkbox_sql_no_auto_value_on_zero">Do not use <code>AUTO_INCREMENT</code> for zero values</label></div><a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fsql-mode.html%23sqlmode_no_auto_value_on_zero" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a>
</ul></div>
</div>

4
tests/unit/Controllers/Database/Fixtures/Search-testController.html
View File

@@ -31,13 +31,13 @@
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="criteriaSearchType" id="criteriaSearchTypeRadio5" value="5">
<label class="form-check-label" for="criteriaSearchTypeRadio5">as regular expression <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fregexp.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></label>
<label class="form-check-label" for="criteriaSearchTypeRadio5">as regular expression <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fregexp.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></label>
</div>
<legend>Options:</legend>
<div class="form-check">
<input class="form-check-input" value='0' type="hidden" name="criteriaSearchOptionIncludeHex" id="criteriaSearchOptionHidden1">
<input class="form-check-input" value='1' type="checkbox" name="criteriaSearchOptionIncludeHex" id="criteriaSearchOptionCheckbox1" >
<label class="form-check-label" for="criteriaSearchOptionCheckbox1">include hex matches <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fstring-functions.html%23function_hex" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></label>
<label class="form-check-label" for="criteriaSearchOptionCheckbox1">include hex matches <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fstring-functions.html%23function_hex" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></label>
</div>
</fieldset>

2
tests/unit/Controllers/Database/Fixtures/Sql-testController.html
View File

@@ -396,7 +396,7 @@
<a id="querybox"></a>
<div class="card mb-3">
<div class="card-header">Run SQL query/queries on database <a href="index.php?route=/database/structure&lang=en&db=test_db&lang=en">test_db</a>: <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.5%2Fen%2Fselect.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></div>
<div class="card-header">Run SQL query/queries on database <a href="index.php?route=/database/structure&lang=en&db=test_db&lang=en">test_db</a>: <a href="index.php?route=/url&url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Fselect.html" target="mysql_doc"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></div>
<div class="card-body">
<div id="queryfieldscontainer">
<div class="row">

2
tests/unit/Controllers/Table/GetFieldControllerTest.php
View File

@@ -56,7 +56,7 @@ class GetFieldControllerTest extends AbstractTestCase
['Table', 'Key_name', 'Column_name'],
);
$dummyDbi->addResult(
'SELECT `file` FROM `table_with_blob` WHERE `table_with_blob`.`id` = 1;',
'SELECT `file` FROM `table_with_blob` WHERE `table_with_blob`.`id` = 1 LIMIT 1;',
[[bin2hex('FILE')]],
['file'],
);

4
tests/unit/InsertEditTest.php
View File

@@ -1262,7 +1262,7 @@ class InsertEditTest extends AbstractTestCase
$dbi->expects(self::once())
->method('tryQuery')
->with('SELECT `TABLE_COMMENT` FROM `information_schema`.`TABLES` WHERE `f`=1')
->with('SELECT `TABLE_COMMENT` FROM `information_schema`.`TABLES` WHERE `f`=1 LIMIT 1')
->willReturn($resultStub);
$resultStub->expects(self::once())
@@ -2057,7 +2057,7 @@ class InsertEditTest extends AbstractTestCase
$dbi->expects(self::exactly(3))
->method('tryQuery')
->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1')
->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1 LIMIT 1')
->willReturn($resultStub);
$meta1 = FieldHelper::fromArray(['type' => MYSQLI_TYPE_TINY]);

2
tests/unit/Stubs/DbiDummy.php
View File

@@ -1850,7 +1850,7 @@ class DbiDummy implements DbiExtension
'result' => [['user<br>group', 'server_sql', 'Y']],
],
[
'query' => 'SELECT `name` FROM `test_table` WHERE `id` = 4',
'query' => 'SELECT `name` FROM `test_table` WHERE `id` = 4 LIMIT 1;',
'columns' => ['name'],
'result' => [['101']],
],