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

Allow Foreign keys to be added on non-indexed columns, if it's an InnoDB table

Browse Source 
InnoDB automatically creates an index over the column, which can be replaced
by defining a new index over the same column.

Fix #12665

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
This commit is contained in:
Deven Bansod 2016-10-30 13:39:02 +05:30
parent 2fbf09ba2d
commit 1475c0e811
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
templates/table/relation/common_form.phtml
View File

@ -8,11 +8,20 @@
<tr>
<th><?= __('Actions'); ?></th>
<th><?= __('Constraint properties'); ?></th>
<th><?= __('Column') , PMA\libraries\Util::showHint(__(
'Only columns with index will be displayed. You can define an'
. ' index below.'
)) ?>
</th>
<?php if (strtoupper($tbl_storage_engine) == 'INNODB'): ?>
<th><?= __('Column') , PMA\libraries\Util::showHint(__(
'Creating a foreign key over a non-indexed column would automatically create'
. ' an index on it. Alternatively, you can define an index below, before creating'
. ' the foreign key.'
)) ?>
</th>
<?php else: ?>
<th><?= __('Column') , PMA\libraries\Util::showHint(__(
'Only columns with index will be displayed. You can define an'
. ' index below.'
)) ?>
</th>
<?php endif; ?>
<th colspan="3">
<?= __('Foreign key constraint'); ?> (<?= $tbl_storage_engine; ?>)
</th>

4
templates/table/relation/foreign_key_row.phtml
View File

@ -35,7 +35,9 @@ $on_update = isset($one_key['on_update'])
$column_array = array();
$column_array[''] = '';
foreach ($columns as $column) {
if (! empty($column['Key'])) {
if (strtoupper($tbl_storage_engine) == 'INNODB'
|| ! empty($column['Key'])
) {
$column_array[$column['Field']] = $column['Field'];
}
}