Views

ChangeLog

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-12 Alexander M. Turek  <me@derrabus.de>
+    * tbl_properties_table_info.inc.php: Basic view detection.
+    * tbl_properties_structure.php: Disabled table-specific interface elements
+      for views.
+
 2005-01-11 Alexander M. Turek  <me@derrabus.de>
     * libraries/relation.lib.php:
       - Removed redundant code;

tbl_properties_structure.php

@@ -95,7 +95,7 @@ $i = 0;
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
 <tr>
-    <th id="th<?php echo ++$i; ?>">&nbsp;</th>
+<?php echo $tbl_is_view ? '' : '    <th id="th' . ++$i . '">&nbsp;</th>' . "\n"; ?>
     <th id="th<?php echo ++$i; ?>">&nbsp;<?php echo $strField; ?>&nbsp;</th>
     <th id="th<?php echo ++$i; ?>"><?php echo $strType; ?></th>
 <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '    <th id="th' . ++$i . '">' . $strCollation . '</th>' . "\n" : ''; ?>
@@ -103,7 +103,7 @@ $i = 0;
     <th id="th<?php echo ++$i; ?>"><?php echo $strNull; ?></th>
     <th id="th<?php echo ++$i; ?>"><?php echo $strDefault; ?></th>
     <th id="th<?php echo ++$i; ?>"><?php echo $strExtra; ?></th>
-    <th colspan="6" id="th<?php echo ++$i; ?>"><?php echo $strAction; ?></th>
+<?php echo $tbl_is_view ? '' : '    <th colspan="6" id="th' . ++$i . '">' . $strAction . '</th>' . "\n"; ?>
 </tr>
 
 <?php
@@ -302,9 +302,15 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
 
     ?>
 <tr <?php echo $on_mouse; ?>>
+    <?php
+    if (!$tbl_is_view) {
+        ?>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
         <input type="checkbox" name="selected_fld[]" value="<?php echo $field_encoded; ?>" id="checkbox_row_<?php echo $i; ?>" <?php echo $checked; ?> />
     </td>
+        <?php
+    }
+    ?>
     <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">&nbsp;<label onclick="return (document.getElementById('checkbox_row_<?php echo $i; ?>') ? false : true)" for="checkbox_row_<?php echo $i; ?>"><?php echo $field_name; ?></label>&nbsp;</td>
     <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>"<?php echo $type_nowrap; ?>><?php echo $type; echo $type_mime; ?><bdo dir="ltr"></bdo></td>
 <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '    <td bgcolor="' . $bgcolor . '" ' . $click_mouse . '>' . (empty($field_charset) ? '&nbsp;' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>') . '</td>' . "\n" : '' ?>
@@ -312,6 +318,9 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>"><?php echo (($row['Null'] == '') ? $strNo : $strYes); ?>&nbsp;</td>
     <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?>&nbsp;</td>
     <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td>
+    <?php
+    if (!$tbl_is_view) {
+        ?>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
         <a href="tbl_alter.php?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>">
             <?php echo $titles['Change']; ?></a>
@@ -393,7 +402,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     </td>
         <?php
         } // end if... else...
-    echo "\n"
+        echo "\n";
+    } // end if (!$tbl_is_view)
     ?>
 </tr>
     <?php
@@ -402,6 +412,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
 
 echo "\n";
 
+if (!$tbl_is_view) {
+
     $checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db,$table);
     ?>
 
@@ -459,6 +471,9 @@ if ($cfg['PropertiesIconic']) {
         </table>
     </td>
 </tr>
+    <?php
+}
+?>
 </table>
 </form>
 
@@ -466,6 +481,7 @@ if ($cfg['PropertiesIconic']) {
 
 
 <?php
+if (!$tbl_is_view) {
     /**
      * Work on the table
      */
@@ -531,6 +547,8 @@ if ($cfg['Server']['relation'] || $tbl_type=="INNODB") {
 <hr />
 
     <?php
+}
+
 /**
  * If there are more than 20 rows, displays browse/select/insert/empty/drop
  * links again
@@ -545,6 +563,7 @@ if ($fields_cnt > 20) {
 echo "\n\n";
 
 
+if (!$tbl_is_view) {
     /**
      * Displays indexes
      */
@@ -704,7 +723,7 @@ if ($cfg['ShowStats']) {
         </tr>
                 <?php
             }
-        if (PMA_MYSQL_INT_VERSION >= 40100) {
+            if (PMA_MYSQL_INT_VERSION >= 40100 && !empty($tbl_collation)) {
                 $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']);
                 ?>
         <tr>
@@ -821,6 +840,8 @@ echo "\n";
 </table>
 <hr />
     <?php
+} // end if (!$tbl_is_view)
+
 /**
  * Query box, bookmark, insert data from textfile
  */

tbl_properties_table_info.php

@@ -20,10 +20,17 @@ $showtable           = PMA_DBI_fetch_assoc($table_info_result);
 if (!isset($showtable['Type']) && isset($showtable['Engine'])) {
     $showtable['Type'] =& $showtable['Engine'];
 }
+if (PMA_MYSQL_INT_VERSION >= 50000 && !isset($showtable['Type']) && isset($showtable['Comment']) && $showtable['Comment'] == 'view') {
+    $tbl_is_view     = TRUE;
+    $tbl_type        = $strView;
+    $show_comment    = NULL;
+} else {
+    $tbl_is_view     = FALSE;
     $tbl_type        = isset($showtable['Type']) ? strtoupper($showtable['Type']) : '';
+    $show_comment    = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
+}
 $tbl_collation   = empty($showtable['Collation']) ? '' : $showtable['Collation'];
 $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
-$show_comment        = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
 $auto_increment      = (isset($showtable['Auto_increment']) ? $showtable['Auto_increment'] : '');
 
 $tmp                 = isset($showtable['Create_options']) ? explode(' ', $showtable['Create_options']) : array();
@@ -34,6 +41,6 @@ for ($i = 0; $i < $tmp_cnt; $i++) {
         $$tmp1[0]    = $tmp1[1];
     }
 } // end for
-unset($tmp1, $tmp);
 PMA_DBI_free_result($table_info_result);
+unset($tmp1, $tmp, $table_info_result);
 ?>