Some cleanup in the sequence capabilities

- remove hasAlterSequenceOwner as all supported pg backends support it
- rename hasSequenceAlterSchema as hasAlterSequenceSchema to follow the naming rule

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 2612828f3ca913b00db27b9e2c0481573cfd7e98..0f64514ecfbc6361918c5dd604dca6ac03069c71 100755 (executable)
--- 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 fef9c469364ba663f256f9a2089ff29a0dc5840c..1e1d6ce9f0c422270f3d5a7a5574d9bee6c9c3a5 100644 (file)
--- 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 06b7725c139a8149b697179a8eedc8ac1da20f82..2333878f6ab80f668e7541b5efa4f84810c46424 100644 (file)
--- 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\">";