Remove remainent always true has() functions. Move capabilities from BaseDB.php to...

diff --git a/browser.php b/browser.php
index 7060c753cb70766818b707a7dba534d41fe5f218..29991691d88e01028e485dafb816d6fbf7e65bdc 100644 (file)
--- a/browser.php
+++ b/browser.php
@@ -5,7 +5,7 @@
         * if you click on a database it shows a list of database objects in that
         * database.
         *
-        * $Id: browser.php,v 1.40 2004/07/13 15:24:40 jollytoad Exp $
+        * $Id: browser.php,v 1.41 2004/07/16 16:01:06 soranzo Exp $
         */
 
        // Include application functions
@@ -39,100 +39,88 @@
                global $data, $misc, $lang, $conf;
                
                // Tables
-               if ($data->hasTables()) {
-                       $table_node = &new HTML_TreeNode(array(
-                                                       'text' => $lang['strtables'], 
-                                                       'link' => addslashes(htmlspecialchars("tables.php?{$querystr}")), 
+               $table_node = &new HTML_TreeNode(array(
+                                               'text' => $lang['strtables'], 
+                                               'link' => addslashes(htmlspecialchars("tables.php?{$querystr}")), 
+                                               'icon' => "../../../images/themes/{$conf['theme']}/tables.png", 
+                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/tables.png",
+                                               'expanded' => false,
+                                               'linkTarget' => 'detail'));
+               // Add table folder to schema
+               $schemanode->addItem($table_node);
+
+               $tables = &$data->getTables();
+               while (!$tables->EOF) {
+                       $return_url = urlencode("tblproperties.php?table=" . urlencode($tables->f['relname']) . "&{$querystr}");
+                       $item_node = &new HTML_TreeNode(array(
+                                                       'text' => $misc->printVal($tables->f['relname']), 
+                                                       'link' => addslashes(htmlspecialchars("redirect.php?section=table&{$querystr}&table=" . urlencode($tables->f['relname']))), 
                                                        'icon' => "../../../images/themes/{$conf['theme']}/tables.png", 
                                                        'expandedIcon' => "../../../images/themes/{$conf['theme']}/tables.png",
                                                        'expanded' => false,
-                                                       'linkTarget' => 'detail'));
-
+                                                       'linkTarget' => 'detail',
+                                                       'iconLink' => addslashes(htmlspecialchars('display.php?table=' . urlencode($tables->f['relname']) . '&objtype=table&' . $querystr . "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
+                                                       ));
                        // Add table folder to schema
-                       $schemanode->addItem($table_node);
-                       
-                       $tables = &$data->getTables();
-                       while (!$tables->EOF) {
-                               $return_url = urlencode("tblproperties.php?table=" . urlencode($tables->f['relname']) . "&{$querystr}");
-                               $item_node = &new HTML_TreeNode(array(
-                                                               'text' => $misc->printVal($tables->f['relname']), 
-                                                               'link' => addslashes(htmlspecialchars("redirect.php?section=table&{$querystr}&table=" .
-                                                                       urlencode($tables->f['relname']))), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/tables.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/tables.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail',
-                                                               'iconLink' => addslashes(htmlspecialchars('display.php?table='.urlencode($tables->f['relname']).'&objtype=table&'.$querystr.
-                                                                       "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
-                                                               ));
-
-                               // Add table folder to schema
-                               $table_node->addItem($item_node);
+                       $table_node->addItem($item_node);
 
-                               $tables->moveNext();
-                       }
+                       $tables->moveNext();
                }
+
                // Views
-               if ($data->hasViews()) {
-                       $view_node = &new HTML_TreeNode(array(
-                                                       'text' => $lang['strviews'], 
-                                                       'link' => addslashes(htmlspecialchars("views.php?{$querystr}")), 
+               $view_node = &new HTML_TreeNode(array(
+                                               'text' => $lang['strviews'], 
+                                               'link' => addslashes(htmlspecialchars("views.php?{$querystr}")), 
+                                               'icon' => "../../../images/themes/{$conf['theme']}/views.png", 
+                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/views.png",
+                                               'expanded' => false,
+                                               'linkTarget' => 'detail'));
+               // Add view folder to schema
+               $schemanode->addItem($view_node);
+
+               $views = &$data->getViews();
+               while (!$views->EOF) {
+                       $return_url = urlencode("viewproperties.php?view=" . urlencode($views->f['relname']) . "&{$querystr}");
+                       $item_node = &new HTML_TreeNode(array(
+                                                       'text' => $misc->printVal($views->f['relname']), 
+                                                       'link' => addslashes(htmlspecialchars("redirect.php?section=view&{$querystr}&view=" .
+                                                               urlencode($views->f['relname']))), 
                                                        'icon' => "../../../images/themes/{$conf['theme']}/views.png", 
                                                        'expandedIcon' => "../../../images/themes/{$conf['theme']}/views.png",
                                                        'expanded' => false,
-                                                       'linkTarget' => 'detail'));
-
+                                                       'linkTarget' => 'detail',
+                                                       // XXX: FIX BROWSE
+                                                       'iconLink' => addslashes(htmlspecialchars('display.php?table='.urlencode($views->f['relname']).'&objtype=view&'.$querystr.
+                                                               "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
+                                                       ));
                        // Add view folder to schema
-                       $schemanode->addItem($view_node);
-                       
-                       $views = &$data->getViews();
-                       while (!$views->EOF) {
-                               $return_url = urlencode("viewproperties.php?view=" . urlencode($views->f['relname']) . "&{$querystr}");
-                               $item_node = &new HTML_TreeNode(array(
-                                                               'text' => $misc->printVal($views->f['relname']), 
-                                                               'link' => addslashes(htmlspecialchars("redirect.php?section=view&{$querystr}&view=" .
-                                                                       urlencode($views->f['relname']))), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/views.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/views.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail',
-                                                               // XXX: FIX BROWSE
-                                                               'iconLink' => addslashes(htmlspecialchars('display.php?table='.urlencode($views->f['relname']).'&objtype=view&'.$querystr.
-                                                                       "&return_url={$return_url}&return_desc=" . urlencode($lang['strback'])))
-                                                               ));
+                       $view_node->addItem($item_node);
 
-                               // Add view folder to schema
-                               $view_node->addItem($item_node);
-
-                               $views->moveNext();
-                       }
+                       $views->moveNext();
                }
+
                // Sequences
-               if ($data->hasSequences()) {
-                       $seq_node = &new HTML_TreeNode(array(
-                                                       'text' => $lang['strsequences'], 
-                                                       'link' => addslashes(htmlspecialchars("sequences.php?{$querystr}")), 
-                                                       'icon' => "../../../images/themes/{$conf['theme']}/sequences.png", 
-                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/sequences.png",
-                                                       'expanded' => false,
-                                                       'linkTarget' => 'detail'));
+               $seq_node = &new HTML_TreeNode(array(
+                                               'text' => $lang['strsequences'], 
+                                               'link' => addslashes(htmlspecialchars("sequences.php?{$querystr}")), 
+                                               'icon' => "../../../images/themes/{$conf['theme']}/sequences.png", 
+                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/sequences.png",
+                                               'expanded' => false,
+                                               'linkTarget' => 'detail'));
+               // Add folder to schema
+               $schemanode->addItem($seq_node);
 
-                       // Add folder to schema
-                       $schemanode->addItem($seq_node);
-               }
                // Functions
-               if ($data->hasFunctions()) {
-                       $func_node = &new HTML_TreeNode(array(
-                                                       'text' => $lang['strfunctions'], 
-                                                       'link' => addslashes(htmlspecialchars("functions.php?{$querystr}")), 
-                                                       'icon' => "../../../images/themes/{$conf['theme']}/functions.png", 
-                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/functions.png",
-                                                       'expanded' => false,
-                                                       'linkTarget' => 'detail'));
+               $func_node = &new HTML_TreeNode(array(
+                                               'text' => $lang['strfunctions'], 
+                                               'link' => addslashes(htmlspecialchars("functions.php?{$querystr}")), 
+                                               'icon' => "../../../images/themes/{$conf['theme']}/functions.png", 
+                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/functions.png",
+                                               'expanded' => false,
+                                               'linkTarget' => 'detail'));
+               // Add folder to schema
+               $schemanode->addItem($func_node);
 
-                       // Add folder to schema
-                       $schemanode->addItem($func_node);
-               }
                // Domains
                if ($data->hasDomains()) {
                        $dom_node = &new HTML_TreeNode(array(
@@ -146,72 +134,62 @@
                        // Add folder to schema
                        $schemanode->addItem($dom_node);
                }
+
                // Advanced
                if ($conf['show_advanced']) {
-                       if ($data->hasTypes() || $data->hasOperators() || $data->hasConversions()
-                                       || $data->hasAggregates() || $data->hasOpClasses()) {
-                               $adv_node = &new HTML_TreeNode(array(
-                                                               'text' => $lang['stradvanced'], 
-#                                                              'link' => ($data->hasSchemas()) ? addslashes(htmlspecialchars("schema.php?{$querystr}&" . SID)) : null, 
-                                                               'icon' => 'folder.gif', 
-                                                               'expandedIcon' => 'folder-expanded.gif',
-                                                               'linkTarget' => 'detail'));
+                       $adv_node = &new HTML_TreeNode(array(
+                                                       'text' => $lang['stradvanced'], 
+#                                                      'link' => ($data->hasSchemas()) ? addslashes(htmlspecialchars("schema.php?{$querystr}&" . SID)) : null, 
+                                                       'icon' => 'folder.gif', 
+                                                       'expandedIcon' => 'folder-expanded.gif',
+                                                       'linkTarget' => 'detail'));
+                       // Add folder to schema
+                       $schemanode->addItem($adv_node);                        
 
-                               // Add folder to schema
-                               $schemanode->addItem($adv_node);                        
-                       }
                        // Aggregates
-                       if ($data->hasAggregates()) {
-                               $agg_node = &new HTML_TreeNode(array(
-                                                               'text' => $lang['straggregates'], 
-                                                               'link' => addslashes(htmlspecialchars("aggregates.php?{$querystr}")), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail'));
+                       $agg_node = &new HTML_TreeNode(array(
+                                                       'text' => $lang['straggregates'], 
+                                                       'link' => addslashes(htmlspecialchars("aggregates.php?{$querystr}")), 
+                                                       'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
+                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
+                                                       'expanded' => false,
+                                                       'linkTarget' => 'detail'));
+                       // Add folder to schema
+                       $adv_node->addItem($agg_node);
 
-                               // Add folder to schema
-                               $adv_node->addItem($agg_node);
-                       }
                        // Types
-                       if ($data->hasTypes()) {
-                               $type_node = &new HTML_TreeNode(array(
-                                                               'text' => $lang['strtypes'], 
-                                                               'link' => addslashes(htmlspecialchars("types.php?{$querystr}")), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail'));
+                       $type_node = &new HTML_TreeNode(array(
+                                                       'text' => $lang['strtypes'], 
+                                                       'link' => addslashes(htmlspecialchars("types.php?{$querystr}")), 
+                                                       'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
+                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
+                                                       'expanded' => false,
+                                                       'linkTarget' => 'detail'));
+                       // Add folder to schema
+                       $adv_node->addItem($type_node);
 
-                               // Add folder to schema
-                               $adv_node->addItem($type_node);
-                       }
                        // Operators
-                       if ($data->hasOperators()) {
-                               $opr_node = &new HTML_TreeNode(array(
-                                                               'text' => $lang['stroperators'], 
-                                                               'link' => addslashes(htmlspecialchars("operators.php?{$querystr}")), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/operators.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/operators.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail'));
+                       $opr_node = &new HTML_TreeNode(array(
+                                                       'text' => $lang['stroperators'], 
+                                                       'link' => addslashes(htmlspecialchars("operators.php?{$querystr}")), 
+                                                       'icon' => "../../../images/themes/{$conf['theme']}/operators.png", 
+                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/operators.png",
+                                                       'expanded' => false,
+                                                       'linkTarget' => 'detail'));
+                       // Add folder to schema
+                       $adv_node->addItem($opr_node);
 
-                               // Add folder to schema
-                               $adv_node->addItem($opr_node);
-                       }
                        // Operator Classes
-                       if ($data->hasOpClasses()) {
-                               $opc_node = &new HTML_TreeNode(array(
-                                                               'text' => $lang['stropclasses'], 
-                                                               'link' => addslashes(htmlspecialchars("opclasses.php?{$querystr}")), 
-                                                               'icon' => "../../../images/themes/{$conf['theme']}/operators.png", 
-                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/operators.png",
-                                                               'expanded' => false,
-                                                               'linkTarget' => 'detail'));
+                       $opc_node = &new HTML_TreeNode(array(
+                                                       'text' => $lang['stropclasses'], 
+                                                       'link' => addslashes(htmlspecialchars("opclasses.php?{$querystr}")), 
+                                                       'icon' => "../../../images/themes/{$conf['theme']}/operators.png", 
+                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/operators.png",
+                                                       'expanded' => false,
+                                                       'linkTarget' => 'detail'));
+                       // Add folder to schema
+                       $adv_node->addItem($opc_node);
 
-                               // Add folder to schema
-                               $adv_node->addItem($opc_node);
-                       }
                        // Conversions
                        if ($data->hasConversions()) {
                                $con_node = &new HTML_TreeNode(array(
@@ -283,18 +261,15 @@
 
                        // Languages
                        if ($conf['show_advanced']) {
-                               if ($data->hasLanguages()) {            
-                                       $lang_node = &new HTML_TreeNode(array(
-                                                                       'text' => $lang['strlanguages'], 
-                                                                       'link' => addslashes(htmlspecialchars("languages.php?{$querystr}")), 
-                                                                       'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
-                                                                       'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
-                                                                       'expanded' => false,
-                                                                       'linkTarget' => 'detail'));
-
-                                       // Add folder to database
-                                       $db_node->addItem($lang_node);
-                               }
+                               $lang_node = &new HTML_TreeNode(array(
+                                                               'text' => $lang['strlanguages'], 
+                                                               'link' => addslashes(htmlspecialchars("languages.php?{$querystr}")), 
+                                                               'icon' => "../../../images/themes/{$conf['theme']}/types.png", 
+                                                               'expandedIcon' => "../../../images/themes/{$conf['theme']}/types.png",
+                                                               'expanded' => false,
+                                                               'linkTarget' => 'detail'));
+                               // Add folder to database
+                               $db_node->addItem($lang_node);
                        
                                // Casts
                                if ($data->hasCasts()) {                

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index 23d342f74e016200729bdbdec1d9b69df8ddd9d2..e94abe54517b66db2a1e6ca96501426ea321f216 100644 (file)
--- a/classes/database/BaseDB.php
+++ b/classes/database/BaseDB.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: BaseDB.php,v 1.55 2004/07/16 11:38:21 soranzo Exp $
+ * $Id: BaseDB.php,v 1.56 2004/07/16 16:01:06 soranzo Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');
@@ -241,46 +241,6 @@ class BaseDB extends ADODB_base {
                return $this->selectSet("SELECT {$oid_str}* FROM \"{$relation}\"");
        }
 
-       // Capabilities
-       function hasTables() { return false; }
-       function hasViews() { return false; }
-       function hasSequences() { return false; }
-       function hasFunctions() { return false; }
-       function hasOperators() { return false; }
-       function hasTypes() { return false; }
-       function hasAggregates() { return false; }
-       function hasLanguages() { return false; }
-       function hasSchemas() { return false; }
-       function hasConversions() { return false; }     
-       function hasGrantOption() { return false; }
-       function hasIsClustered() { return false; }
-       function hasDropBehavior() { return false; }
-       function hasDropColumn() { return false; }
-       function hasDomains() { return false; }
-       function hasDomainConstraints() { return false; }
-       function hasAlterTrigger() { return false; }
-       function hasWithoutOIDs() { return false; }
-       function hasAlterTableOwner() { return false; }
-       function hasPartialIndexes() { return false; }
-       function hasCasts() { return false; }
-       function hasFullSubqueries() { return false; }
-       function hasPrepare() { return false; }
-       function hasOpClasses() { return false; }
-       function hasProcesses() { return false; }
-       function hasVariables() { return false; }
-       function hasFullExplain() { return false; }
-       function hasStatsCollector() { return false; }
-       function hasSchemaDump() { return false; }
-       function hasAlterColumnType() { return false; }
-       function hasUserSessionDefaults() { return false; }
-       function hasUserRename() { return false; }
-       function hasRecluster() { return false; }
-       function hasFullVacuum() { return false; }
-       function hasForeignKeysInfo() { return false; }
-       function hasViewColumnRename() { return false; }
-       function hasTablespaces() { return false; }
-       function hasSignals() { return false; }
-       function hasNamedParams() { return false; }
 }
 
 ?>

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index dd7391f66b573f3e6a14e5548ef18d4c79b95695..8acf068e5c4c43de8979fd17e82be8b8f687b5d0 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.239 2004/07/16 11:38:21 soranzo Exp $
+ * $Id: Postgres.php,v 1.240 2004/07/16 16:01:06 soranzo Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -3882,15 +3882,36 @@ class Postgres extends BaseDB {
        }
        
        // Capabilities
-       function hasTables() { return true; }
-       function hasViews() { return true; }
-       function hasSequences() { return true; }
-       function hasFunctions() { return true; }
-       function hasOperators() { return true; }
-       function hasTypes() { return true; }
-       function hasAggregates() { return true; }
-       function hasLanguages() { return true; }
-       function hasOpClasses() { return true; }
+       function hasSchemas() { return false; }
+       function hasConversions() { return false; }     
+       function hasGrantOption() { return false; }
+       function hasIsClustered() { return false; }
+       function hasDropBehavior() { return false; }
+       function hasDropColumn() { return false; }
+       function hasDomains() { return false; }
+       function hasDomainConstraints() { return false; }
+       function hasAlterTrigger() { return false; }
+       function hasWithoutOIDs() { return false; }
+       function hasAlterTableOwner() { return false; }
+       function hasPartialIndexes() { return false; }
+       function hasCasts() { return false; }
+       function hasFullSubqueries() { return false; }
+       function hasPrepare() { return false; }
+       function hasProcesses() { return false; }
+       function hasVariables() { return false; }
+       function hasFullExplain() { return false; }
+       function hasStatsCollector() { return false; }
+       function hasSchemaDump() { return false; }
+       function hasAlterColumnType() { return false; }
+       function hasUserSessionDefaults() { return false; }
+       function hasUserRename() { return false; }
+       function hasRecluster() { return false; }
+       function hasFullVacuum() { return false; }
+       function hasForeignKeysInfo() { return false; }
+       function hasViewColumnRename() { return false; }
+       function hasTablespaces() { return false; }
+       function hasSignals() { return false; }
+       function hasNamedParams() { return false; }
 
 }
 

diff --git a/database.php b/database.php
index cf308d43f18a55e8e60122bf638e1ce76feac672..b5a48b5efd10e58f9f8459ced02453fe62ce74dc 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.54 2004/07/13 15:24:40 jollytoad Exp $
+        * $Id: database.php,v 1.55 2004/07/16 16:01:06 soranzo Exp $
         */
 
        // Include application functions
@@ -52,38 +52,26 @@
                echo "\t<option value=\"\"", ($_GET['filter'] == '') ? ' selected="selected"' : '', ">{$lang['strallobjects']}</option>\n";
                if ($data->hasSchemas())
                        echo "\t<option value=\"SCHEMA\"", ($_GET['filter'] == 'SCHEMA') ? ' selected="selected"' : '', ">{$lang['strschemas']}</option>\n";
-               if ($data->hasTables())
-                       echo "\t<option value=\"TABLE\"", ($_GET['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
-               if ($data->hasViews())
-                       echo "\t<option value=\"VIEW\"", ($_GET['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
-               if ($data->hasSequences())
-                       echo "\t<option value=\"SEQUENCE\"", ($_GET['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
-               if ($data->hasTables() || $data->hasViews()) {
-                       echo "\t<option value=\"COLUMN\"", ($_GET['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
-                       echo "\t<option value=\"RULE\"", ($_GET['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
-               }
-               if ($data->hasTables()) {
-                       echo "\t<option value=\"INDEX\"", ($_GET['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
-                       echo "\t<option value=\"TRIGGER\"", ($_GET['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
-               }
-               if ($data->hasTables() || $data->hasDomainConstraints())
-                       echo "\t<option value=\"CONSTRAINT\"", ($_GET['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
-               if ($data->hasFunctions())
-                       echo "\t<option value=\"FUNCTION\"", ($_GET['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
-               if ($data->hasTypes() && $conf['show_advanced'])
-                       echo "\t<option value=\"TYPE\"", ($_GET['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
+               echo "\t<option value=\"TABLE\"", ($_GET['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
+               echo "\t<option value=\"VIEW\"", ($_GET['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
+               echo "\t<option value=\"SEQUENCE\"", ($_GET['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
+               echo "\t<option value=\"COLUMN\"", ($_GET['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
+               echo "\t<option value=\"RULE\"", ($_GET['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
+               echo "\t<option value=\"INDEX\"", ($_GET['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
+               echo "\t<option value=\"TRIGGER\"", ($_GET['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
+               echo "\t<option value=\"CONSTRAINT\"", ($_GET['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
+               echo "\t<option value=\"FUNCTION\"", ($_GET['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
                if ($data->hasDomains())
                        echo "\t<option value=\"DOMAIN\"", ($_GET['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
-               if ($data->hasOperators() && $conf['show_advanced'])
-                       echo "\t<option value=\"OPERATOR\"", ($_GET['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
-               if ($data->hasConversions() && $conf['show_advanced'])
-                       echo "\t<option value=\"CONVERSION\"", ($_GET['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
-               if ($data->hasLanguages() && $conf['show_advanced'])
-                       echo "\t<option value=\"LANGUAGE\"", ($_GET['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
-               if ($data->hasAggregates() && $conf['show_advanced'])
+               if ($conf['show_advanced']) {
                        echo "\t<option value=\"AGGREGATE\"", ($_GET['filter'] == 'AGGREGATE') ? ' selected="selected"' : '', ">{$lang['straggregates']}</option>\n";
-               if ($data->hasOpClasses() && $conf['show_advanced'])
+                       echo "\t<option value=\"TYPE\"", ($_GET['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
+                       echo "\t<option value=\"OPERATOR\"", ($_GET['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
                        echo "\t<option value=\"OPCLASS\"", ($_GET['filter'] == 'OPCLASS') ? ' selected="selected"' : '', ">{$lang['stropclasses']}</option>\n";
+                       if ($data->hasConversions())
+                               echo "\t<option value=\"CONVERSION\"", ($_GET['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
+                       echo "\t<option value=\"LANGUAGE\"", ($_GET['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
+               }
                echo "</select>\n";
                echo "<input type=\"submit\" value=\"{$lang['strfind']}\" />\n";
                echo $misc->form;

diff --git a/sqledit.php b/sqledit.php
index e8e52fc6af09a23db426875b5d698b8f40bd8375..cd6c91e685d3145469b20656c319167d8a854db1 100644 (file)
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
        /**
         * Alternative SQL editing window
         *
-        * $Id: sqledit.php,v 1.21 2004/07/15 15:45:48 jollytoad Exp $
+        * $Id: sqledit.php,v 1.22 2004/07/16 16:01:06 soranzo Exp $
         */
 
        // Include application functions
@@ -74,38 +74,26 @@
                echo "\t<option value=\"\"", ($_GET['filter'] == '') ? ' selected="selected"' : '', ">{$lang['strallobjects']}</option>\n";
                if ($data->hasSchemas())
                        echo "\t<option value=\"SCHEMA\"", ($_GET['filter'] == 'SCHEMA') ? ' selected="selected"' : '', ">{$lang['strschemas']}</option>\n";
-               if ($data->hasTables())
-                       echo "\t<option value=\"TABLE\"", ($_GET['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
-               if ($data->hasViews())
-                       echo "\t<option value=\"VIEW\"", ($_GET['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
-               if ($data->hasSequences())
-                       echo "\t<option value=\"SEQUENCE\"", ($_GET['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
-               if ($data->hasTables() || $data->hasViews()) {
-                       echo "\t<option value=\"COLUMN\"", ($_GET['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
-                       echo "\t<option value=\"RULE\"", ($_GET['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
-               }
-               if ($data->hasTables()) {
-                       echo "\t<option value=\"INDEX\"", ($_GET['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
-                       echo "\t<option value=\"TRIGGER\"", ($_GET['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
-               }
-               if ($data->hasTables() || $data->hasDomainConstraints())
-                       echo "\t<option value=\"CONSTRAINT\"", ($_GET['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
-               if ($data->hasFunctions())
-                       echo "\t<option value=\"FUNCTION\"", ($_GET['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
-               if ($data->hasTypes() && $conf['show_advanced'])
-                       echo "\t<option value=\"TYPE\"", ($_GET['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
+               echo "\t<option value=\"TABLE\"", ($_GET['filter'] == 'TABLE') ? ' selected="selected"' : '', ">{$lang['strtables']}</option>\n";
+               echo "\t<option value=\"VIEW\"", ($_GET['filter'] == 'VIEW') ? ' selected="selected"' : '', ">{$lang['strviews']}</option>\n";
+               echo "\t<option value=\"SEQUENCE\"", ($_GET['filter'] == 'SEQUENCE') ? ' selected="selected"' : '', ">{$lang['strsequences']}</option>\n";
+               echo "\t<option value=\"COLUMN\"", ($_GET['filter'] == 'COLUMN') ? ' selected="selected"' : '', ">{$lang['strcolumns']}</option>\n";
+               echo "\t<option value=\"RULE\"", ($_GET['filter'] == 'RULE') ? ' selected="selected"' : '', ">{$lang['strrules']}</option>\n";
+               echo "\t<option value=\"INDEX\"", ($_GET['filter'] == 'INDEX') ? ' selected="selected"' : '', ">{$lang['strindexes']}</option>\n";
+               echo "\t<option value=\"TRIGGER\"", ($_GET['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
+               echo "\t<option value=\"CONSTRAINT\"", ($_GET['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
+               echo "\t<option value=\"FUNCTION\"", ($_GET['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
                if ($data->hasDomains())
                        echo "\t<option value=\"DOMAIN\"", ($_GET['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
-               if ($data->hasOperators() && $conf['show_advanced'])
-                       echo "\t<option value=\"OPERATOR\"", ($_GET['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
-               if ($data->hasConversions() && $conf['show_advanced'])
-                       echo "\t<option value=\"CONVERSION\"", ($_GET['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
-               if ($data->hasLanguages() && $conf['show_advanced'])
-                       echo "\t<option value=\"LANGUAGE\"", ($_GET['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
-               if ($data->hasAggregates() && $conf['show_advanced'])
+               if ($conf['show_advanced']) {
                        echo "\t<option value=\"AGGREGATE\"", ($_GET['filter'] == 'AGGREGATE') ? ' selected="selected"' : '', ">{$lang['straggregates']}</option>\n";
-               if ($data->hasOpClasses() && $conf['show_advanced'])
+                       echo "\t<option value=\"TYPE\"", ($_GET['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
+                       echo "\t<option value=\"OPERATOR\"", ($_GET['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
                        echo "\t<option value=\"OPCLASS\"", ($_GET['filter'] == 'OPCLASS') ? ' selected="selected"' : '', ">{$lang['stropclasses']}</option>\n";
+                       if ($data->hasConversions())
+                               echo "\t<option value=\"CONVERSION\"", ($_GET['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
+                       echo "\t<option value=\"LANGUAGE\"", ($_GET['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
+               }
                echo "</select>\n";
                                        
                echo "<input type=\"submit\" value=\"{$lang['strfind']}\" />\n";