The branch, master has been updated via c199f6b8bd1e909370b7f091fbb36e3ec092c978 (commit) via 2cbabfd56f0a45d2bb76e7181850e568a381359d (commit) via 36e8a23b87afeb905ec36201dc16d2fa38d4dae5 (commit) from 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf (commit)
- Log ----------------------------------------------------------------- commit c199f6b8bd1e909370b7f091fbb36e3ec092c978 Merge: 2cbabfd56f0a45d2bb76e7181850e568a381359d 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf Author: Madhura Jayaratne madhura.cj@gmail.com Date: Tue Feb 1 11:49:45 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 2cbabfd56f0a45d2bb76e7181850e568a381359d Author: Madhura Jayaratne madhura.cj@gmail.com Date: Tue Feb 1 11:47:22 2011 +0530
Work around for Bug #3168569 - Issue on toggling the 'Hide search criteria' in chrome.
commit 36e8a23b87afeb905ec36201dc16d2fa38d4dae5 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Tue Feb 1 11:37:51 2011 +0530
Bug #3152931 ENUM and SET cannot have 'Binary' option. Avoid wrong categorization to binary, blob and char types.
-----------------------------------------------------------------------
Summary of changes: js/tbl_select.js | 5 ++++- tbl_change.php | 33 +++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/js/tbl_select.js b/js/tbl_select.js index 700d0cb..47457ed 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -70,7 +70,10 @@ $(document).ready(function() { // found results $("#sqlqueryresults").html(response); $("#sqlqueryresults").trigger('appendAnchor'); - $('#tbl_search_form').hide(); + $('#tbl_search_form') + // work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome. + .slideToggle() + .hide(); $('#togglesearchformlink') // always start with the Show message .text(PMA_messages['strShowSearchCriteria']) diff --git a/tbl_change.php b/tbl_change.php index 2ce434d..2d4bcd8 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -370,10 +370,31 @@ foreach ($rows as $row_id => $vrow) { $table_fields[$i]['Field_title'] = $table_fields[$i]['Field_html']; }
- // The type column - $table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary'); - $table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob'); - $table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char'); + // The type column. + // Fix for bug #3152931 'ENUM and SET cannot have "Binary" option' + // If check to ensure types such as "enum('one','two','binary',..)" or + // "enum('one','two','varbinary',..)" are not categorized as binary. + if (stripos($table_fields[$i]['Type'], 'binary') === 0 + || stripos($table_fields[$i]['Type'], 'varbinary') === 0) { + $table_fields[$i]['is_binary'] = stristr($table_fields[$i]['Type'], 'binary'); + } + + // If check to ensure types such as "enum('one','two','blob',..)" or + // "enum('one','two','tinyblob',..)" etc. are not categorized as blob. + if (stripos($table_fields[$i]['Type'], 'blob') === 0 + || stripos($table_fields[$i]['Type'], 'tinyblob') === 0 + || stripos($table_fields[$i]['Type'], 'mediumblob') === 0 + || stripos($table_fields[$i]['Type'], 'longblob') === 0) { + $table_fields[$i]['is_blob'] = stristr($table_fields[$i]['Type'], 'blob'); + } + + // If check to ensure types such as "enum('one','two','char',..)" or + // "enum('one','two','varchar',..)" are not categorized as char. + if (stripos($table_fields[$i]['Type'], 'char') === 0 + || stripos($table_fields[$i]['Type'], 'varchar') === 0) { + $table_fields[$i]['is_char'] = stristr($table_fields[$i]['Type'], 'char'); + } + $table_fields[$i]['first_timestamp'] = false; switch ($table_fields[$i]['True_Type']) { case 'set': @@ -616,7 +637,7 @@ foreach ($rows as $row_id => $vrow) { echo ' checked="checked"'; } echo ' id="field_' . ($idindex) . '_2" />'; - + // nullify_code is needed by the js nullify() function if (strstr($field['True_Type'], 'enum')) { if (strlen($field['Type']) > 20) { @@ -635,7 +656,7 @@ foreach ($rows as $row_id => $vrow) { } else { $nullify_code = '5'; } - // to be able to generate calls to nullify() in jQuery + // to be able to generate calls to nullify() in jQuery echo '<input type="hidden" class="nullify_code" name="nullify_code' . $field_name_appendix . '" value="' . $nullify_code . '" />'; echo '<input type="hidden" class="hashed_field" name="hashed_field' . $field_name_appendix . '" value="' . $field['Field_md5'] . '" />'; echo '<input type="hidden" class="multi_edit" name="multi_edit' . $field_name_appendix . '" value="' . PMA_escapeJsString($vkey) . '" />';
hooks/post-receive