[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7619-g2c4c45a

[Piotr Przybylski]

The branch, master has been updated
       via  2c4c45a68d564b0e09602e9b29c1fdc99f1c1d16 (commit)
      from  219608095424f3bb41537e1d26eadb3066384303 (commit)


- Log -----------------------------------------------------------------
commit 2c4c45a68d564b0e09602e9b29c1fdc99f1c1d16
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sat Jul 9 21:45:32 2011 +0200

    SERIAL and BOOLEAN columns have no length

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

Summary of changes:
 libraries/Table.class.php |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 37df829..9a15c48 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -336,13 +336,11 @@ class PMA_Table
 
         $is_timestamp = strpos(strtoupper($type), 'TIMESTAMP') !== false;
 
-        /**
-         * @todo include db-name
-         */
         $query = PMA_backquote($name) . ' ' . $type;
 
         if ($length != ''
-            && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$@i', $type)) {
+            && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT'
+                . '|SERIAL|BOOLEAN)$@i', $type)) {
             $query .= '(' . $length . ')';
         }
 


hooks/post-receive
-- 
phpMyAdmin