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

Merge pull request #1362 from smita786/master

Browse Source 
fix bug #4540 #4541
This commit is contained in:
Smita Kumari 2014-09-24 23:57:08 +05:30
commit e6b5e40a94
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/functions.js
View File

@ -2504,7 +2504,16 @@ AJAX.registerOnload('functions.js', function () {
.submit();
}
});
$("input[value=AUTO_INCREMENT]").change(function(){
if (this.checked) {
var col = /\d/.exec($(this).attr('name'));
col = col[0];
var index_val = $('select[name="field_key['+col+']"]').val();
if (index_val === 'none_'+col) {
$('select[name="field_key['+col+']"]').val('primary_'+col).change();
}
}
});
$('body')
.off('click', 'input.preview_sql')
.on('click', 'input.preview_sql', function () {
@ -2911,7 +2920,7 @@ function autoPopulate(input_id, offset)
$('#'+input_id+'5').val(central_column_list[db+'_'+table][offset].col_collation);
$('#'+input_id+'6').val(central_column_list[db+'_'+table][offset].col_extra);
if(central_column_list[db+'_'+table][offset].col_extra.toUpperCase() === 'AUTO_INCREMENT') {
$('#'+input_id+'9').attr("checked","checked");
$('#'+input_id+'9').attr("checked","checked").change();
} else {
$('#'+input_id+'9').removeAttr("checked");
}

4
js/indexes.js
View File

@ -460,7 +460,7 @@ AJAX.registerTeardown('indexes.js', function () {
$('a.drop_primary_key_index_anchor.ajax').die('click');
$("#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax").die('click');
$('#index_frm input[type=submit]').die('click');
$('body').off('click', 'select[name*="field_key"]');
$('body').off('change', 'select[name*="field_key"]');
});
/**
@ -590,7 +590,7 @@ AJAX.registerOnload('indexes.js', function () {
* Ajax event handler for advanced index creation during table creation
* and column addition.
*/
$('body').on('click', 'select[name*="field_key"]', function () {
$('body').on('change', 'select[name*="field_key"]', function () {
// Index of column on Table edit and create page.
var col_index = /\d/.exec($(this).attr('name'));
col_index = col_index[0];

29
libraries/Table.class.php
View File

@ -515,35 +515,6 @@ class PMA_Table
if (!empty($extra)) {
$query .= ' ' . $extra;
// Force an auto_increment field to be part of the primary key
// even if user did not tick the PK box;
if ($extra == 'AUTO_INCREMENT') {
$primary_cnt = count($field_primary);
if (1 == $primary_cnt) {
for ($j = 0; $j < $primary_cnt; $j++) {
if ($field_primary[$j] == $index) {
break;
}
}
if (isset($field_primary[$j]) && $field_primary[$j] == $index) {
$query .= ' PRIMARY KEY';
unset($field_primary[$j]);
}
} else {
// but the PK could contain other columns so do not append
// a PRIMARY KEY clause, just add a member to $field_primary
$found_in_pk = false;
for ($j = 0; $j < $primary_cnt; $j++) {
if ($field_primary[$j] == $index) {
$found_in_pk = true;
break;
}
} // end for
if (! $found_in_pk) {
$field_primary[] = $index;
}
}
} // end if (auto_increment)
}
if (!empty($comment)) {
$query .= " COMMENT '" . PMA_Util::sqlAddSlashes($comment) . "'";