From 6ec5a61290c1a18168dfbec4ff647a1ca3bd4fbb Mon Sep 17 00:00:00 2001 From: "Jehan-Guillaume (ioguix) de Rorthais" Date: Sat, 6 Feb 2010 13:23:55 +0100 Subject: [PATCH] housecleaning: remove all useless hasXXX() functions since we drop support for pg < 7.3 --- aggregates.php | 5 +- classes/Misc.php | 8 +- classes/database/Postgres.php | 42 +--- colproperties.php | 2 - constraints.php | 7 +- database.php | 36 ++-- display.php | 2 +- domains.php | 10 +- fulltext.php | 10 +- functions.php | 9 +- indexes.php | 19 +- info.php | 343 ++++++++++++++++---------------- operators.php | 5 +- rules.php | 5 +- schemas.php | 5 +- sequences.php | 5 +- sqledit.php | 6 +- tables.php | 13 +- tblproperties.php | 9 +- tests/selenium/src/10-table.php | 32 ++- triggers.php | 7 +- types.php | 8 +- users.php | 6 +- viewproperties.php | 18 +- views.php | 5 +- 25 files changed, 245 insertions(+), 372 deletions(-) diff --git a/aggregates.php b/aggregates.php index e571915cb..3f55f2952 100644 --- a/aggregates.php +++ b/aggregates.php @@ -185,10 +185,7 @@ function doDrop($confirm) { echo "

", sprintf($lang['strconfdropaggregate'], htmlspecialchars($_REQUEST['aggrname'])), "

\n"; echo "
\n"; - // Show cascade drop option if supportd - if ($data->hasDropBehavior()) { - echo "

\n"; - } + echo "

\n"; echo "

\n"; echo "\n"; echo "\n"; diff --git a/classes/Misc.php b/classes/Misc.php index a037db6c3..59f9e4a16 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -621,7 +621,6 @@ function getNavTabs($section) { 'title' => $lang['strvariables'], 'url' => 'database.php', 'urlvars' => array('subject' => 'database', 'action' => 'variables'), - 'hide' => (!$data->hasVariables()), 'help' => 'pg.variable', 'tree' => false, 'icon' => 'Variables', @@ -630,7 +629,6 @@ function getNavTabs($section) { 'title' => $lang['strprocesses'], 'url' => 'database.php', 'urlvars' => array('subject' => 'database', 'action' => 'processes'), - 'hide' => (!$data->hasProcesses()), 'help' => 'pg.process', 'tree' => false, 'icon' => 'Processes', @@ -639,7 +637,6 @@ function getNavTabs($section) { 'title' => $lang['strlocks'], 'url' => 'database.php', 'urlvars' => array('subject' => 'database', 'action' => 'locks'), - 'hide' => (!$data->hasLocksView()), 'help' => 'pg.locks', 'tree' => false, 'icon' => 'Key', @@ -672,7 +669,7 @@ function getNavTabs($section) { 'title' => $lang['strcasts'], 'url' => 'casts.php', 'urlvars' => array('subject' => 'database'), - 'hide' => ($hide_advanced || !$data->hasCasts()), + 'hide' => ($hide_advanced), 'help' => 'pg.cast', 'icon' => 'Casts', ), @@ -737,7 +734,6 @@ function getNavTabs($section) { 'title' => $lang['strdomains'], 'url' => 'domains.php', 'urlvars' => array('subject' => 'schema'), - 'hide' => (!$data->hasDomains()), 'help' => 'pg.domain', 'icon' => 'Domains', ), @@ -777,7 +773,7 @@ function getNavTabs($section) { 'title' => $lang['strconversions'], 'url' => 'conversions.php', 'urlvars' => array('subject' => 'schema'), - 'hide' => ($hide_advanced || !$data->hasConversions()), + 'hide' => $hide_advanced, 'help' => 'pg.conversion', 'icon' => 'Conversions', ), diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php index fb5248245..e16cb0877 100755 --- a/classes/database/Postgres.php +++ b/classes/database/Postgres.php @@ -3229,9 +3229,9 @@ function createIndex($name, $table, $columns, $type, $unique, $where, $tablespac } // Predicate - if ($this->hasPartialIndexes() && trim($where) != '') { + if (trim($where) != '') { $sql .= " WHERE ({$where})"; - } + } return $this->execute($sql); } @@ -5948,9 +5948,9 @@ function revokeRole($role, $rolename, $admin = 0, $type = 'RESTRICT') { * @return All users */ function getUsers() { - $sql = "SELECT usename, usesuper, usecreatedb, valuntil AS useexpires"; - if ($this->hasUserSessionDefaults()) $sql .= ", useconfig"; - $sql .= " FROM pg_user ORDER BY usename"; + $sql = "SELECT usename, usesuper, usecreatedb, valuntil AS useexpires, useconfig + FROM pg_user + ORDER BY usename"; return $this->selectSet($sql); } @@ -5963,9 +5963,9 @@ function getUsers() { function getUser($username) { $this->clean($username); - $sql = "SELECT usename, usesuper, usecreatedb, valuntil AS useexpires"; - if ($this->hasUserSessionDefaults()) $sql .= ", useconfig"; - $sql .= " FROM pg_user WHERE usename='{$username}'"; + $sql = "SELECT usename, usesuper, usecreatedb, valuntil AS useexpires, useconfig + FROM pg_user + WHERE usename='{$username}'"; return $this->selectSet($sql); } @@ -7601,10 +7601,7 @@ function browseQuery($type, $table, $query, $sortkey, $sortdir, $page, $page_siz else $orderby = ''; // Actually retrieve the rows, with offset and limit - if ($this->hasFullSubqueries()) - $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET " . ($page - 1) * $page_size); - else - $rs = $this->selectSet("{$query} LIMIT {$page_size} OFFSET " . ($page - 1) * $page_size); + $rs = $this->selectSet("SELECT * FROM ({$query}) AS sub {$orderby} LIMIT {$page_size} OFFSET " . ($page - 1) * $page_size); $status = $this->endTransaction(); if ($status != 0) { $this->rollbackTransaction(); @@ -7763,15 +7760,9 @@ function hasAlterSchema() { return true; } function hasAlterSchemaOwner() { return true; } function hasAlterSequenceProps() { return true; } function hasAlterSequenceSchema() { return true; } - function hasAlterTableOwner() { return true; } function hasAlterTableSchema() { return true; } - function hasAlterTrigger() { return true; } - function hasAnalyze() { return true; } function hasAutovacuum() { return true; } function hasAutovacuumSysTable() { return false; } - function hasCasts() { return true; } - function hasCompositeTypes() { return true; } - function hasConversions() { return true; } function hasCreateTableLike() { return true; } function hasCreateTableLikeWithConstraints() { return true; } function hasCreateTableLikeWithIndexes() { return true; } @@ -7779,39 +7770,24 @@ function hasCreateFieldWithConstraints() { return true; } function hasDisableTriggers() { return true; } function hasAlterDomains() { return true; } function hasDomainConstraints() { return true; } - function hasDomains() { return true; } - function hasDropBehavior() { return true; } - function hasDropColumn() { return true; } function hasEnumTypes() { return true; } function hasFTS() { return true; } - function hasFullSubqueries() { return true; } - function hasFullVacuum() { return true; } - function hasFuncPrivs() { return true; } function hasFunctionAlterOwner() { return true; } function hasFunctionAlterSchema() { return true; } function hasFunctionCosting() { return true; } function hasFunctionGUC() { return true; } function hasGrantOption() { return true; } - function hasIsClustered() { return true; } - function hasLocksView() { return true; } function hasNamedParams() { return true; } - function hasPartialIndexes() { return true; } function hasPrepare() { return true; } function hasPreparedXacts() { return true; } - function hasProcesses() { return true; } function hasReadOnlyQueries() { return true; } function hasRecluster() { return true; } function hasRoles() { return true; } function hasServerAdminFuncs() { return true; } function hasSharedComments() { return true; } function hasQueryCancel() { return true; } - function hasStatsCollector() { return true; } function hasTablespaces() { return true; } - function hasUserAndDbVariables() { return true; } function hasUserRename() { return true; } - function hasUserSessionDefaults() { return true; } - function hasVariables() { return true; } - function hasViewColumnRename() { return true; } function hasVirtualTransactionId() { return true; } function hasAlterDatabase() { return $this->hasAlterDatabaseRename(); } function hasDatabaseCollation() { return true; } diff --git a/colproperties.php b/colproperties.php index dc582a0d4..00ce9d122 100644 --- a/colproperties.php +++ b/colproperties.php @@ -243,8 +243,6 @@ function attPre(&$rowdata) { echo "\t

  • href}&table=", urlencode($_REQUEST['table']), "&column=", urlencode($_REQUEST['column']) . "\">{$lang['stralter']}
    • \n"; - /* Delete link */ - if ($data->hasDropColumn()) echo "\t
  • href}&table=", urlencode($_REQUEST['table']), "&column=" . urlencode($_REQUEST['column']) . "\">{$lang['strdrop']}
    • \n"; } else { diff --git a/constraints.php b/constraints.php index 99298c27b..f966f48df 100644 --- a/constraints.php +++ b/constraints.php @@ -407,10 +407,7 @@ function doDrop($confirm) { echo "\n"; echo "\n"; echo $misc->form; - // Show cascade drop option if supportd - if ($data->hasDropBehavior()) { - echo "

    \n"; - } + echo "

    \n"; echo "\n"; echo "\n"; echo "
    \n"; @@ -473,8 +470,6 @@ function cnPre(&$rowdata) { ), ); - if (!$data->hasIsClustered()) unset($columns['clustered']); - $misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre'); echo "