Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@6188e46 · GitHub
Skip to content

Commit 6188e46

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 3ed4124 + 1d99cec commit 6188e46

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

‎src/Controllers/Database/StructureController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,7 @@ private function getStuffForEngineTypeTable(
694694
case 'InnoDB':
695695
case 'PBMS':
696696
case 'TokuDB':
697+
case 'ROCKSDB':
697698
// InnoDB table: Row count is not accurate but data and index sizes are.
698699
// PBMS table in Drizzle: TABLE_ROWS is taken from table cache,
699700
// so it may be unavailable

‎src/Import/Import.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,17 @@ public function isTableTransactional(string $table): bool
10381038
}
10391039

10401040
// List of Transactional Engines.
1041-
$transactionalEngines = ['INNODB', 'FALCON', 'NDB', 'INFINIDB', 'TOKUDB', 'XTRADB', 'SEQUENCE', 'BDB'];
1041+
$transactionalEngines = [
1042+
'INNODB',
1043+
'FALCON',
1044+
'NDB',
1045+
'INFINIDB',
1046+
'TOKUDB',
1047+
'XTRADB',
1048+
'SEQUENCE',
1049+
'BDB',
1050+
'ROCKSDB',
1051+
];
10421052

10431053
// Query to check if table is 'Transactional'.
10441054
$checkQuery = 'SELECT `ENGINE` FROM `information_schema`.`tables` '

‎tests/unit/Stubs/DbiDummy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,14 +1558,14 @@ private function init(): void
15581558
[
15591559
'query' => 'SELECT `ENGINE` FROM `information_schema`.`tables` WHERE `table_name` = \'table_1\''
15601560
. ' AND `table_schema` = \'PMA\' AND UPPER(`engine`)'
1561-
. ' IN ("INNODB", "FALCON", "NDB", "INFINIDB", "TOKUDB", "XTRADB", "SEQUENCE", "BDB")',
1561+
. ' IN ("INNODB", "FALCON", "NDB", "INFINIDB", "TOKUDB", "XTRADB", "SEQUENCE", "BDB", "ROCKSDB")',
15621562
'columns' => ['ENGINE'],
15631563
'result' => [['INNODB']],
15641564
],
15651565
[
15661566
'query' => 'SELECT `ENGINE` FROM `information_schema`.`tables` WHERE `table_name` = \'table_2\''
15671567
. ' AND `table_schema` = \'PMA\' AND UPPER(`engine`)'
1568-
. ' IN ("INNODB", "FALCON", "NDB", "INFINIDB", "TOKUDB", "XTRADB", "SEQUENCE", "BDB")',
1568+
. ' IN ("INNODB", "FALCON", "NDB", "INFINIDB", "TOKUDB", "XTRADB", "SEQUENCE", "BDB", "ROCKSDB")',
15691569
'columns' => ['ENGINE'],
15701570
'result' => [['INNODB']],
15711571
],

0 commit comments

Comments
 (0)