Fix Pg73 doesn't support altering a domain. Add drop link on the domain properties...

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 66b13a509618b3ee285bf9ddbaa8ccad91f9817a..0e3425d29c9abac6992d7f78517a3a2dffb41358 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4875,6 +4875,7 @@ class Postgres extends ADODB_base {
        function hasDropBehavior() { return false; }
        function hasDropColumn() { return false; }
        function hasDomains() { return false; }
+       function hasAlterDomains() { return false; }
        function hasDomainConstraints() { return false; }
        function hasAlterTrigger() { return false; }
        function hasWithoutOIDs() { return false; }

diff --git a/classes/database/Postgres74.php b/classes/database/Postgres74.php
index 435f07d839bd16e6ae9cd0dc411b41b142654145..129e731fae1addfd94b7fe0f10f450a6b19958c2 100644 (file)
--- a/classes/database/Postgres74.php
+++ b/classes/database/Postgres74.php
@@ -858,6 +858,7 @@ class Postgres74 extends Postgres73 {
        function hasAlterDatabaseRename() { return true; }
        function hasAlterSchema() { return true; }
        function hasGrantOption() { return true; }
+       function hasAlterDomains() { return true; }
        function hasDomainConstraints() { return true; }
        function hasUserRename() { return true; }
        function hasRecluster() { return true; }

diff --git a/domains.php b/domains.php
index 07cb9a716c008fd17c83b01d9a4c13830c760305..3ca1835e5b20f804be5647dd30820150b3f4133c 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -231,13 +231,14 @@
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
                
-               echo "<ul class=\"navlink\">\n\t<li><a href=\"domains.php?{$misc->href}\">{$lang['strshowalldomains']}</a></li>\n";
-               if ($data->hasDomainConstraints()) {
+               echo "<ul class=\"navlink\">\n\t<li><a href=\"domains.php?action=confirm_drop&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),"\">{$lang['strdrop']}</a></li>\n";
+               if ($data->hasAlterDomains()) {
                        echo "\t<li><a href=\"domains.php?action=add_check&amp;{$misc->href}&amp;domain=", urlencode($_REQUEST['domain']),
                                "\">{$lang['straddcheck']}</a></li>\n";
                        echo "\t<li><a href=\"domains.php?action=alter&amp;{$misc->href}&amp;domain=", 
                                urlencode($_REQUEST['domain']), "\">{$lang['stralter']}</a></li>\n";
                }
+               
                echo "</ul>\n";
        }
        
@@ -419,6 +420,9 @@
                                'vars'  => array('domain' => 'domname'),
                        ),
                );
+
+               if (!$data->hasAlterDomains())
+                       unset($actions['alter']);
                
                $misc->printTable($domains, $columns, $actions, $lang['strnodomains']);