From 2becd65b1d0074e8e1409baec559e2a124f488ec Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Tue, 30 Apr 2013 23:33:00 +0530
Subject: [PATCH] PMA_DBI_get_columns_full --> PMA_DBI_getColumnsFull

---
 db_datadict.php                              | 2 +-
 libraries/database_interface.lib.php         | 6 +++---
 libraries/plugins/export/ExportSql.class.php | 2 +-
 libraries/structure.lib.php                  | 2 +-
 tbl_indexes.php                              | 2 +-
 tbl_printview.php                            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db_datadict.php b/db_datadict.php
index 110574a019..bda817acbb 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -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)
              */
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 127d595190..a7fa139fa3 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -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
                 );
             }
diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index 1e6a4ff1cf..0ed4a65f36 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -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;
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 47d716141e..de20b6769d 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -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();
diff --git a/tbl_indexes.php b/tbl_indexes.php
index a778814c32..e6eb4b32ab 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -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
diff --git a/tbl_printview.php b/tbl_printview.php
index 78bb961015..c1685fe0b2 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -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)
          */