- Git - lists.phpmyadmin.net

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

04 Aug '11

The branch, master has been updated via c8a147c4eed04c4d344aa9e45acce7411d2a5603 (commit) via 9a938ed9867317474ae4bb63a17270c34040d2b5 (commit) from 872ddd034ff325e88caef9b8863bc5fa49734456 (commit) - Log ----------------------------------------------------------------- commit c8a147c4eed04c4d344aa9e45acce7411d2a5603 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:44:36 2011 +0200 Fix typo commit 9a938ed9867317474ae4bb63a17270c34040d2b5 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:44:22 2011 +0200 Fix comments ----------------------------------------------------------------------- Summary of changes: file_echo.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/file_echo.php b/file_echo.php index 58ff86b..5e92cb7 100644 --- a/file_echo.php +++ b/file_echo.php @@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $valid_match = '/^[^\n\r]*\.' . $extension . '$/'; if (! preg_match($valid_match, $_REQUEST['filename'])) { if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { - /* Add extension */ - $filename = 'dowload.' . $extension; - } else { /* Filename is unsafe, discard it */ + $filename = 'download.' . $extension; + } else { + /* Add extension */ $filename = $_REQUEST['filename'] . '.' . $extension; } } else { hooks/post-receive -- phpMyAdmin

1 0

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

04 Aug '11

The branch, master has been updated via 872ddd034ff325e88caef9b8863bc5fa49734456 (commit) from 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f (commit) - Log ----------------------------------------------------------------- commit 872ddd034ff325e88caef9b8863bc5fa49734456 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:43:29 2011 +0200 Fix comments ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index c2b4f4d..748ddfe 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings with escaping * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13010-g46cd0d6
by Dieter Adriaenssens 04 Aug '11

04 Aug '11

The branch, master has been updated via 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f (commit) from d1f124492ff0235ed1b23c26d3da52829b2fbc57 (commit) - Log ----------------------------------------------------------------- commit 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 4 19:24:15 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 4b3e176..c2b4f4d 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13009-gd1f1244
by Dieter Adriaenssens 04 Aug '11

04 Aug '11

The branch, master has been updated via d1f124492ff0235ed1b23c26d3da52829b2fbc57 (commit) from 4c62a5fed6efe79b9ab9c667458d365058a914dc (commit) - Log ----------------------------------------------------------------- commit d1f124492ff0235ed1b23c26d3da52829b2fbc57 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 4 19:20:23 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_extractFieldSpec_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index d87fdbc..ab789f4 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -19,7 +19,7 @@ require_once 'libraries/common.lib.php'; class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase { /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

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

04 Aug '11

The branch, master has been updated via 4c62a5fed6efe79b9ab9c667458d365058a914dc (commit) from fcb5b16adf5703079792db8f32ea30150b896951 (commit) - Log ----------------------------------------------------------------- commit 4c62a5fed6efe79b9ab9c667458d365058a914dc Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:41:30 2011 +0200 Another typo ----------------------------------------------------------------------- Summary of changes: libraries/export/texytext.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 565907e..d24a8b2 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -259,7 +259,7 @@ if (isset($plugin_list)) { $type = ' '; } - $attribute = $extracted_fieldspec['attribute'] + $attribute = $extracted_fieldspec['attribute']; if (! isset($column['Default'])) { if ($column['Null'] != 'NO') { hooks/post-receive -- phpMyAdmin

1 0

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

04 Aug '11

The branch, master has been updated via fcb5b16adf5703079792db8f32ea30150b896951 (commit) from d4c9e4135e6497d24e9b3d1070f649ae196f8ead (commit) - Log ----------------------------------------------------------------- commit fcb5b16adf5703079792db8f32ea30150b896951 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:37:39 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 86b4b80..acfb531 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -196,7 +196,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $type_nowrap = ' nowrap="nowrap"'; } $type = htmlspecialchars($extracted_fieldspec['print_type']); - $attribute = $extracted_fieldspec['attribute'] + $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = '<i>NULL</i>'; hooks/post-receive -- phpMyAdmin

1 0

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

04 Aug '11

The branch, master has been updated via d4c9e4135e6497d24e9b3d1070f649ae196f8ead (commit) via 85eb9c74a11279c31ec1a6b54b67f05679d8c119 (commit) from 22b46564e106dbc8aede393466b21eecc321883d (commit) - Log ----------------------------------------------------------------- commit d4c9e4135e6497d24e9b3d1070f649ae196f8ead Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:32:18 2011 +0200 Fix comments commit 85eb9c74a11279c31ec1a6b54b67f05679d8c119 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:31:55 2011 +0200 Add testcase for PMA_expandUserString ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 74 ++++++++++++++++++++ .../libraries/common/PMA_extractFieldSpec_test.php | 3 +- 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 test/libraries/common/PMA_expandUserString_test.php diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php new file mode 100644 index 0000000..4b3e176 --- /dev/null +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -0,0 +1,74 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_expandUserString from common.lib.php + * + * @package phpMyAdmin-test + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/core.lib.php'; +require_once 'libraries/common.lib.php'; + +if (!defined('PMA_VERSION')) { + define('PMA_VERSION', 'TEST'); +} + +/** + * Test for PMA_expandUserString function. + */ +class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase +{ + + /** + * Setup variables needed by test. + */ + public function setup() + { + $GLOBALS['cfg'] = array( + 'Server' => array( + 'host' => 'host&', + 'verbose' => 'verbose', + )); + $GLOBALS['db'] = 'database'; + $GLOBALS['table'] = 'table'; + } + + /** + * Test case for parsing SHOW COLUNS output + * + * @dataProvider provider + */ + public function testExpand($in, $out) + { + $this->assertEquals($out, PMA_expandUserString($in)); + } + + /** + * Test case for parsing SHOW COLUNS output + * + * @dataProvider provider + */ + public function testExpandEscape($in, $out) + { + $this->assertEquals(htmlspecialchars($out), PMA_expandUserString($in, 'htmlspecialchars')); + } + + /** + * Data provider + */ + public function provider() + { + return array( + array('@SERVER@', 'host&'), + array('@VSERVER@', 'verbose'), + array('@DATABASE@', 'database'), + array('@TABLE@', 'table'), + array('@IGNORE@', '@IGNORE@'), + array('@PHPMYADMIN@', 'phpMyAdmin ' . PMA_VERSION), + ); + } +} diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index ecb9bd0..d87fdbc 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -2,10 +2,9 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_checkParameters from common.lib.php + * Test for PMA_extractFieldSpec from common.lib.php * * @package phpMyAdmin-test - * @version $Id: PMA_checkParameters_test.php * @group common.lib-tests */ hooks/post-receive -- phpMyAdmin

1 0

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

04 Aug '11

The branch, master has been updated via 22b46564e106dbc8aede393466b21eecc321883d (commit) from 416277f3980f1bb56a513a106d28dbf4c902dee6 (commit) - Log ----------------------------------------------------------------- commit 22b46564e106dbc8aede393466b21eecc321883d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:21:51 2011 +0200 Add testcase for another way of escaping ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_extractFieldSpec_test.php | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index 9aa337d..ecb9bd0 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -62,6 +62,19 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase ), ), array( + "SET('''a','b')", + array( + 'type' => 'set', + 'print_type' => "set('''a', 'b')", + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => "'''a','b'", + 'enum_set_values' => array("'a", 'b'), + 'attribute' => ' ', + ), + ), + array( "INT UNSIGNED zerofill", array( 'type' => 'int unsigned zerofill', hooks/post-receive -- phpMyAdmin

1 0

[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