From d8afc1f544bf237118533f4f8900a3c88a2343c2 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 22:53:17 +0530
Subject: [PATCH] added method PMA_getHtmlForColumnAttribute

---
 libraries/tbl_columns_definition_form.inc.php | 66 ++--------------
 libraries/tbl_columns_definition_form.lib.php | 79 +++++++++++++++++++
 2 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index cc40973e64..7127f7f7ea 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -243,64 +243,14 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column attribute
-    $content_cells[$i][$ci] = '<select style="font-size: 70%;"'
-        . ' name="field_attribute[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
-
-    $attribute     = '';
-    if (isset($extracted_columnspec)) {
-        $attribute = $extracted_columnspec['attribute'];
-    }
-
-    if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
-        $attribute = 'on update CURRENT_TIMESTAMP';
-    }
-
-    if (isset($submit_attribute) && $submit_attribute != false) {
-        $attribute = $submit_attribute;
-    }
-
-    // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
-    // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
-    // the latter.
-    if (PMA_MYSQL_INT_VERSION < 50025
-        && isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
-    ) {
-        $row['Null'] = '';
-    }
-
-    // MySQL 4.1.2+ TIMESTAMP options
-    // (if on_update_current_timestamp is set, then it's TRUE)
-    if (isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
-    ) {
-        $attribute = 'on update CURRENT_TIMESTAMP';
-    }
-    if ((isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
-        || (isset($submit_default_current_timestamp)
-        && $submit_default_current_timestamp)
-    ) {
-        $default_current_timestamp = true;
-    } else {
-        $default_current_timestamp = false;
-    }
-
-    $attribute_types = $GLOBALS['PMA_Types']->getAttributes();
-    $cnt_attribute_types = count($attribute_types);
-    for ($j = 0; $j < $cnt_attribute_types; $j++) {
-        $content_cells[$i][$ci]
-            .= '                <option value="' . $attribute_types[$j] . '"';
-        if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= '>' . $attribute_types[$j] . '</option>';
-    }
-
-    $content_cells[$i][$ci] .= '</select>';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset,
+        isset($extracted_columnspec) ? $extracted_columnspec : null,
+        isset($row) ? $row : null,
+        isset($submit_attribute) ? $submit_attribute : null,
+        isset($analyzed_sql) ? $analyzed_sql : null,
+        isset($submit_default_current_timestamp)
+            ? $submit_default_current_timestamp : null
+    );
     $ci++;
 
     // column NULL
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 16e956e9b9..56ce350ebe 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -878,4 +878,83 @@ function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for column attribute
+ * 
+ * @param int   $i                                field number
+ * @param int   $ci                               cell index
+ * @param int   $ci_offset                        cell index offset
+ * @param array $extracted_columnspec             extracted column
+ * @param array $row                              row
+ * @param bool  $submit_attribute                 submit attribute
+ * @param array $analyzed_sql                     analyzed sql
+ * @param bool  $submit_default_current_timestamp submit default current time stamp
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspec,
+    $row, $submit_attribute, $analyzed_sql, $submit_default_current_timestamp
+) {
+    $html = '<select style="font-size: 70%;"'
+        . ' name="field_attribute[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
+
+    $attribute     = '';
+    if (isset($extracted_columnspec)) {
+        $attribute = $extracted_columnspec['attribute'];
+    }
+
+    if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
+        $attribute = 'on update CURRENT_TIMESTAMP';
+    }
+
+    if (isset($submit_attribute) && $submit_attribute != false) {
+        $attribute = $submit_attribute;
+    }
+
+    // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
+    // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
+    // the latter.
+    if (PMA_MYSQL_INT_VERSION < 50025
+        && isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
+        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
+        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
+    ) {
+        $row['Null'] = '';
+    }
+
+    // MySQL 4.1.2+ TIMESTAMP options
+    // (if on_update_current_timestamp is set, then it's TRUE)
+    if (isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
+    ) {
+        $attribute = 'on update CURRENT_TIMESTAMP';
+    }
+    if ((isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
+        || (isset($submit_default_current_timestamp)
+        && $submit_default_current_timestamp)
+    ) {
+        $default_current_timestamp = true;
+    } else {
+        $default_current_timestamp = false;
+    }
+
+    $attribute_types = $GLOBALS['PMA_Types']->getAttributes();
+    $cnt_attribute_types = count($attribute_types);
+    for ($j = 0; $j < $cnt_attribute_types; $j++) {
+        $html
+            .= '                <option value="' . $attribute_types[$j] . '"';
+        if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
+            $html .= ' selected="selected"';
+        }
+        $html .= '>' . $attribute_types[$j] . '</option>';
+    }
+
+    $html .= '</select>';
+    
+    return $html;
+}
 ?>