[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4159-g1f10c9b

[Piotr Przybylski]

The branch, master has been updated
       via  1f10c9b961f1ea62ae5903a321d2c9bca022e8ea (commit)
       via  4c1cd515080dfa96e7dfeb231a1ec9ad55c4d293 (commit)
       via  89e422c1fdf2db0626e1edc7911b4285117d55ad (commit)
      from  4cbfcacc3a8b309b27ce837e2ab97d31125ea9f5 (commit)


- Log -----------------------------------------------------------------
commit 1f10c9b961f1ea62ae5903a321d2c9bca022e8ea
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sat Jun 18 00:04:35 2011 +0200

    Fix incorrect array key (non_unique -> Non_unique) in qbe

commit 4c1cd515080dfa96e7dfeb231a1ec9ad55c4d293
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sat Jun 18 00:03:27 2011 +0200

    Display consistent information on table index's  'Null' field: 'Yes'/'No' instead of MySQL version dependent

commit 89e422c1fdf2db0626e1edc7911b4285117d55ad
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Fri Jun 17 23:55:25 2011 +0200

    Don't show 0 if index cardinality is unknown

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

Summary of changes:
 db_qbe.php                |    2 +-
 libraries/Index.class.php |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index a5bd7a7..42f6123 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -759,7 +759,7 @@ if (isset($Field) && count($Field) > 0) {
                 while ($ind = PMA_DBI_fetch_assoc($ind_rs)) {
                     $col1 = $tab . '.' . $ind['Column_name'];
                     if (isset($col_all[$col1])) {
-                        if ($ind['non_unique'] == 0) {
+                        if ($ind['Non_unique'] == 0) {
                             if (isset($col_where[$col1])) {
                                 $col_unique[$col1] = 'Y';
                             } else {
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index ee266aa..7594f0c 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -504,7 +504,7 @@ class PMA_Index
                 $r .= '</td>';
                 $r .= '<td>' . htmlspecialchars($column->getCardinality()) . '</td>';
                 $r .= '<td>' . htmlspecialchars($column->getCollation()) . '</td>';
-                $r .= '<td>' . htmlspecialchars($column->getNull()) . '</td>';
+                $r .= '<td>' . htmlspecialchars($column->getNull(true)) . '</td>';
 
                 if ($column->getSeqInIndex() == 1) {
                     $r .= '<td ' . $row_span . '>'
@@ -635,7 +635,7 @@ class PMA_Index_Column
      *
      * @var integer
      */
-    protected $_cardinality = 0;
+    protected $_cardinality = null;
 
     public function __construct($params = array())
     {
@@ -679,9 +679,11 @@ class PMA_Index_Column
         return $this->_cardinality;
     }
 
-    public function getNull()
+    public function getNull($as_text = false)
     {
-        return $this->_null;
+        return $as_text
+            ? (!$this->_null || $this->_null == 'NO' ? __('No') : __('Yes'))
+            : $this->_null;
     }
 
     public function getSeqInIndex()


hooks/post-receive
-- 
phpMyAdmin