From 41ae394e2e799408e2aec43831ed39bf6811f347 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 9 Mar 2005 16:06:10 +0000
Subject: [PATCH] bug #1159415, data dictionary broken

---
 ChangeLog                  |  1 +
 libraries/relation.lib.php | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0c438f4a..6873f0443 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2005-03-09 Marc Delisle  <lem9@users.sourceforge.net>
     * db_operations.php: db comments updating broken
+    * libraries/relation.lib.php: bug #1159415, data dictionary broken
 
 2005-03-08 Michael Keck  <mkkeck@users.sourceforge.net>
     * themes/*/img/bd_insrow.png, themes/*/bd_insrow.png: Added disabled
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index aa4b1cb24..f6e1a3cd7 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -438,15 +438,19 @@ function PMA_getComments($db, $table = '') {
         }
 
         // pmadb internal column comments
-        $com_qry      = 'SELECT column_name, comment FROM ' . PMA_backquote($cfgRelation['db']) . '.' .PMA_backquote($cfgRelation['column_info']);
-        if (PMA_MYSQL_INT_VERSION >= 40100) {
-            $com_qry .= ' WHERE CONVERT(db_name    USING ' . $charset_connection . ') = \'' . PMA_sqlAddslashes($db) . '\''
-                      . ' AND   CONVERT(table_name USING ' . $charset_connection . ') = \'' . PMA_sqlAddslashes($table) . '\'';
-        } else {
-            $com_qry .= ' WHERE db_name    = \'' . PMA_sqlAddslashes($db) . '\''
-                      . ' AND   table_name = \'' . PMA_sqlAddslashes($table) . '\'';
+        // (this function can be called even if $cfgRelation['commwork'] is
+        // FALSE, to get native column comments, so recheck here)
+        if ($cfgRelation['commwork']) {
+            $com_qry      = 'SELECT column_name, comment FROM ' . PMA_backquote($cfgRelation['db']) . '.' .PMA_backquote($cfgRelation['column_info']);
+            if (PMA_MYSQL_INT_VERSION >= 40100) {
+                $com_qry .= ' WHERE CONVERT(db_name    USING ' . $charset_connection . ') = \'' . PMA_sqlAddslashes($db) . '\''
+                          . ' AND   CONVERT(table_name USING ' . $charset_connection . ') = \'' . PMA_sqlAddslashes($table) . '\'';
+            } else {
+                $com_qry .= ' WHERE db_name    = \'' . PMA_sqlAddslashes($db) . '\''
+                          . ' AND   table_name = \'' . PMA_sqlAddslashes($table) . '\'';
+            }
+            $com_rs   = PMA_query_as_cu($com_qry, TRUE, PMA_DBI_QUERY_STORE);
         }
-        $com_rs   = PMA_query_as_cu($com_qry, TRUE, PMA_DBI_QUERY_STORE);
     } else {
         // pmadb internal db comments
         $com_qry      = 'SELECT ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']);
@@ -536,7 +540,6 @@ function PMA_handleSlashes($val) {
 function PMA_setComment($db, $table, $col, $comment, $removekey = '', $mode='auto') {
     global $cfgRelation, $charset_connection;
 
-
     if ($mode=='auto') {
         if (PMA_MYSQL_INT_VERSION >= 40100) {
             $mode='native';