August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13003-g416277f
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 416277f3980f1bb56a513a106d28dbf4c902dee6 (commit) via addeffabafb2fc1590559dc66cf0fb84573a338d (commit) via 57ab1b3e20ea680f33d8c4e856e595d3edcc0b18 (commit) via 48149c261c633baf517455079a2524a9a9aac6a0 (commit) via 83d3c0d2fd729a2d09a480d19ec6484198b79379 (commit) via f646fc8a559b687ad7eeeeff410c0b67a9b82055 (commit) from 87c970b0f8672b60eddab3950c4535ab29b2395c (commit) - Log ----------------------------------------------------------------- commit 416277f3980f1bb56a513a106d28dbf4c902dee6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:16:03 2011 +0200 Use standard field processing machinery commit addeffabafb2fc1590559dc66cf0fb84573a338d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:14:36 2011 +0200 Use standard field processing machinery commit 57ab1b3e20ea680f33d8c4e856e595d3edcc0b18 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:12:08 2011 +0200 No longer needed commit 48149c261c633baf517455079a2524a9a9aac6a0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:11:47 2011 +0200 Use already calculated values commit 83d3c0d2fd729a2d09a480d19ec6484198b79379 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:08:49 2011 +0200 Move attribute processing to PMA_extractFieldSpec commit f646fc8a559b687ad7eeeeff410c0b67a9b82055 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:04:12 2011 +0200 Use PMA_extractFieldSpec instead of own code ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 11 +---- libraries/common.lib.php | 12 +++++ libraries/export/texytext.php | 39 +++------------- libraries/schema/Pdf_Relation_Schema.class.php | 45 +++---------------- libraries/tbl_properties.inc.php | 26 ++--------- tbl_printview.php | 47 +++----------------- tbl_structure.php | 11 +---- .../libraries/common/PMA_extractFieldSpec_test.php | 5 ++ 8 files changed, 43 insertions(+), 153 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 1c46cbb..86b4b80 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -196,16 +196,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $type_nowrap = ' nowrap="nowrap"'; } $type = htmlspecialchars($extracted_fieldspec['print_type']); - $attribute = ' '; - if ($extracted_fieldspec['binary']) { - $attribute = 'BINARY'; - } - if ($extracted_fieldspec['unsigned']) { - $attribute = 'UNSIGNED'; - } - if ($extracted_fieldspec['zerofill']) { - $attribute = 'UNSIGNED ZEROFILL'; - } + $attribute = $extracted_fieldspec['attribute'] if (! isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = '<i>NULL</i>'; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 352446b..13983de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2650,6 +2650,17 @@ function PMA_extractFieldSpec($fieldspec) { } + $attribute = ' '; + if ($binary) { + $attribute = 'BINARY'; + } + if ($unsigned) { + $attribute = 'UNSIGNED'; + } + if ($zerofill) { + $attribute = 'UNSIGNED ZEROFILL'; + } + return array( 'type' => $type, 'spec_in_brackets' => $spec_in_brackets, @@ -2658,6 +2669,7 @@ function PMA_extractFieldSpec($fieldspec) { 'binary' => $binary, 'unsigned' => $unsigned, 'zerofill' => $zerofill, + 'attribute' => $attribute, ); } diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index d248c1b..565907e 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -252,40 +252,15 @@ if (isset($plugin_list)) { foreach ($columns as $column) { $text_output = ''; - $type = $column['Type']; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - if (preg_match('/^(set|enum)$(.+)$$/i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('/BINARY/i', '', $type); - $type = preg_replace('/ZEROFILL/i', '', $type); - $type = preg_replace('/UNSIGNED/i', '', $type); - if (empty($type)) { - $type = ' '; - } - $binary = preg_match('/BINARY/i', $column['Type']); - $unsigned = preg_match('/UNSIGNED/i', $column['Type']); - $zerofill = preg_match('/ZEROFILL/i', $column['Type']); - } - $attribute = ' '; - if ($binary) { - $attribute = 'BINARY'; - } - if ($unsigned) { - $attribute = 'UNSIGNED'; - } - if ($zerofill) { - $attribute = 'UNSIGNED ZEROFILL'; + $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $type = $extracted_fieldspec['print_type']; + if (empty($type)) { + $type = ' '; } + + $attribute = $extracted_fieldspec['attribute'] + if (! isset($column['Default'])) { if ($column['Null'] != 'NO') { $column['Default'] = 'NULL'; diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ec03d37..6fd1976 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -1176,8 +1176,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Gets fields properties */ - $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); - $fields_cnt = PMA_DBI_num_rows($result); + $columns = PMA_DBI_get_columns($db, $table); // Check if we can use Relations if (!empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in @@ -1259,41 +1258,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } $pdf->SetFont($this->_ff, ''); - while ($row = PMA_DBI_fetch_assoc($result)) { - $type = $row['Type']; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - if (preg_match('@^(set|enum)$(.+)$$@i', $type, $tmp)) { - $tmp[2] = substr(preg_replace("@([^,])''@", "\\1\\'", ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('@BINARY@i', '', $type); - $type = preg_replace('@ZEROFILL@i', '', $type); - $type = preg_replace('@UNSIGNED@i', '', $type); - if (empty($type)) { - $type = ' '; - } - - $binary = stristr($row['Type'], 'BINARY'); - $unsigned = stristr($row['Type'], 'UNSIGNED'); - $zerofill = stristr($row['Type'], 'ZEROFILL'); - } - $attribute = ' '; - if ($binary) { - $attribute = 'BINARY'; - } - if ($unsigned) { - $attribute = 'UNSIGNED'; - } - if ($zerofill) { - $attribute = 'UNSIGNED ZEROFILL'; - } + foreach ($columns as $row) { + $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $type = $extracted_fieldspec['print_type']; + $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; @@ -1325,9 +1293,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema unset($links[6]); } $pdf->Row($pdf_row, $links); - } // end while + } // end foreach $pdf->SetFont($this->_ff, '', 14); - PMA_DBI_free_result($result); } //end each } } diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 7208ea3..5b099cf 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -298,11 +298,7 @@ for ($i = 0; $i < $num_fields; $i++) { if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { $length = $extracted_fieldspec['spec_in_brackets']; } else { - // strip the "BINARY" attribute, except if we find "BINARY(" because - // this would be a BINARY or VARBINARY field type - $type = preg_replace('@BINARY([^\(])@i', '', $type); - $type = preg_replace('@ZEROFILL@i', '', $type); - $type = preg_replace('@UNSIGNED@i', '', $type); + $type = $extracted_fieldspec['print_type']; $length = $extracted_fieldspec['spec_in_brackets']; } // end if else } else { @@ -336,15 +332,6 @@ for ($i = 0; $i < $num_fields; $i++) { } // column length - if (isset($extracted_fieldspec) && ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type'])) { - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $binary = false; - $unsigned = stristr($row['Type'], 'unsigned'); - $zerofill = stristr($row['Type'], 'zerofill'); - } $length_to_display = $length; $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"' @@ -425,15 +412,10 @@ for ($i = 0; $i < $num_fields; $i++) { . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">'; $attribute = ''; - if ($binary) { - $attribute = 'BINARY'; - } - if ($unsigned) { - $attribute = 'UNSIGNED'; - } - if ($zerofill) { - $attribute = 'UNSIGNED ZEROFILL'; + if (isset($extracted_fieldspec)) { + $attribute = $extracted_fieldspec['attribute']; } + if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') { $attribute = 'on update CURRENT_TIMESTAMP'; } diff --git a/tbl_printview.php b/tbl_printview.php index 9b7e7ff..068cfbc 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -51,7 +51,7 @@ PMA_DBI_select_db($db); /** - * Multi-tables printview + * Multi-tables printview */ if (isset($selected_tbl) && is_array($selected_tbl)) { $the_tables = $selected_tbl; @@ -98,10 +98,7 @@ foreach ($the_tables as $key => $table) { /** * Gets fields properties */ - $result = PMA_DBI_query( - 'SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, - PMA_DBI_QUERY_STORE); - $fields_cnt = PMA_DBI_num_rows($result); + $columns = PMA_DBI_get_columns($db, $table); // We need this to correctly learn if a TIMESTAMP is NOT NULL, since @@ -155,40 +152,11 @@ foreach ($the_tables as $key => $table) { </thead> <tbody> <?php - while ($row = PMA_DBI_fetch_assoc($result)) { - $type = $row['Type']; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - if (preg_match('@^(set|enum)$(.+)$$@i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', - ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type = preg_replace('@BINARY@i', '', $type); - $type = preg_replace('@ZEROFILL@i', '', $type); - $type = preg_replace('@UNSIGNED@i', '', $type); - if (empty($type)) { - $type = ' '; - } + foreach ($columns as $row) { + $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $type = $extracted_fieldspec['print_type']; + $attribute = $extracted_fieldspec['attribute']; - $binary = stristr($row['Type'], 'binary'); - $unsigned = stristr($row['Type'], 'unsigned'); - $zerofill = stristr($row['Type'], 'zerofill'); - } - $attribute = ' '; - if ($binary) { - $attribute = 'BINARY'; - } - if ($unsigned) { - $attribute = 'UNSIGNED'; - } - if ($zerofill) { - $attribute = 'UNSIGNED ZEROFILL'; - } if (! isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = '<i>NULL</i>'; @@ -252,8 +220,7 @@ foreach ($the_tables as $key => $table) { ?> </tr> <?php - } // end while - PMA_DBI_free_result($result); + } // end foreach ?> </tbody> </table> diff --git a/tbl_structure.php b/tbl_structure.php index b104e79..077603c 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -294,16 +294,7 @@ foreach ($fields as $row) { $type_mime = ''; } - $attribute = ' '; - if ($extracted_fieldspec['binary']) { - $attribute = 'BINARY'; - } - if ($extracted_fieldspec['unsigned']) { - $attribute = 'UNSIGNED'; - } - if ($extracted_fieldspec['zerofill']) { - $attribute = 'UNSIGNED ZEROFILL'; - } + $attribute = $extracted_fieldspec['attribute']; // MySQL 4.1.2+ TIMESTAMP options // (if on_update_current_timestamp is set, then it's TRUE) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index b27b2b9..9aa337d 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -45,6 +45,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase 'zerofill' => false, 'spec_in_brackets' => "'a','b'", 'enum_set_values' => array('a', 'b'), + 'attribute' => ' ', ), ), array( @@ -57,6 +58,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase 'zerofill' => false, 'spec_in_brackets' => "'\'a','b'", 'enum_set_values' => array("'a", 'b'), + 'attribute' => ' ', ), ), array( @@ -69,6 +71,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase 'zerofill' => true, 'spec_in_brackets' => '', 'enum_set_values' => array(), + 'attribute' => 'UNSIGNED ZEROFILL', ), ), array( @@ -81,6 +84,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase 'zerofill' => false, 'spec_in_brackets' => '255', 'enum_set_values' => array(), + 'attribute' => ' ', ), ), array( @@ -93,6 +97,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase 'zerofill' => false, 'spec_in_brackets' => '255', 'enum_set_values' => array(), + 'attribute' => ' ', ), ), ); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12997-g87c970b
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 87c970b0f8672b60eddab3950c4535ab29b2395c (commit) from 809258e49b328e0a074abdfd90859da8b843a55f (commit) - Log ----------------------------------------------------------------- commit 87c970b0f8672b60eddab3950c4535ab29b2395c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:00:32 2011 +0200 No need to load full columns here (need names only anyway) ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 2ab7f27..93c5b40 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -105,7 +105,7 @@ if (0 == $tbl_result_cnt) { // The tables list gets from MySQL while (list($tbl) = PMA_DBI_fetch_row($tbl_result)) { - $fld_results = PMA_DBI_get_columns($db, $tbl, true); + $fld_results = PMA_DBI_get_columns($db, $tbl); if (empty($tbl_names[$tbl]) && !empty($_REQUEST['TableList'])) { $tbl_names[$tbl] = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12996-g809258e
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 809258e49b328e0a074abdfd90859da8b843a55f (commit) from 822a863690f675e42ab3b5adabd560590d1db797 (commit) - Log ----------------------------------------------------------------- commit 809258e49b328e0a074abdfd90859da8b843a55f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:50:29 2011 +0200 Docs ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_extractFieldSpec_test.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index 622a754..b27b2b9 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -14,9 +14,14 @@ */ require_once 'libraries/common.lib.php'; +/** + * Test for PMA_extractFieldSpec function. + */ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase { /** + * Test case for parsing SHOW COLUNS output + * * @dataProvider provider */ public function testParsing($in, $out) @@ -24,6 +29,9 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase $this->assertEquals($out, PMA_extractFieldSpec($in)); } + /** + * Data provider + */ public function provider() { return array( hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12995-g822a863
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 822a863690f675e42ab3b5adabd560590d1db797 (commit) via b7b7fe392001ff56592c14eaf9f6d42fe467977a (commit) from d29cf3227dd8d2827f55b0661dfd505345f49df3 (commit) - Log ----------------------------------------------------------------- commit 822a863690f675e42ab3b5adabd560590d1db797 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:47:47 2011 +0200 Reintroduce mistakenly removed code commit b7b7fe392001ff56592c14eaf9f6d42fe467977a Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:46:45 2011 +0200 Properly handle special cases ----------------------------------------------------------------------- Summary of changes: libraries/export/htmlword.php | 5 ++++- libraries/export/latex.php | 4 ++++ libraries/export/odt.php | 11 ++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 5c7a84e..603729b 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -275,7 +275,10 @@ if (isset($plugin_list)) { $schema_insert = '<tr class="print-category">'; $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); - $type = $extracted_fieldspec['print_type']; + $type = htmlspecialchars($extracted_fieldspec['print_type']); + if (empty($type)) { + $type = ' '; + } if (! isset($column['Default'])) { if ($column['Null'] != 'NO') { diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 54ee504..72fe347 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -393,6 +393,10 @@ if (isset($plugin_list)) { foreach ($fields as $row) { $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); $type = $extracted_fieldspec['print_type']; + if (empty($type)) { + $type = ' '; + } + if (!isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 16867a6..2d17452 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -317,8 +317,17 @@ if (isset($plugin_list)) { $columns = PMA_DBI_get_columns($db, $table); foreach ($columns as $column) { + $field_name = $column['Field']; + $GLOBALS['odt_buffer'] .= '<table:table-row>'; + $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' + . '<text:p>' . htmlspecialchars($field_name) . '</text:p>' + . '</table:table-cell>'; + $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); - $type = $extracted_fieldspec['print_type']; + $type = htmlspecialchars($extracted_fieldspec['print_type']); + if (empty($type)) { + $type = ' '; + } $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' . '<text:p>' . htmlspecialchars($type) . '</text:p>' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12993-gd29cf32
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via d29cf3227dd8d2827f55b0661dfd505345f49df3 (commit) via 236eb052bc40450d6e45e3aa5d0c7933db2059a4 (commit) via 542738dd8807f6a3e01afd0286213f02e07406bb (commit) from 76fe197e4badaae7bd0dad905f5dd57815b61176 (commit) - Log ----------------------------------------------------------------- commit d29cf3227dd8d2827f55b0661dfd505345f49df3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:38:42 2011 +0200 Use PMA_extractFieldSpec instead of own code in export plugins commit 236eb052bc40450d6e45e3aa5d0c7933db2059a4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:36:23 2011 +0200 Use PMA_extractFieldSpec instead of own code commit 542738dd8807f6a3e01afd0286213f02e07406bb Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:33:34 2011 +0200 Export print_type and make it usable for set/enum as well ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 25 +++----------- libraries/common.lib.php | 20 ++++++------ libraries/export/htmlword.php | 34 +------------------ libraries/export/latex.php | 26 +-------------- libraries/export/odt.php | 31 +----------------- tbl_structure.php | 23 ++++++------- .../libraries/common/PMA_extractFieldSpec_test.php | 18 +++++----- 7 files changed, 41 insertions(+), 136 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 04a63df..1c46cbb 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -186,37 +186,24 @@ while ($row = PMA_DBI_fetch_row($rowset)) { if ($row['Null'] == '') { $row['Null'] = 'NO'; } - $type = $row['Type']; + $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); // reformat mysql query output // set or enum types: slashes single quotes inside options - if (preg_match('@^(set|enum)$(.+)$$@i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; + if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { $type_nowrap = ''; - $binary = 0; - $unsigned = 0; - $zerofill = 0; } else { - $binary = stristr($row['Type'], 'binary'); - $unsigned = stristr($row['Type'], 'unsigned'); - $zerofill = stristr($row['Type'], 'zerofill'); $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('@BINARY@i', '', $type); - $type = preg_replace('@ZEROFILL@i', '', $type); - $type = preg_replace('@UNSIGNED@i', '', $type); - if (empty($type)) { - $type = ' '; - } } + $type = htmlspecialchars($extracted_fieldspec['print_type']); $attribute = ' '; - if ($binary) { + if ($extracted_fieldspec['binary']) { $attribute = 'BINARY'; } - if ($unsigned) { + if ($extracted_fieldspec['unsigned']) { $attribute = 'UNSIGNED'; } - if ($zerofill) { + if ($extracted_fieldspec['zerofill']) { $attribute = 'UNSIGNED ZEROFILL'; } if (! isset($row['Default'])) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d566128..352446b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2624,29 +2624,29 @@ function PMA_extractFieldSpec($fieldspec) { // Increment character index $index++; } // end while - $shorttype = $type; + $printtype = $type . '(' . str_replace("','", "', '", $spec_in_brackets) . ')'; $binary = false; $unsigned = false; $zerofill = false; } else { $enum_set_values = array(); - /* Create short type name */ - $shorttype = strtolower($fieldspec); + /* Create printable type name */ + $printtype = strtolower($fieldspec); // strip the "BINARY" attribute, except if we find "BINARY(" because // this would be a BINARY or VARBINARY field type - if (!preg_match('@binary[\(]@', $shorttype)) { - $binary = strpos($shorttype, 'blob') !== false || strpos($shorttype, 'binary') !== false; - $shorttype = preg_replace('@binary@', '', $shorttype); + if (!preg_match('@binary[\(]@', $printtype)) { + $binary = strpos($printtype, 'blob') !== false || strpos($printtype, 'binary') !== false; + $printtype = preg_replace('@binary@', '', $printtype); } else { $binary = false; } - $shorttype = preg_replace('@zerofill@', '', $shorttype, -1, $zerofill_cnt); + $printtype = preg_replace('@zerofill@', '', $printtype, -1, $zerofill_cnt); $zerofill = ($zerofill_cnt > 0); - $shorttype = preg_replace('@unsigned@', '', $shorttype, -1, $unsigned_cnt); + $printtype = preg_replace('@unsigned@', '', $printtype, -1, $unsigned_cnt); $unsigned = ($unsigned_cnt > 0); - $shorttype = trim($shorttype); + $printtype = trim($printtype); } @@ -2654,7 +2654,7 @@ function PMA_extractFieldSpec($fieldspec) { 'type' => $type, 'spec_in_brackets' => $spec_in_brackets, 'enum_set_values' => $enum_set_values, - 'short_type' => $shorttype, + 'print_type' => $printtype, 'binary' => $binary, 'unsigned' => $unsigned, 'zerofill' => $zerofill, diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 707bc77..5c7a84e 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -273,40 +273,10 @@ if (isset($plugin_list)) { foreach ($columns as $column) { $schema_insert = '<tr class="print-category">'; - $type = $column['Type']; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - if (preg_match('/^(set|enum)$(.+)$$/i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('/BINARY/i', '', $type); - $type = preg_replace('/ZEROFILL/i', '', $type); - $type = preg_replace('/UNSIGNED/i', '', $type); - if (empty($type)) { - $type = ' '; - } - $binary = preg_match('/BINARY/i', $column['Type']); - $unsigned = preg_match('/UNSIGNED/i', $column['Type']); - $zerofill = preg_match('/ZEROFILL/i', $column['Type']); - } - $attribute = ' '; - if ($binary) { - $attribute = 'BINARY'; - } - if ($unsigned) { - $attribute = 'UNSIGNED'; - } - if ($zerofill) { - $attribute = 'UNSIGNED ZEROFILL'; - } + $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $type = $extracted_fieldspec['print_type']; + if (! isset($column['Default'])) { if ($column['Null'] != 'NO') { $column['Default'] = 'NULL'; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index cbf5141..54ee504 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -391,30 +391,8 @@ if (isset($plugin_list)) { $fields = PMA_DBI_get_columns($db, $table); foreach ($fields as $row) { - $type = $row['Type']; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - if (preg_match('/^(set|enum)$(.+)$$/i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('/BINARY/i', '', $type); - $type = preg_replace('/ZEROFILL/i', '', $type); - $type = preg_replace('/UNSIGNED/i', '', $type); - if (empty($type)) { - $type = ' '; - } - - $binary = preg_match('/BINARY/i', $row['Type']); - $unsigned = preg_match('/UNSIGNED/i', $row['Type']); - $zerofill = preg_match('/ZEROFILL/i', $row['Type']); - } + $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $type = $extracted_fieldspec['print_type']; if (!isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; diff --git a/libraries/export/odt.php b/libraries/export/odt.php index e02f8a6..16867a6 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -317,36 +317,9 @@ if (isset($plugin_list)) { $columns = PMA_DBI_get_columns($db, $table); foreach ($columns as $column) { + $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $type = $extracted_fieldspec['print_type']; - $field_name = $column['Field']; - $GLOBALS['odt_buffer'] .= '<table:table-row>'; - $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' - . '<text:p>' . htmlspecialchars($field_name) . '</text:p>' - . '</table:table-cell>'; - // reformat mysql query output - // set or enum types: slashes single quotes inside options - $type = $column['Type']; - if (preg_match('/^(set|enum)$(.+)$$/i', $type, $tmp)) { - $tmp[2] = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1); - $type = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; - $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; - } else { - $type_nowrap = ' nowrap="nowrap"'; - $type = preg_replace('/BINARY/i', '', $type); - $type = preg_replace('/ZEROFILL/i', '', $type); - $type = preg_replace('/UNSIGNED/i', '', $type); - if (empty($type)) { - $type = ' '; - } - - $binary = preg_match('/BINARY/i', $column['Type']); - $unsigned = preg_match('/UNSIGNED/i', $column['Type']); - $zerofill = preg_match('/ZEROFILL/i', $column['Type']); - } $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' . '<text:p>' . htmlspecialchars($type) . '</text:p>' . '</table:table-cell>'; diff --git a/tbl_structure.php b/tbl_structure.php index cce1d46..b104e79 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -250,22 +250,19 @@ foreach ($fields as $row) { $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { - $type = $extracted_fieldspec['type'] . '(' . - str_replace("','", "', '", $extracted_fieldspec['spec_in_brackets']) . ')'; - - // for the case ENUM('–','“') - $type = htmlspecialchars($type); - if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; - } - $type_nowrap = ''; } else { $type_nowrap = ' nowrap="nowrap"'; - $type = $extracted_fieldspec['short_type']; - if (empty($type)) { - $type = ' '; - } + } + $type = $extracted_fieldspec['print_type']; + if (empty($type)) { + $type = ' '; + } + // for the case ENUM('–','“') + $type = htmlspecialchars($type); + // in case it is too long + if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { + $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } unset($field_charset); diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index dc3c90d..622a754 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -28,26 +28,26 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase { return array( array( - "SET('a', 'b')", + "SET('a','b')", array( 'type' => 'set', - 'short_type' => 'set', + 'print_type' => "set('a', 'b')", 'binary' => false, 'unsigned' => false, 'zerofill' => false, - 'spec_in_brackets' => "'a', 'b'", + 'spec_in_brackets' => "'a','b'", 'enum_set_values' => array('a', 'b'), ), ), array( - "SET('\'a', 'b')", + "SET('\'a','b')", array( 'type' => 'set', - 'short_type' => 'set', + 'print_type' => "set('\'a', 'b')", 'binary' => false, 'unsigned' => false, 'zerofill' => false, - 'spec_in_brackets' => "'\'a', 'b'", + 'spec_in_brackets' => "'\'a','b'", 'enum_set_values' => array("'a", 'b'), ), ), @@ -55,7 +55,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase "INT UNSIGNED zerofill", array( 'type' => 'int unsigned zerofill', - 'short_type' => 'int', + 'print_type' => 'int', 'binary' => false, 'unsigned' => true, 'zerofill' => true, @@ -67,7 +67,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase "VARCHAR(255)", array( 'type' => 'varchar', - 'short_type' => 'varchar(255)', + 'print_type' => 'varchar(255)', 'binary' => false, 'unsigned' => false, 'zerofill' => false, @@ -79,7 +79,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase "VARBINARY(255)", array( 'type' => 'varbinary', - 'short_type' => 'varbinary(255)', + 'print_type' => 'varbinary(255)', 'binary' => false, 'unsigned' => false, 'zerofill' => false, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12990-g76fe197
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 76fe197e4badaae7bd0dad905f5dd57815b61176 (commit) via e86a65d0c2d0bcefec6b4eb15ca81578d0b7004e (commit) via 183c0f437b87d01e155602ed5a724b860465d7de (commit) via 5adf2fb35275ddcb4f64be39d4387928b931af89 (commit) via 57dcfb780a9076d11a1157aa2dc99391ce559d3f (commit) via b604a67c50bf720509e9d3cb26b9c54075a0951f (commit) via 04c5a81b8c9f7e58e459447eda4e1d820fc4399c (commit) via 42df62c050d4f6c186b78a8c0b641f13d2929d61 (commit) via 11acfe2651b59dd48a7248cefa7d1e8df03d60d3 (commit) via cbcde38db1d9c29f58bc86436f8b6f3bbe0717e8 (commit) via 1c356718eaa24f474d43f49c56412d6db79b08c4 (commit) via b231ab407281750ceecc759d748ad5842c9cca9e (commit) via c63474bde1864a01cc6ab307e3728bef5abeec44 (commit) via 398d5abbda60007eb1f291e78cee5c515eb686bf (commit) via bd526dd94e8aa77483a574d598255d73a7198bbe (commit) from 9fd0baaad28f987a12ab92e8036cfc035ad46908 (commit) - Log ----------------------------------------------------------------- commit 76fe197e4badaae7bd0dad905f5dd57815b61176 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:26:10 2011 +0200 Use PMA_DBI_get_columns commit e86a65d0c2d0bcefec6b4eb15ca81578d0b7004e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:26:03 2011 +0200 Whitespace cleanup commit 183c0f437b87d01e155602ed5a724b860465d7de Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:23:17 2011 +0200 Use PMA_DBI_get_columns commit 5adf2fb35275ddcb4f64be39d4387928b931af89 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:21:47 2011 +0200 Processing of varbinary fields commit 57dcfb780a9076d11a1157aa2dc99391ce559d3f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:20:04 2011 +0200 Fater processing - use preg_replace return value instead going through string again - use strpos instead of strstr, which is faster and consumes less memory according to PHP docs commit b604a67c50bf720509e9d3cb26b9c54075a0951f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:15:13 2011 +0200 Optimize matching - avoid calling twice same preg_match - do case sensitive match as we have the string in lower case commit 04c5a81b8c9f7e58e459447eda4e1d820fc4399c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:09:38 2011 +0200 Make short type also always lowercase commit 42df62c050d4f6c186b78a8c0b641f13d2929d61 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:09:17 2011 +0200 Make type lowercase everytime commit 11acfe2651b59dd48a7248cefa7d1e8df03d60d3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:08:34 2011 +0200 Add testcase for varchar commit cbcde38db1d9c29f58bc86436f8b6f3bbe0717e8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:07:13 2011 +0200 Add more testcases commit 1c356718eaa24f474d43f49c56412d6db79b08c4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 16:03:56 2011 +0200 Add test case for PMA_extractFieldSpec commit b231ab407281750ceecc759d748ad5842c9cca9e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:56:56 2011 +0200 Factor out some type matching commit c63474bde1864a01cc6ab307e3728bef5abeec44 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:47:07 2011 +0200 Use PMA_DBI_get_columns commit 398d5abbda60007eb1f291e78cee5c515eb686bf Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:43:07 2011 +0200 Use PMA_DBI_get_columns commit bd526dd94e8aa77483a574d598255d73a7198bbe Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:40:55 2011 +0200 Use PMA_DBI_get_columns ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 9 +- libraries/common.lib.php | 34 ++++++- tbl_operations.php | 11 +-- tbl_relation.php | 18 ++-- tbl_structure.php | 39 ++------- .../libraries/common/PMA_extractFieldSpec_test.php | 92 ++++++++++++++++++++ 6 files changed, 146 insertions(+), 57 deletions(-) create mode 100644 test/libraries/common/PMA_extractFieldSpec_test.php diff --git a/db_datadict.php b/db_datadict.php index 531fbe0..04a63df 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -119,8 +119,8 @@ while ($row = PMA_DBI_fetch_row($rowset)) { /** * Gets columns properties */ - $result = PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); - $fields_cnt = PMA_DBI_num_rows($result); + $columns = PMA_DBI_get_columns($db, $table); + $fields_cnt = count($columns); if (PMA_MYSQL_INT_VERSION < 50025) { // We need this to correctly learn if a TIMESTAMP is NOT NULL, since @@ -181,7 +181,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { </tr> <?php $odd_row = true; - while ($row = PMA_DBI_fetch_assoc($result)) { + foreach ($columns as $row) { if ($row['Null'] == '') { $row['Null'] = 'NO'; @@ -284,8 +284,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { ?> </tr> <?php - } // end while - PMA_DBI_free_result($result); + } // end foreach $count++; ?> </table> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index bdbd124..d566128 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2573,7 +2573,7 @@ function PMA_extractFieldSpec($fieldspec) { // convert to lowercase just to be sure $type = strtolower(chop(substr($fieldspec, 0, $first_bracket_pos))); } else { - $type = $fieldspec; + $type = strtolower($fieldspec); $spec_in_brackets = ''; } @@ -2624,14 +2624,40 @@ function PMA_extractFieldSpec($fieldspec) { // Increment character index $index++; } // end while + $shorttype = $type; + $binary = false; + $unsigned = false; + $zerofill = false; } else { $enum_set_values = array(); + + /* Create short type name */ + $shorttype = strtolower($fieldspec); + + // strip the "BINARY" attribute, except if we find "BINARY(" because + // this would be a BINARY or VARBINARY field type + if (!preg_match('@binary[\(]@', $shorttype)) { + $binary = strpos($shorttype, 'blob') !== false || strpos($shorttype, 'binary') !== false; + $shorttype = preg_replace('@binary@', '', $shorttype); + } else { + $binary = false; + } + $shorttype = preg_replace('@zerofill@', '', $shorttype, -1, $zerofill_cnt); + $zerofill = ($zerofill_cnt > 0); + $shorttype = preg_replace('@unsigned@', '', $shorttype, -1, $unsigned_cnt); + $unsigned = ($unsigned_cnt > 0); + $shorttype = trim($shorttype); + } return array( 'type' => $type, 'spec_in_brackets' => $spec_in_brackets, - 'enum_set_values' => $enum_set_values + 'enum_set_values' => $enum_set_values, + 'short_type' => $shorttype, + 'binary' => $binary, + 'unsigned' => $unsigned, + 'zerofill' => $zerofill, ); } @@ -2756,9 +2782,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { /* Fetch fields list if required */ if (strpos($string, '@FIELDS@') !== false) { - $fields_list = PMA_DBI_fetch_result( - 'SHOW COLUMNS FROM ' . PMA_backquote($GLOBALS['db']) - . '.' . PMA_backquote($GLOBALS['table'])); + $fields_list = PMA_DBI_get_columns($GLOBALS['db'], $GLOBALS['table']); $field_names = array(); foreach ($fields_list as $field) { diff --git a/tbl_operations.php b/tbl_operations.php index 3e9bdeb..a5a9eef 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -254,12 +254,7 @@ $url_params['back'] = 'tbl_operations.php'; /** * Get columns names */ -$local_query = ' - SHOW COLUMNS - FROM ' . PMA_backquote($GLOBALS['table']) . ' - FROM ' . PMA_backquote($GLOBALS['db']); -$columns = PMA_DBI_fetch_result($local_query, null, 'Field'); -unset($local_query); +$columns = PMA_DBI_get_columns($GLOBALS['db'], $GLOBALS['table']); /** * Displays the page @@ -274,8 +269,8 @@ unset($local_query); <select name="order_field"> <?php foreach ($columns as $fieldname) { - echo ' <option value="' . htmlspecialchars($fieldname) . '">' - . htmlspecialchars($fieldname) . '</option>' . "\n"; + echo ' <option value="' . htmlspecialchars($fieldname['Field']) . '">' + . htmlspecialchars($fieldname['Field']) . '</option>' . "\n"; } unset($columns); ?> diff --git a/tbl_relation.php b/tbl_relation.php index e204c80..dcaf323 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -72,9 +72,9 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele } /** - * Split a string on backquote pairs + * Split a string on backquote pairs * - * @param string original string + * @param string original string * @return array containing the elements (and their surrounding backquotes) * * @access public @@ -97,7 +97,7 @@ function PMA_backquote_split($text) } $elements[] = substr($text, $first_backquote, $second_backquote - $first_backquote + 1); $pos = $second_backquote + 1; - } + } return($elements); } @@ -376,7 +376,7 @@ if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { && isset($curr_table[1]) && strtoupper($curr_table[1]) == $tbl_type) { // explicitely ask for non-quoted list of indexed columns - // need to obtain backquoted values to support dots inside values + // need to obtain backquoted values to support dots inside values $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns($backquoted = true)); } } // end while over tables @@ -384,10 +384,10 @@ if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { // Now find out the columns of our $table // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli -$col_rs = PMA_DBI_try_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); +$columns = PMA_DBI_get_columns($db, $table); -if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { - while ($row = PMA_DBI_fetch_assoc($col_rs)) { +if (count($columns) > 0) { + foreach($columns as $row) { $save_row[] = $row; } $saved_row_cnt = count($save_row); @@ -506,9 +506,9 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { </span> <span class="formelement"> <?php - // For ON DELETE and ON UPDATE, the default action + // For ON DELETE and ON UPDATE, the default action // is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE - // won't display the clause if it's set as RESTRICT. + // won't display the clause if it's set as RESTRICT. PMA_generate_dropdown('ON DELETE', 'on_delete[' . $myfield_md5 . ']', $options_array, diff --git a/tbl_structure.php b/tbl_structure.php index 77e9b39..cce1d46 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -123,10 +123,8 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) { unset($index, $columns, $column_name, $dummy); // 3. Get fields -$fields_rs = PMA_DRIZZLE - ? PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE) - : PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); -$fields_cnt = PMA_DBI_num_rows($fields_rs); +$fields = PMA_DBI_get_columns($db, $table, !PMA_DRIZZLE); +$fields_cnt = count($fields); // Get more complete field information // For now, this is done just for MySQL 4.1.2+ new TIMESTAMP options @@ -243,7 +241,7 @@ $aryFields = array(); $checked = (!empty($checkall) ? ' checked="checked"' : ''); $save_row = array(); $odd_row = true; -while ($row = PMA_DBI_fetch_assoc($fields_rs)) { +foreach ($fields as $row) { $save_row[] = $row; $rownum++; $aryFields[] = $row['Field']; @@ -262,31 +260,12 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } $type_nowrap = ''; - - $binary = 0; - $unsigned = 0; - $zerofill = 0; } else { $type_nowrap = ' nowrap="nowrap"'; - // strip the "BINARY" attribute, except if we find "BINARY(" because - // this would be a BINARY or VARBINARY field type - if (!preg_match('@BINARY[\(]@i', $type)) { - $type = preg_replace('@BINARY@i', '', $type); - } - $type = preg_replace('@ZEROFILL@i', '', $type); - $type = preg_replace('@UNSIGNED@i', '', $type); + $type = $extracted_fieldspec['short_type']; if (empty($type)) { $type = ' '; } - - if (!preg_match('@BINARY[\(]@i', $row['Type'])) { - $binary = stristr($row['Type'], 'blob') || stristr($row['Type'], 'binary'); - } else { - $binary = false; - } - - $unsigned = stristr($row['Type'], 'unsigned'); - $zerofill = stristr($row['Type'], 'zerofill'); } unset($field_charset); @@ -298,7 +277,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { || substr($type, 0, 8) == 'longtext' || substr($type, 0, 3) == 'set' || substr($type, 0, 4) == 'enum' - ) && !$binary) { + ) && !$extracted_fieldspec['binary']) { if (strpos($type, ' character set ')) { $type = substr($type, 0, strpos($type, ' character set ')); } @@ -319,13 +298,13 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } $attribute = ' '; - if ($binary) { + if ($extracted_fieldspec['binary']) { $attribute = 'BINARY'; } - if ($unsigned) { + if ($extracted_fieldspec['unsigned']) { $attribute = 'UNSIGNED'; } - if ($zerofill) { + if ($extracted_fieldspec['zerofill']) { $attribute = 'UNSIGNED ZEROFILL'; } @@ -575,7 +554,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </tr> <?php unset($field_charset); -} // end while +} // end foreach echo '</tbody>' . "\n" .'</table>' . "\n"; diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php new file mode 100644 index 0000000..dc3c90d --- /dev/null +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -0,0 +1,92 @@ + +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_checkParameters from common.lib.php + * + * @package phpMyAdmin-test + * @version $Id: PMA_checkParameters_test.php + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; + +class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase +{ + /** + * @dataProvider provider + */ + public function testParsing($in, $out) + { + $this->assertEquals($out, PMA_extractFieldSpec($in)); + } + + public function provider() + { + return array( + array( + "SET('a', 'b')", + array( + 'type' => 'set', + 'short_type' => 'set', + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => "'a', 'b'", + 'enum_set_values' => array('a', 'b'), + ), + ), + array( + "SET('\'a', 'b')", + array( + 'type' => 'set', + 'short_type' => 'set', + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => "'\'a', 'b'", + 'enum_set_values' => array("'a", 'b'), + ), + ), + array( + "INT UNSIGNED zerofill", + array( + 'type' => 'int unsigned zerofill', + 'short_type' => 'int', + 'binary' => false, + 'unsigned' => true, + 'zerofill' => true, + 'spec_in_brackets' => '', + 'enum_set_values' => array(), + ), + ), + array( + "VARCHAR(255)", + array( + 'type' => 'varchar', + 'short_type' => 'varchar(255)', + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => '255', + 'enum_set_values' => array(), + ), + ), + array( + "VARBINARY(255)", + array( + 'type' => 'varbinary', + 'short_type' => 'varbinary(255)', + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => '255', + 'enum_set_values' => array(), + ), + ), + ); + } +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12975-g9fd0baaa
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 9fd0baaad28f987a12ab92e8036cfc035ad46908 (commit) from 5e2a467f6feb540428ea8846434334578d54fe84 (commit) - Log ----------------------------------------------------------------- commit 9fd0baaad28f987a12ab92e8036cfc035ad46908 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:38:13 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 4eb1819..4490a2c 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -847,7 +847,7 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) return $fields; } - /** +/** * returns value of given mysql server variable * * @param string $var mysql server variable name hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12974-g5e2a467
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 5e2a467f6feb540428ea8846434334578d54fe84 (commit) via 1045c8f08568133d090cb8894faa56574df5afec (commit) from c3f8dd92502620f368ee4f18876fae3785f9c1b8 (commit) - Log ----------------------------------------------------------------- commit 5e2a467f6feb540428ea8846434334578d54fe84 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:30:02 2011 +0200 $GLOBALS[use_backquotes] is apparently not set anywhere commit 1045c8f08568133d090cb8894faa56574df5afec Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:28:02 2011 +0200 Wrap export options ----------------------------------------------------------------------- Summary of changes: libraries/export/latex.php | 2 +- libraries/export/xml.php | 66 +++++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 1c6064a..cbf5141 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -148,7 +148,7 @@ if (isset($plugin_list)) { function PMA_exportDBHeader($db) { global $crlf; $head = '% ' . $crlf - . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf + . '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf . '% ' . $crlf; return PMA_exportOutputHandler($head); } diff --git a/libraries/export/xml.php b/libraries/export/xml.php index b55d1e9..216055c 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -26,26 +26,54 @@ if (isset($plugin_list)) { ); /* Export structure */ - $plugin_list['xml']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options (all are recommended)')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_functions', 'text' => __('Functions')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_procedures', 'text' => __('Procedures')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_tables', 'text' => __('Tables')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_triggers', 'text' => __('Triggers')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_views', 'text' => __('Views')); - $plugin_list['xml']['options'][] = array('type' => 'end_group'); + $plugin_list['xml']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'structure', + 'text' => __('Object creation options (all are recommended)') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_functions', + 'text' => __('Functions') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_procedures', + 'text' => __('Procedures') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_tables', + 'text' => __('Tables') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_triggers', + 'text' => __('Triggers') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_views', + 'text' => __('Views') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'end_group' + ); /* Data */ - $plugin_list['xml']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options')); - $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_contents', 'text' => __('Export contents')); - $plugin_list['xml']['options'][] = array('type' => 'end_group'); + $plugin_list['xml']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'data', + 'text' => __('Data dump options') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'bool', + 'name' => 'export_contents', + 'text' => __('Export contents') + ); + $plugin_list['xml']['options'][] = array( + 'type' => 'end_group' + ); } else { /** @@ -243,7 +271,7 @@ if (isset($plugin_list)) { if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $head = ' ' . $crlf . ' <database name="' . htmlspecialchars($db) . '">' . $crlf; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12972-gc3f8dd9
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via c3f8dd92502620f368ee4f18876fae3785f9c1b8 (commit) from 1d687ef960ea91c35772946c0297f6e632ad1da7 (commit) - Log ----------------------------------------------------------------- commit c3f8dd92502620f368ee4f18876fae3785f9c1b8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:25:26 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: file_echo.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/file_echo.php b/file_echo.php index 2756209..58ff86b 100644 --- a/file_echo.php +++ b/file_echo.php @@ -41,7 +41,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { /* Decode data */ if ($extension != 'svg') { - $data = substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1); + $data = substr($_REQUEST['image'], strpos($_REQUEST['image'], ',') + 1); $data = base64_decode($data); } else { $data = $_REQUEST['image']; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12971-g1d687ef
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 1d687ef960ea91c35772946c0297f6e632ad1da7 (commit) from ff074b1d2f984b0467e8424110caee9769ff4c89 (commit) - Log ----------------------------------------------------------------- commit 1d687ef960ea91c35772946c0297f6e632ad1da7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:21:59 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: tbl_get_field.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tbl_get_field.php b/tbl_get_field.php index f7efd4f..b636c46 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -40,6 +40,7 @@ if ($result === false) { PMA_download_header( $table . '-' . $transform_key . '.bin', PMA_detectMIME($result), - strlen($result)); + strlen($result) + ); echo $result; ?> hooks/post-receive -- phpMyAdmin

1 0