From: soranzo <soranzo>
Date: Wed, 14 Jul 2004 19:09:38 +0000 (+0000)
Subject: Drop hasSRFs() function.
X-Git-Tag: REL_3-5-1~125
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=a9de653a18d4626fbcf7be5dbe2d14f231442547;p=phppgadmin.git

Drop hasSRFs() function.
---

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index be11546e..05bc8fc6 100644
--- 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 be4012fa..cdd0cbe3 100755
--- 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 eb12306e..60d529ed 100644
--- 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) {