Skip to content

Commit

Permalink
housecleaning: remove all useless hasXXX() functions since we drop su…
Browse files Browse the repository at this point in the history 
…pport for pg < 7.3
  • Loading branch information
Jehan-Guillaume (ioguix) de Rorthais committed Feb 6, 2010
1 parent ae0bac8 commit 6ec5a61
Show file tree
Hide file tree
Showing 25 changed files with 245 additions and 372 deletions.
5 changes: 1 addition & 4 deletions aggregates.php
View file
Expand Up @@ -185,10 +185,7 @@ function doDrop($confirm) {
echo "<p>", sprintf($lang['strconfdropaggregate'], htmlspecialchars($_REQUEST['aggrname'])), "</p>\n";

echo "<form action=\"aggregates.php\" method=\"post\">\n";
// Show cascade drop option if supportd
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
echo "<input type=\"hidden\" name=\"aggrname\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" />\n";
echo "<input type=\"hidden\" name=\"aggrtype\" value=\"", htmlspecialchars($_REQUEST['aggrtype']), "\" />\n";
Expand Down
8 changes: 2 additions & 6 deletions classes/Misc.php
View file
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
),
Expand Down Expand Up @@ -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',
),
Expand Down Expand Up @@ -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',
),
Expand Down
42 changes: 9 additions & 33 deletions classes/database/Postgres.php
View file
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -7763,55 +7760,34 @@ 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; }
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; }
Expand Down
2 changes: 0 additions & 2 deletions colproperties.php
View file
Expand Up @@ -243,8 +243,6 @@ function attPre(&$rowdata) {
echo "\t<li><a href=\"colproperties.php?action=properties&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
"&amp;column=", urlencode($_REQUEST['column']) . "\">{$lang['stralter']}</a></li>\n";

/* Delete link */
if ($data->hasDropColumn())
echo "\t<li><a href=\"tblproperties.php?action=confirm_drop&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
"&amp;column=" . urlencode($_REQUEST['column']) . "\">{$lang['strdrop']}</a></li>\n";
} else {
Expand Down
7 changes: 1 addition & 6 deletions constraints.php
View file
Expand Up @@ -407,10 +407,7 @@ function doDrop($confirm) {
echo "<input type=\"hidden\" name=\"constraint\" value=\"", htmlspecialchars($_REQUEST['constraint']), "\" />\n";
echo "<input type=\"hidden\" name=\"type\" value=\"", htmlspecialchars($_REQUEST['type']), "\" />\n";
echo $misc->form;
// Show cascade drop option if supportd
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
Expand Down Expand Up @@ -473,8 +470,6 @@ function cnPre(&$rowdata) {
),
);

if (!$data->hasIsClustered()) unset($columns['clustered']);

$misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre');

echo "<ul class=\"navlink\">\n\t<li><a href=\"constraints.php?action=add_check&amp;{$misc->href}&amp;table=", urlencode($_REQUEST['table']),
Expand Down
36 changes: 14 additions & 22 deletions database.php
View file
Expand Up @@ -59,15 +59,13 @@ function doFind($confirm = true, $msg = '') {
echo "\t<option value=\"TRIGGER\"", ($_REQUEST['filter'] == 'TRIGGER') ? ' selected="selected"' : '', ">{$lang['strtriggers']}</option>\n";
echo "\t<option value=\"CONSTRAINT\"", ($_REQUEST['filter'] == 'CONSTRAINT') ? ' selected="selected"' : '', ">{$lang['strconstraints']}</option>\n";
echo "\t<option value=\"FUNCTION\"", ($_REQUEST['filter'] == 'FUNCTION') ? ' selected="selected"' : '', ">{$lang['strfunctions']}</option>\n";
if ($data->hasDomains())
echo "\t<option value=\"DOMAIN\"", ($_REQUEST['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
echo "\t<option value=\"DOMAIN\"", ($_REQUEST['filter'] == 'DOMAIN') ? ' selected="selected"' : '', ">{$lang['strdomains']}</option>\n";
if ($conf['show_advanced']) {
echo "\t<option value=\"AGGREGATE\"", ($_REQUEST['filter'] == 'AGGREGATE') ? ' selected="selected"' : '', ">{$lang['straggregates']}</option>\n";
echo "\t<option value=\"TYPE\"", ($_REQUEST['filter'] == 'TYPE') ? ' selected="selected"' : '', ">{$lang['strtypes']}</option>\n";
echo "\t<option value=\"OPERATOR\"", ($_REQUEST['filter'] == 'OPERATOR') ? ' selected="selected"' : '', ">{$lang['stroperators']}</option>\n";
echo "\t<option value=\"OPCLASS\"", ($_REQUEST['filter'] == 'OPCLASS') ? ' selected="selected"' : '', ">{$lang['stropclasses']}</option>\n";
if ($data->hasConversions())
echo "\t<option value=\"CONVERSION\"", ($_REQUEST['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
echo "\t<option value=\"CONVERSION\"", ($_REQUEST['filter'] == 'CONVERSION') ? ' selected="selected"' : '', ">{$lang['strconversions']}</option>\n";
echo "\t<option value=\"LANGUAGE\"", ($_REQUEST['filter'] == 'LANGUAGE') ? ' selected="selected"' : '', ">{$lang['strlanguages']}</option>\n";
}
echo "</select>\n";
Expand Down Expand Up @@ -561,11 +559,9 @@ function doAdmin($action = '', $msg = '') {
echo "<th class=\"data\">";
$misc->printHelp($lang['strvacuum'],'pg.admin.vacuum')."</th>\n";
echo "</th>";
if ($data->hasAnalyze()){
echo "<th class=\"data\">";
$misc->printHelp($lang['stranalyze'],'pg.admin.analyze');
echo "</th>";
}
echo "<th class=\"data\">";
$misc->printHelp($lang['stranalyze'],'pg.admin.analyze');
echo "</th>";
if ($data->hasRecluster()){
echo "<th class=\"data\">";
$misc->printHelp($lang['strclusterindex'],'pg.index.cluster');
Expand All @@ -581,26 +577,22 @@ function doAdmin($action = '', $msg = '') {
echo "<td class=\"data1\" style=\"text-align: center; vertical-align: bottom\">\n";
echo "<form action=\"database.php\" method=\"post\">\n";
echo "<p><input type=\"checkbox\" id=\"vacuum_analyze\" name=\"vacuum_analyze\" /><label for=\"vacuum_analyze\">{$lang['stranalyze']}</label>\n";
if ($data->hasFullVacuum()) {
echo "<br /><input type=\"checkbox\" id=\"vacuum_full\" name=\"vacuum_full\" /><label for=\"vacuum_full\">{$lang['strfull']}</label>\n";
echo "<br /><input type=\"checkbox\" id=\"vacuum_freeze\" name=\"vacuum_freeze\" /><label for=\"vacuum_freeze\">{$lang['strfreeze']}</label>\n";
}
echo "<br /><input type=\"checkbox\" id=\"vacuum_full\" name=\"vacuum_full\" /><label for=\"vacuum_full\">{$lang['strfull']}</label>\n";
echo "<br /><input type=\"checkbox\" id=\"vacuum_freeze\" name=\"vacuum_freeze\" /><label for=\"vacuum_freeze\">{$lang['strfreeze']}</label>\n";
echo "<input type=\"hidden\" name=\"action\" value=\"vacuum\" />\n";
echo $misc->form;
echo "<br /><input type=\"submit\" value=\"{$lang['strvacuum']}\" /></p>\n";
echo "</form>\n";
echo "</td>\n";

// Analyze
if ($data->hasAnalyze()) {
echo "<td class=\"data1\" style=\"text-align: center; vertical-align: bottom\">\n";
echo "<form action=\"database.php\" method=\"post\">\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"analyze\" />\n";
echo $misc->form;
echo "<input type=\"submit\" value=\"{$lang['stranalyze']}\" /></p>\n";
echo "</form>\n";
echo "</td>\n";
}
echo "<td class=\"data1\" style=\"text-align: center; vertical-align: bottom\">\n";
echo "<form action=\"database.php\" method=\"post\">\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"analyze\" />\n";
echo $misc->form;
echo "<input type=\"submit\" value=\"{$lang['stranalyze']}\" /></p>\n";
echo "</form>\n";
echo "</td>\n";

// Recluster
if ($data->hasRecluster()){
Expand Down
2 changes: 1 addition & 1 deletion display.php
View file
Expand Up @@ -362,7 +362,7 @@ function doBrowse($msg = '') {
$finfo = $rs->fetchField($j);
// Display column headers with sorting options, unless we're PostgreSQL
// 7.0 and it's a non-TABLE mode
if (!$data->hasFullSubqueries() && $type != 'TABLE') {
if ($type != 'TABLE') {
echo "<th class=\"data\">", $misc->printVal($finfo->name), "</th>\n";
}
else {
Expand Down
10 changes: 2 additions & 8 deletions domains.php
View file
Expand Up @@ -151,10 +151,7 @@ function doDropConstraint($confirm, $msg = '') {
echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
echo "<input type=\"hidden\" name=\"constraint\" value=\"", htmlspecialchars($_REQUEST['constraint']), "\" />\n";
echo $misc->form;
// Show cascade drop option if supportd
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
Expand Down Expand Up @@ -254,10 +251,7 @@ function doDrop($confirm) {

echo "<p>", sprintf($lang['strconfdropdomain'], $misc->printVal($_REQUEST['domain'])), "</p>\n";
echo "<form action=\"domains.php\" method=\"post\">\n";
// Show cascade drop option if supportd
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
echo "<input type=\"hidden\" name=\"domain\" value=\"", htmlspecialchars($_REQUEST['domain']), "\" />\n";
echo $misc->form;
Expand Down
10 changes: 2 additions & 8 deletions fulltext.php
View file
Expand Up @@ -75,10 +75,7 @@ function doDropConfig($confirm) {
echo "<p>", sprintf($lang['strconfdropftsconfig'], $misc->printVal($_REQUEST['ftscfg'])), "</p>\n";

echo "<form action=\"fulltext.php\" method=\"post\">\n";
// Show cascade drop option if supported
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"dropconfig\" />\n";
echo "<input type=\"hidden\" name=\"database\" value=\"", htmlspecialchars($_REQUEST['database']), "\" />\n";
echo "<input type=\"hidden\" name=\"ftscfg\" value=\"", htmlspecialchars($_REQUEST['ftscfg']), "\" />\n";
Expand Down Expand Up @@ -110,10 +107,7 @@ function doDropDict($confirm) {
echo "<p>", sprintf($lang['strconfdropftsdict'], $misc->printVal($_REQUEST['ftsdict'])), "</p>\n";

echo "<form action=\"fulltext.php\" method=\"post\">\n";
// Show cascade drop option if supported
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<p><input type=\"hidden\" name=\"action\" value=\"dropdict\" />\n";
echo "<input type=\"hidden\" name=\"database\" value=\"", htmlspecialchars($_REQUEST['database']), "\" />\n";
echo "<input type=\"hidden\" name=\"ftsdict\" value=\"", htmlspecialchars($_REQUEST['ftsdict']), "\" />\n";
Expand Down
9 changes: 2 additions & 7 deletions functions.php
View file
Expand Up @@ -369,10 +369,7 @@ function doDrop($confirm) {
echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";

echo $misc->form;
// Show cascade drop option if supportd
if ($data->hasDropBehavior()) {
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
}
echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /><label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
echo "</form>\n";
Expand Down Expand Up @@ -826,9 +823,7 @@ function doDefault($msg = '') {
),
);

if ( !$data->hasFuncPrivs() ) {
unset($actions['privileges']);
}
unset($actions['privileges']);

$misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']);

Expand Down

0 comments on commit 6ec5a61

Please sign in to comment.