Skip to content

Commit 6e11984

Browse files
committed
Merge #19893 - Remove Berkeley DB support and references
Pull-request: #19893 Fixes: #19889 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents 3eab4de + 6751930 commit 6e11984

11 files changed

Lines changed: 7 additions & 191 deletions

File tree

docs/config.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,9 +2437,7 @@ Main panel
24372437
:default: true
24382438

24392439
Defines whether or not to display space usage and statistics about
2440-
databases and tables. Note that statistics requires at least MySQL
2441-
3.23.3 and that, at this date, MySQL doesn't return such information
2442-
for Berkeley DB tables.
2440+
databases and tables.
24432441

24442442
.. config:option:: $cfg['ShowServerInfo']
24452443

resources/templates/table/operations/index.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<div class="card mb-2">
335335
<div class="card-header">{{ t('Table maintenance') }}</div>
336336
<ul class="list-group list-group-flush" id="tbl_maintenance">
337-
{% if storage_engine in ['MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'] %}
337+
{% if storage_engine in ['MYISAM', 'ARIA', 'INNODB', 'TOKUDB'] %}
338338
<li class="list-group-item">
339339
<a href="{{ url('/table/maintenance/analyze') }}" data-post="{{ get_common({'db': db, 'table': table, 'selected_tbl': [table]}, '', false) }}">
340340
{{ t('Analyze table') }}
@@ -379,7 +379,7 @@
379379
{{ show_mysql_docu('FLUSH') }}
380380
</li>
381381

382-
{% if storage_engine in ['MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'] %}
382+
{% if storage_engine in ['MYISAM', 'ARIA', 'INNODB', 'TOKUDB'] %}
383383
<li class="list-group-item">
384384
<a href="{{ url('/table/maintenance/optimize') }}" data-post="{{ get_common({'db': db, 'table': table, 'selected_tbl': [table]}, '', false) }}">
385385
{{ t('Optimize table') }}

resources/templates/table/structure/display_table_stats.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
{% if free_size is defined
5454
and (tbl_storage_engine == 'MYISAM'
5555
or tbl_storage_engine == 'ARIA'
56-
or tbl_storage_engine == 'MARIA'
57-
or tbl_storage_engine == 'BDB')
56+
or tbl_storage_engine == 'MARIA')
5857
or (tbl_storage_engine == 'INNODB' and innodb_file_per_table == true) %}
5958
<tfoot>
6059
<tr class="d-print-none">

src/Controllers/Database/StructureController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,7 @@ private function getStuffForEngineTypeTable(
707707
case 'MRG_MyISAM':
708708
case 'MRG_MYISAM':
709709
case 'MERGE':
710-
case 'BerkeleyDB':
711-
// Merge or BerkleyDB table: Only row count is accurate.
710+
// Merge table: Only row count is accurate.
712711
if ($this->isShowStats) {
713712
$formattedSize = ' - ';
714713
}

src/Engines/Bdb.php

Lines changed: 0 additions & 66 deletions
This file was deleted.

src/Engines/Berkeleydb.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Import/Import.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,6 @@ public function isTableTransactional(string $table): bool
10421042
'TOKUDB',
10431043
'XTRADB',
10441044
'SEQUENCE',
1045-
'BDB',
10461045
'ROCKSDB',
10471046
];
10481047

src/StorageEngine.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
namespace PhpMyAdmin;
66

77
use PhpMyAdmin\Dbal\DatabaseInterface;
8-
use PhpMyAdmin\Engines\Bdb;
9-
use PhpMyAdmin\Engines\Berkeleydb;
108
use PhpMyAdmin\Engines\Binlog;
119
use PhpMyAdmin\Engines\Innobase;
1210
use PhpMyAdmin\Engines\Innodb;
@@ -241,8 +239,6 @@ public static function getArray(): array
241239
public static function getEngine(string $engine): StorageEngine
242240
{
243241
return match (mb_strtolower($engine)) {
244-
'bdb' => new Bdb($engine),
245-
'berkeleydb' => new Berkeleydb($engine),
246242
'binlog' => new Binlog($engine),
247243
'innobase' => new Innobase($engine),
248244
'innodb' => new Innodb($engine),

tests/unit/Engines/BdbTest.php

Lines changed: 0 additions & 90 deletions
This file was deleted.

tests/unit/StorageEngineTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
use PhpMyAdmin\Cache;
88
use PhpMyAdmin\Dbal\DatabaseInterface;
9-
use PhpMyAdmin\Engines\Bdb;
10-
use PhpMyAdmin\Engines\Berkeleydb;
119
use PhpMyAdmin\Engines\Binlog;
1210
use PhpMyAdmin\Engines\Innobase;
1311
use PhpMyAdmin\Engines\Innodb;
@@ -109,8 +107,6 @@ public static function providerGetEngine(): array
109107
{
110108
return [
111109
[StorageEngine::class, 'unknown engine'],
112-
[Bdb::class, 'Bdb'],
113-
[Berkeleydb::class, 'Berkeleydb'],
114110
[Binlog::class, 'Binlog'],
115111
[Innobase::class, 'Innobase'],
116112
[Innodb::class, 'Innodb'],

0 commit comments

Comments
 (0)