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

PMA_DBI_get_columns_full --> PMA_DBI_getColumnsFull

Browse Source
This commit is contained in:
Kasun Chathuranga 2013-04-30 23:33:00 +05:30
parent ecb1e4f038
commit 2becd65b1d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_datadict.php
View File

@ -218,7 +218,7 @@ foreach ($tables as $table) {
// the latter.
/**
* @todo merge this logic with the one in tbl_structure.php
* or move it in a function similar to PMA_DBI_get_columns_full()
* or move it in a function similar to PMA_DBI_getColumnsFull()
* but based on SHOW CREATE TABLE because information_schema
* cannot be trusted in this case (MySQL bug)
*/

6
libraries/database_interface.lib.php
View File

@ -1041,7 +1041,7 @@ function PMA_DBI_getDatabasesFull($database = null, $force_stats = false,
*
* @return array
*/
function PMA_DBI_get_columns_full($database = null, $table = null,
function PMA_DBI_getColumnsFull($database = null, $table = null,
$column = null, $link = null
) {
$columns = array();
@ -1124,7 +1124,7 @@ function PMA_DBI_get_columns_full($database = null, $table = null,
} else {
if (null === $database) {
foreach ($GLOBALS['pma']->databases as $database) {
$columns[$database] = PMA_DBI_get_columns_full(
$columns[$database] = PMA_DBI_getColumnsFull(
$database, null, null, $link
);
}
@ -1132,7 +1132,7 @@ function PMA_DBI_get_columns_full($database = null, $table = null,
} elseif (null === $table) {
$tables = PMA_DBI_getTables($database);
foreach ($tables as $table) {
$columns[$table] = PMA_DBI_get_columns_full(
$columns[$table] = PMA_DBI_getColumnsFull(
$database, $table, null, $link
);
}

2
libraries/plugins/export/ExportSql.class.php
View File

@ -857,7 +857,7 @@ class ExportSql extends ExportPlugin
}
$create_query .= PMA_Util::backquote($view) . ' (' . $crlf;
$tmp = array();
$columns = PMA_DBI_get_columns_full($db, $view);
$columns = PMA_DBI_getColumnsFull($db, $view);
foreach ($columns as $column_name => $definition) {
$tmp[] = PMA_Util::backquote($column_name) . ' ' .
$definition['Type'] . $crlf;

2
libraries/structure.lib.php
View File

@ -2421,7 +2421,7 @@ function PMA_moveColumns($db, $table)
/*
* load the definitions for all columns
*/
$columns = PMA_DBI_get_columns_full($db, $table);
$columns = PMA_DBI_getColumnsFull($db, $table);
$column_names = array_keys($columns);
$changes = array();
$we_dont_change_keys = array();

2
tbl_indexes.php
View File

@ -15,7 +15,7 @@ require_once 'libraries/tbl_common.inc.php';
// Get fields and stores their name/type
$fields = array();
foreach (PMA_DBI_get_columns_full($db, $table) as $row) {
foreach (PMA_DBI_getColumnsFull($db, $table) as $row) {
if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
$tmp[2] = substr(
preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1

2
tbl_printview.php
View File

@ -160,7 +160,7 @@ foreach ($the_tables as $key => $table) {
// the latter.
/**
* @todo merge this logic with the one in tbl_structure.php
* or move it in a function similar to PMA_DBI_get_columns_full()
* or move it in a function similar to PMA_DBI_getColumnsFull()
* but based on SHOW CREATE TABLE because information_schema
* cannot be trusted in this case (MySQL bug)
*/