Drop CASCADE for sequences

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 12377ee4aec8c478523e50d71cc560578f019718..9fdc06ff02e9cf791c58a3dad7aed359b75410f6 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.84 2003/04/30 07:02:20 chriskl Exp $
+ * $Id: Postgres.php,v 1.85 2003/04/30 07:31:16 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -830,12 +830,14 @@ class Postgres extends BaseDB {
        /** 
         * Drops a given sequence
         * @param $sequence Sequence name
+        * @param $cascade True to cascade drop, false to restrict
         * @return 0 success
         */
-       function &dropSequence($sequence) {
+       function &dropSequence($sequence, $cascade) {
                $this->fieldClean($sequence);
                
                $sql = "DROP SEQUENCE \"{$sequence}\"";
+               if ($cascade) $sql .= " CASCADE";
                
                return $this->execute($sql);
        }

diff --git a/sequences.php b/sequences.php
index 9aa77a3c90b1767b9332852c12cf8c355e5926c1..aee73d2558ccec756e823dc43c9bbe2af2132f1e 100644 (file)
--- a/sequences.php
+++ b/sequences.php
@@ -3,7 +3,7 @@
        /**
         * Manage sequences in a database
         *
-        * $Id: sequences.php,v 1.9 2003/04/18 11:08:27 chriskl Exp $
+        * $Id: sequences.php,v 1.10 2003/04/30 07:31:15 chriskl Exp $
         */
        
        // Include application functions
@@ -107,11 +107,15 @@
                        echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
                        echo "<input type=\"hidden\" name=\"sequence\" value=\"", htmlspecialchars($_REQUEST['sequence']), "\" />\n";
                        echo $misc->form;
+                       // Show cascade drop option if supportd
+                       if ($localData->hasDropBehavior()) {
+                               echo "<p><input type=\"checkbox\" name=\"cascade\"> {$lang['strcascade']}</p>\n";
+                       }
                        echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" /> <input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />\n";
                        echo "</form>\n";
                }
                else {
-                       $status = $localData->dropSequence($_POST['sequence']);
+                       $status = $localData->dropSequence($_POST['sequence'], isset($_POST['cascade']));
                        if ($status == 0)
                                doDefault($lang['strsequencedropped']);
                        else