[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-9113-g1b56916

[Michal Čihař]

The branch, master has been updated
       via  1b5691656ef67e5f07c5e218f2dacc6d36ae0a77 (commit)
      from  f48846cbc048641c59805a2cbe11b17f76fc2119 (commit)


- Log -----------------------------------------------------------------
commit 1b5691656ef67e5f07c5e218f2dacc6d36ae0a77
Author: Michal Čihař <mci...@suse.cz>
Date:   Mon Jul 18 10:27:50 2011 +0200

    Use PMA_DBI_get_columns instead of own query

-----------------------------------------------------------------------

Summary of changes:
 libraries/export/htmlword.php |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index e662cfb..ddc18ac 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -213,9 +213,6 @@ function PMA_exportStructure($db, $table, $crlf, 
$error_url, $do_relation = fals
      * Gets fields properties
      */
     PMA_DBI_select_db($db);
-    $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($db) . '.' . 
PMA_backquote($table);
-    $result      = PMA_DBI_query($local_query);
-    $fields_cnt  = PMA_DBI_num_rows($result);
 
     // Check if we can use Relations
     if ($do_relation && ! empty($cfgRelation['relation'])) {
@@ -272,10 +269,11 @@ function PMA_exportStructure($db, $table, $crlf, 
$error_url, $do_relation = fals
         return false;
     }
 
-    while ($row = PMA_DBI_fetch_assoc($result)) {
+    $columns = PMA_DBI_get_columns($db, $table);
+    foreach ($columns as $column) {
 
         $schema_insert = '<tr class="print-category">';
-        $type          = $row['Type'];
+        $type          = $column['Type'];
         // reformat mysql query output
         // set or enum types: slashes single quotes inside options
         if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
@@ -295,9 +293,9 @@ function PMA_exportStructure($db, $table, $crlf, 
$error_url, $do_relation = fals
                 $type     = '&nbsp;';
             }
 
-            $binary       = preg_match('/BINARY/i', $row['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $row['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $row['Type']);
+            $binary       = preg_match('/BINARY/i', $column['Type']);
+            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
         }
         $attribute     = '&nbsp;';
         if ($binary) {
@@ -309,28 +307,28 @@ function PMA_exportStructure($db, $table, $crlf, 
$error_url, $do_relation = fals
         if ($zerofill) {
             $attribute = 'UNSIGNED ZEROFILL';
         }
-        if (! isset($row['Default'])) {
-            if ($row['Null'] != 'NO') {
-                $row['Default'] = 'NULL';
+        if (! isset($column['Default'])) {
+            if ($column['Null'] != 'NO') {
+                $column['Default'] = 'NULL';
             }
         }
 
         $fmt_pre = '';
         $fmt_post = '';
-        if (in_array($row['Field'], $unique_keys)) {
+        if (in_array($column['Field'], $unique_keys)) {
             $fmt_pre = '<b>' . $fmt_pre;
             $fmt_post = $fmt_post . '</b>';
         }
-        if ($row['Key'] == 'PRI') {
+        if ($column['Key'] == 'PRI') {
             $fmt_pre = '<i>' . $fmt_pre;
             $fmt_post = $fmt_post . '</i>';
         }
-        $schema_insert .= '<td class="print">' . $fmt_pre . 
htmlspecialchars($row['Field']) . $fmt_post . '</td>';
+        $schema_insert .= '<td class="print">' . $fmt_pre . 
htmlspecialchars($column['Field']) . $fmt_post . '</td>';
         $schema_insert .= '<td class="print">' . htmlspecialchars($type) . 
'</td>';
-        $schema_insert .= '<td class="print">' . 
htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : 
__('Yes')) . '</td>';
-        $schema_insert .= '<td class="print">' . 
htmlspecialchars(isset($row['Default']) ? $row['Default'] : '') . '</td>';
+        $schema_insert .= '<td class="print">' . 
htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') 
: __('Yes')) . '</td>';
+        $schema_insert .= '<td class="print">' . 
htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
 
-        $field_name = $row['Field'];
+        $field_name = $column['Field'];
 
         if ($do_relation && $have_rel) {
             $schema_insert .= '<td class="print">' . 
(isset($res_rel[$field_name]) ? 
htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . 
$res_rel[$field_name]['foreign_field'] . ')') : '') . '</td>';


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git