Drop hasSRFs() function.

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index be11546eca07686b9e401f930f24582305ee2ba7..05bc8fc651df485f8b0196ac4498f9d4b11bc154 100644 (file)
--- a/classes/database/BaseDB.php
+++ b/classes/database/BaseDB.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: BaseDB.php,v 1.52 2004/07/14 18:32:02 soranzo Exp $
+ * $Id: BaseDB.php,v 1.53 2004/07/14 19:09:38 soranzo Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');
@@ -257,7 +257,6 @@ class BaseDB extends ADODB_base {
        function hasIsClustered() { return false; }
        function hasDropBehavior() { return false; }
        function hasDropColumn() { return false; }
-       function hasSRFs() { return false; }
        function hasDomains() { return false; }
        function hasDomainConstraints() { return false; }
        function hasAlterTrigger() { return false; }

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index be4012faf1dc33d5130d5a53f2637caf02e4017b..cdd0cbe3f969b8ec7503e16ec9dcc82a3d344109 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.236 2004/07/14 18:32:02 soranzo Exp $
+ * $Id: Postgres.php,v 1.237 2004/07/14 19:09:38 soranzo Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -3896,7 +3896,6 @@ class Postgres extends BaseDB {
        function hasAggregates() { return true; }
        function hasIndicies() { return true; }
        function hasLanguages() { return true; }
-       function hasSRFs() { return true; }
        function hasOpClasses() { return true; }
        function hasFunctionRename() { return true; }
 

diff --git a/functions.php b/functions.php
index eb12306e98c7dbc2c1400d4f43ae55302c227621..60d529ed1323d3a8b4d36fc89e44b48f61dcb359 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.37 2004/07/13 16:13:15 jollytoad Exp $
+        * $Id: functions.php,v 1.38 2004/07/14 19:09:38 soranzo Exp $
         */
 
        // Include application functions
@@ -317,16 +317,12 @@
                        htmlspecialchars($_POST['formArguments']), "\" /></td>\n";
 
                echo "<td class=\"data1\">\n";
-               // If supports set-returning-functions, output setof option
-               if ($data->hasSRFs()) {
-                       echo "<select name=\"formSetOf\">\n";
-                       echo "<option value=\"\"", ($_POST['formSetOf'] == '') ? ' selected="selected"' : '', "></option>\n";
-                       echo "<option value=\"SETOF\"", ($_POST['formSetOf'] == 'SETOF') ? ' selected="selected"' : '', ">SETOF</option>\n";
-                       echo "</select>\n";
-               }
-               else {
-                       echo "<input type=\"hidden\" name=\"formSetOf\" value=\"\" />\n";
-               }
+               // Output setof option
+               echo "<select name=\"formSetOf\">\n";
+               echo '<option value=""', ($_POST['formSetOf'] == '') ? ' selected="selected"' : '', "></option>\n";
+               echo '<option value="SETOF"', ($_POST['formSetOf'] == 'SETOF') ? ' selected="selected"' : '', ">SETOF</option>\n";
+               echo "</select>\n";
+
                // Output return type list              
                echo "<select name=\"formReturns\">\n";
                while (!$types->EOF) {