mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-11 09:04:02 +02:00
Code Issues Releases Wiki Activity

MariaDB: Fix creating and altering generated columns (fixes #897)

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-10 19:17:22 +01:00
parent 35274f18bb
commit e589ee3fde
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adminer/drivers/mysql.inc.php
View File

@@ -786,12 +786,14 @@ if (!defined('Adminer\DRIVER')) {
* @return bool * @return bool
*/ */
function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) { function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
global $connection;
$alter = array(); $alter = array();
foreach ($fields as $field) { foreach ($fields as $field) {
if ($field[1]) { if ($field[1]) {
$default = $field[1][3]; $default = $field[1][3];
if (preg_match('~ GENERATED~', $default)) { if (preg_match('~ GENERATED~', $default)) {
$field[1][3] = $field[1][2]; // swap default and null
$field[1][3] = (preg_match('~MariaDB~', $connection->server_info) ? "" : $field[1][2]); // MariaDB doesn't support NULL on virtual columns
$field[1][2] = $default; $field[1][2] = $default;
} }
$alter[] = ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : ""); $alter[] = ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : "");

1
changes.txt
View File

@@ -2,6 +2,7 @@ Adminer dev:
Fix gzip export (bug #896) Fix gzip export (bug #896)
Fix importing multiple SQL files not terminated by semicolon Fix importing multiple SQL files not terminated by semicolon
Use <datalist> for altering collations Use <datalist> for altering collations
MariaDB: Fix creating and altering generated columns (bug #897)
Adminer 5.0.2 (released 2025-03-10): Adminer 5.0.2 (released 2025-03-10):
PostgreSQL: Fix setting NULL and original value on enum (bug #884) PostgreSQL: Fix setting NULL and original value on enum (bug #884)