From 1c58314c53bb9590b5112355b486d41026aeb2f2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 21 Apr 2012 14:40:08 -0400 Subject: [PATCH] Clarify function name --- db_datadict.php | 2 +- libraries/common.lib.php | 2 +- libraries/export/htmlword.php | 4 ++-- libraries/export/latex.php | 2 +- libraries/export/odt.php | 4 ++-- libraries/export/texytext.php | 4 ++-- libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/tbl_properties.inc.php | 2 +- tbl_change.php | 2 +- tbl_printview.php | 2 +- tbl_structure.php | 2 +- tbl_tracking.php | 2 +- ...tFieldSpec_test.php => PMA_extractColumnSpec_test.php} | 8 ++++---- 13 files changed, 19 insertions(+), 19 deletions(-) rename test/libraries/common/{PMA_extractFieldSpec_test.php => PMA_extractColumnSpec_test.php} (93%) diff --git a/db_datadict.php b/db_datadict.php index c4ff0eabd2..65afabbd94 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -183,7 +183,7 @@ foreach ($tables as $table) { if ($row['Null'] == '') { $row['Null'] = 'NO'; } - $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($row['Type']); // reformat mysql query output // set or enum types: slashes single quotes inside options if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c981e1fff5..f0867fb379 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2915,7 +2915,7 @@ function PMA_convert_bit_default_value($bit_default_value) * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ -function PMA_extractFieldSpec($fieldspec) +function PMA_extractColumnSpec($fieldspec) { $first_bracket_pos = strpos($fieldspec, '('); if ($first_bracket_pos) { diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index c93d10b7a5..6febd98eb7 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -202,7 +202,7 @@ if (isset($plugin_list)) { foreach ($columns as $column) { $schema_insert .= ''; - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = htmlspecialchars($extracted_fieldspec['print_type']); if (empty($type)) { $type = ' '; @@ -333,7 +333,7 @@ if (isset($plugin_list)) { $schema_insert .= ''; - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = htmlspecialchars($extracted_fieldspec['print_type']); if (empty($type)) { $type = ' '; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 5963974d69..d21f63efb9 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -442,7 +442,7 @@ if (isset($plugin_list)) { $fields = PMA_DBI_get_columns($db, $table); foreach ($fields as $row) { - $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($row['Type']); $type = $extracted_fieldspec['print_type']; if (empty($type)) { $type = ' '; diff --git a/libraries/export/odt.php b/libraries/export/odt.php index b1c92a451e..a40dde4280 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -277,7 +277,7 @@ if (isset($plugin_list)) { . '' . htmlspecialchars($field_name) . '' . ''; - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = htmlspecialchars($extracted_fieldspec['print_type']); if (empty($type)) { $type = ' '; @@ -422,7 +422,7 @@ if (isset($plugin_list)) { . '' . htmlspecialchars($field_name) . '' . ''; - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = htmlspecialchars($extracted_fieldspec['print_type']); if (empty($type)) { $type = ' '; diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 21906d8eda..f0677483b8 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -201,7 +201,7 @@ if (isset($plugin_list)) { $columns = PMA_DBI_get_columns($db, $table); foreach ($columns as $column) { - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = $extracted_fieldspec['print_type']; if (empty($type)) { $type = ' '; @@ -330,7 +330,7 @@ if (isset($plugin_list)) { $columns = PMA_DBI_get_columns($db, $table); foreach ($columns as $column) { - $extracted_fieldspec = PMA_extractFieldSpec($column['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($column['Type']); $type = $extracted_fieldspec['print_type']; if (empty($type)) { $type = ' '; diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index c0df0df964..2c704c3270 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -1340,7 +1340,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetFont($this->_ff, ''); foreach ($columns as $row) { - $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($row['Type']); $type = $extracted_fieldspec['print_type']; $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 90aa6bfca4..344c3d6558 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -241,7 +241,7 @@ for ($i = 0; $i < $num_fields; $i++) { } if (isset($row['Type'])) { - $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($row['Type']); if ($extracted_fieldspec['type'] == 'bit') { $row['Default'] = PMA_convert_bit_default_value($row['Default']); } diff --git a/tbl_change.php b/tbl_change.php index 6c4de15f89..1cddf4cf3e 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -484,7 +484,7 @@ foreach ($rows as $row_id => $vrow) { } } $field = $table_fields[$i]; - $extracted_fieldspec = PMA_extractFieldSpec($field['Type']); + $extracted_fieldspec = PMA_extractColumnSpec($field['Type']); if (-1 === $field['len']) { $field['len'] = PMA_DBI_field_len($vresult, $i); diff --git a/tbl_printview.php b/tbl_printview.php index 6d7b62cdc9..1a64f3ea5a 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -152,7 +152,7 @@ foreach ($the_tables as $key => $table) { assertEquals($out, PMA_extractFieldSpec($in)); + $this->assertEquals($out, PMA_extractColumnSpec($in)); } /**