From 58fdddba18427666ebbbd2024d4d35c1a505a378 Mon Sep 17 00:00:00 2001
From: "Guillaume (ioguix) de Rorthais" <ioguix@free.fr>
Date: Sun, 30 Nov 2008 23:16:09 -0500
Subject: [PATCH] Some cleanup in the sequence capabilities - remove
 hasAlterSequenceOwner as all supported pg backends support it - rename
 hasSequenceAlterSchema as hasAlterSequenceSchema to follow the naming rule

---
 classes/database/Postgres.php   | 9 ++++-----
 classes/database/Postgres80.php | 2 +-
 sequences.php                   | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 2612828f..0f64514e 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -2693,7 +2693,7 @@ class Postgres extends ADODB_base {
 	 * @param $minvalue The sequence minimum value
 	 * @param $maxvalue The sequence maximum value
 	 * @param $startvalue The sequence current value
-	 * @param $cachevalue Thesequence cache value
+	 * @param $cachevalue The sequence cache value
 	 * @param $cycledvalue Sequence can cycle ?
 	 * @return 0 success
 	 */
@@ -2710,8 +2710,8 @@ class Postgres extends ADODB_base {
 		if (!is_null($cycledvalue))	$sql .= (!$cycledvalue ? ' NO ' : '') . " CYCLE";
 		if ($sql != '') {
 			$sql = "ALTER SEQUENCE \"{$this->_schema}\".\"{$seqrs->fields['seqname']}\" {$sql}";
-		return $this->execute($sql);
-	}
+			return $this->execute($sql);
+		}
 		return 0;
 	}
 
@@ -7386,8 +7386,8 @@ class Postgres extends ADODB_base {
 	function hasAlterDatabaseRename() { return true; }
 	function hasAlterSchema() { return true; }
 	function hasAlterSchemaOwner() { return true; }
-	function hasAlterSequenceOwner() { return true; }
 	function hasAlterSequenceProps() { return true; }
+	function hasAlterSequenceSchema() { return true; }
 	function hasAlterTableOwner() { return true; }
 	function hasAlterTableSchema() { return true; }
 	function hasAlterTrigger() { return true; }
@@ -7426,7 +7426,6 @@ class Postgres extends ADODB_base {
 	function hasReadOnlyQueries() { return true; }
 	function hasRecluster() { return true; }
 	function hasRoles() { return true; }
-	function hasSequenceAlterSchema() { return true; }
 	function hasServerAdminFuncs() { return true; }
 	function hasSharedComments() { return true; }
 	function hasSignals() { return true; }
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index fef9c469..1e1d6ce9 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -322,7 +322,7 @@ class Postgres80 extends Postgres81 {
 	function hasFunctionAlterSchema() { return false; }
 	function hasPreparedXacts() { return false; }
 	function hasRoles() { return false; }
-	function hasSequenceAlterSchema() { return false; }
+	function hasAlterSequenceSchema() { return false; }
 	function hasServerAdminFuncs() { return false; }
 }
 ?>
diff --git a/sequences.php b/sequences.php
index 06b7725c..2333878f 100644
--- a/sequences.php
+++ b/sequences.php
@@ -457,7 +457,7 @@
 				htmlspecialchars($_POST['name']), "\" /></td></tr>\n";
 
 			$server_info = $misc->getServerInfo();
-			if ($data->hasAlterSequenceOwner() && $data->isSuperUser($server_info['username'])) {
+			if ($data->isSuperUser($server_info['username'])) {
 				// Fetch all users
 				$users = $data->getUsers();
 
@@ -472,7 +472,7 @@
 				echo "</select></td></tr>\n";
 			}
 			
-			if ($data->hasSequenceAlterSchema()) {
+			if ($data->hasAlterSequenceSchema()) {
 				$schemas = $data->getSchemas();
 				echo "<tr><th class=\"data left required\">{$lang['strschema']}</th>\n";
 				echo "<td class=\"data1\"><select name=\"newschema\">";
-- 
2.39.5