gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NULL wrongly checked on field change

Browse Source 
Pull-request: #15445

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-08-20 10:04:01 +02:00
commit bef259c510
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/classes/Controllers/Table/TableStructureController.php
View File

@ -889,7 +889,7 @@ class TableStructureController extends TableController
$_POST['field_length'][$i], $_POST['field_length'][$i],
$_POST['field_attribute'][$i], $_POST['field_attribute'][$i],
Util::getValueByKey($_POST, "field_collation.${i}", ''), Util::getValueByKey($_POST, "field_collation.${i}", ''),
Util::getValueByKey($_POST, "field_null.${i}", 'NOT NULL'), Util::getValueByKey($_POST, "field_null.${i}", 'NO'),
$_POST['field_default_type'][$i], $_POST['field_default_type'][$i],
$_POST['field_default_value'][$i], $_POST['field_default_value'][$i],
Util::getValueByKey($_POST, "field_extra.${i}", false), Util::getValueByKey($_POST, "field_extra.${i}", false),
@ -1036,7 +1036,7 @@ class TableStructureController extends TableController
$_POST['field_length_orig'][$i], $_POST['field_length_orig'][$i],
$_POST['field_attribute_orig'][$i], $_POST['field_attribute_orig'][$i],
Util::getValueByKey($_POST, "field_collation_orig.${i}", ''), Util::getValueByKey($_POST, "field_collation_orig.${i}", ''),
Util::getValueByKey($_POST, "field_null_orig.${i}", 'NOT NULL'), Util::getValueByKey($_POST, "field_null_orig.${i}", 'NO'),
$_POST['field_default_type_orig'][$i], $_POST['field_default_type_orig'][$i],
$_POST['field_default_value_orig'][$i], $_POST['field_default_value_orig'][$i],
Util::getValueByKey($_POST, "field_extra_orig.${i}", false), Util::getValueByKey($_POST, "field_extra_orig.${i}", false),

4
libraries/classes/Table.php
View File

@ -534,7 +534,7 @@ class Table
if (! $virtuality || $isVirtualColMysql) { if (! $virtuality || $isVirtualColMysql) {
if ($null !== false) { if ($null !== false) {
if ($null == 'NULL') { if ($null == 'YES') {
$query .= ' NULL'; $query .= ' NULL';
} else { } else {
$query .= ' NOT NULL'; $query .= ' NOT NULL';
@ -573,7 +573,7 @@ class Table
case 'NULL' : case 'NULL' :
// If user uncheck null checkbox and not change default value null, // If user uncheck null checkbox and not change default value null,
// default value will be ignored. // default value will be ignored.
if ($null !== false && $null !== 'NULL') { if ($null !== false && $null !== 'YES') {
break; break;
} }
// else fall-through intended, no break here // else fall-through intended, no break here

2
templates/columns_definitions/column_null.twig
View File

@ -4,5 +4,5 @@
checked="checked" checked="checked"
{%- endif %} {%- endif %}
type="checkbox" type="checkbox"
value="NULL" value="YES"
class="allow_null" /> class="allow_null" />