Skip to content

Commit b2cc10a

Browse files
Merge pull request #19628 from kamil-tekiela/Fix-mysql-default-value-insert
Fix mysql default value insert
2 parents ba5bc8d + 1bae655 commit b2cc10a

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/InsertEdit.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,11 @@ public function getHtmlForInsertEditRow(
18651865
/** @return array<string|null> */
18661866
public function getColumnDefaultValues(string $database, string $table): array
18671867
{
1868-
$sql = 'SELECT COLUMN_NAME, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '
1868+
$sql = 'SELECT COLUMN_NAME, CASE WHEN INSTR(EXTRA, \'DEFAULT_GENERATED\')'
1869+
. ' THEN COLUMN_DEFAULT '
1870+
. ' ELSE CONCAT(\'\'\'\', COLUMN_DEFAULT, \'\'\'\')'
1871+
. ' END AS COLUMN_DEFAULT'
1872+
. ' FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '
18691873
. $this->dbi->quoteString($table)
18701874
. ' AND TABLE_SCHEMA = ' . $this->dbi->quoteString($database);
18711875

tests/unit/Controllers/Table/ReplaceControllerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ public function testReplace(): void
133133
$dummyDbi->addSelectDb('my_db');
134134
$dummyDbi->addSelectDb('my_db');
135135
$dummyDbi->addResult(
136-
'SELECT COLUMN_NAME, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS '
136+
"SELECT COLUMN_NAME, CASE WHEN INSTR(EXTRA, 'DEFAULT_GENERATED') THEN COLUMN_DEFAULT "
137+
. "ELSE CONCAT('''', COLUMN_DEFAULT, '''') END AS COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS "
137138
. "WHERE TABLE_NAME = 'test_tbl' AND TABLE_SCHEMA = 'my_db'",
138139
[],
139140
);

0 commit comments

Comments
 (0)