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

Clarify function name

Browse Source
This commit is contained in:
Marc Delisle 2012-04-21 14:40:08 -04:00
parent 06f153b4b1
commit 1c58314c53
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_datadict.php
View File

@ -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']) {

2
libraries/common.lib.php
View File

@ -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) {

4
libraries/export/htmlword.php
View File

@ -202,7 +202,7 @@ if (isset($plugin_list)) {
foreach ($columns as $column) {
$schema_insert .= '<tr class="print-category">';
$extracted_fieldspec = PMA_extractFieldSpec($column['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($column['Type']);
$type = htmlspecialchars($extracted_fieldspec['print_type']);
if (empty($type)) {
$type = '&nbsp;';
@ -333,7 +333,7 @@ if (isset($plugin_list)) {
$schema_insert .= '<tr class="print-category">';
$extracted_fieldspec = PMA_extractFieldSpec($column['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($column['Type']);
$type = htmlspecialchars($extracted_fieldspec['print_type']);
if (empty($type)) {
$type = '&nbsp;';

2
libraries/export/latex.php
View File

@ -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 = ' ';

4
libraries/export/odt.php
View File

@ -277,7 +277,7 @@ if (isset($plugin_list)) {
. '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
. '</table:table-cell>';
$extracted_fieldspec = PMA_extractFieldSpec($column['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($column['Type']);
$type = htmlspecialchars($extracted_fieldspec['print_type']);
if (empty($type)) {
$type = '&nbsp;';
@ -422,7 +422,7 @@ if (isset($plugin_list)) {
. '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
. '</table:table-cell>';
$extracted_fieldspec = PMA_extractFieldSpec($column['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($column['Type']);
$type = htmlspecialchars($extracted_fieldspec['print_type']);
if (empty($type)) {
$type = '&nbsp;';

4
libraries/export/texytext.php
View File

@ -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 = '&nbsp;';
@ -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 = '&nbsp;';

2
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -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'])) {

2
libraries/tbl_properties.inc.php
View File

@ -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']);
}

2
tbl_change.php
View File

@ -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);

2
tbl_printview.php
View File

@ -152,7 +152,7 @@ foreach ($the_tables as $key => $table) {
<tbody>
<?php
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'];

2
tbl_structure.php
View File

@ -256,7 +256,7 @@ foreach ($fields as $row) {
$aryFields[] = $row['Field'];
$type = $row['Type'];
$extracted_fieldspec = PMA_extractFieldSpec($row['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($row['Type']);
if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) {
$type_nowrap = '';

2
tbl_tracking.php
View File

@ -300,7 +300,7 @@ if (isset($_REQUEST['snapshot'])) {
<td><?php echo (($field['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>
<td><?php
if (isset($field['Default'])) {
$extracted_fieldspec = PMA_extractFieldSpec($field['Type']);
$extracted_fieldspec = PMA_extractColumnSpec($field['Type']);
if ($extracted_fieldspec['type'] == 'bit') {
// here, $field['Default'] contains something like b'010'
echo PMA_convert_bit_default_value($field['Default']);

8
test/libraries/common/PMA_extractFieldSpec_test.php → test/libraries/common/PMA_extractColumnSpec_test.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_extractFieldSpec from common.lib.php
* Test for PMA_extractColumnSpec from common.lib.php
*
* @package PhpMyAdmin-test
* @group common.lib-tests
@ -13,9 +13,9 @@
require_once 'libraries/common.lib.php';
/**
* Test for PMA_extractFieldSpec function.
* Test for PMA_extractColumnSpec function.
*/
class PMA_extractFieldSpec_test extends PHPUnit_Framework_TestCase
class PMA_extractColumnSpec_test extends PHPUnit_Framework_TestCase
{
/**
* Test case for parsing SHOW COLUMNS output
@ -24,7 +24,7 @@ class PMA_extractFieldSpec_test extends PHPUnit_Framework_TestCase
*/
public function testParsing($in, $out)
{
$this->assertEquals($out, PMA_extractFieldSpec($in));
$this->assertEquals($out, PMA_extractColumnSpec($in));
}
/**