Incrementally use ->fields for recordsets, ->f is not supported by upstream adodb.

10 files changed, 96 insertions, 96 deletions

diff --git a/aggregates.php b/aggregates.php
index 575ddfcb..3ee6480f 100644
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage aggregates in a database
 	 *
-	 * $Id: aggregates.php,v 1.16 2007/01/02 17:24:44 soranzo Exp $
+	 * $Id: aggregates.php,v 1.17 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -150,19 +150,19 @@
 
 			// Display aggregate's name, owner and schema
 			echo "\t<tr>\n\t\t<td><input name=\"newaggrname\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" /></td>";
-			echo "<td><input name=\"newaggrowner\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($aggrdata->f['usename']), "\" /></td>";
+			echo "<td><input name=\"newaggrowner\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($aggrdata->fields['usename']), "\" /></td>";
 			echo "<td><input name=\"newaggrschema\" size=\"32\" maxlength=\"32\" value=\"", htmlspecialchars($_REQUEST['schema']), "\" /></td>\n\t</tr>\n";
 			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
 			echo "\t\t<td><textarea name=\"newaggrcomment\" rows=\"3\" cols=\"32\">", 
-				htmlspecialchars($aggrdata->f['aggrcomment']), "</textarea></td>\n\t</tr>\n";
+				htmlspecialchars($aggrdata->fields['aggrcomment']), "</textarea></td>\n\t</tr>\n";
 			echo "</table>\n";
 			echo "<p><input type=\"hidden\" name=\"action\" value=\"save_alter\" />\n";
 			echo $misc->form;
 			echo "<input type=\"hidden\" name=\"aggrname\" value=\"", htmlspecialchars($_REQUEST['aggrname']), "\" />\n";
 			echo "<input type=\"hidden\" name=\"aggrtype\" value=\"", htmlspecialchars($_REQUEST['aggrtype']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"aggrowner\" value=\"", htmlspecialchars($aggrdata->f['usename']), "\" />\n";
+			echo "<input type=\"hidden\" name=\"aggrowner\" value=\"", htmlspecialchars($aggrdata->fields['usename']), "\" />\n";
 			echo "<input type=\"hidden\" name=\"aggrschema\" value=\"", htmlspecialchars($_REQUEST['schema']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"aggrcomment\" value=\"", htmlspecialchars($aggrdata->f['aggrcomment']), "\" />\n";
+			echo "<input type=\"hidden\" name=\"aggrcomment\" value=\"", htmlspecialchars($aggrdata->fields['aggrcomment']), "\" />\n";
 			echo "<input type=\"submit\" name=\"alter\" value=\"{$lang['stralter']}\" />\n";
 			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
 		} else {
@@ -232,19 +232,19 @@
 			echo "<tr>\n\t<td class=\"data2\">{$lang['straggrbasetype']}</td>\n";
 			echo "\t<td class=\"data2\">", htmlspecialchars($_REQUEST['aggrtype']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data1\">{$lang['straggrsfunc']}</td>\n";
-			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggtransfn']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggtransfn']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data2\">{$lang['straggrstype']}</td>\n";
-			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['aggstype']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['aggstype']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data1\">{$lang['straggrffunc']}</td>\n";
-			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggfinalfn']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggfinalfn']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data2\">{$lang['straggrinitcond']}</td>\n";
-			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['agginitval']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['agginitval']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data1\">{$lang['straggrsortop']}</td>\n";
-			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->f['aggsortop']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data1\">", htmlspecialchars($aggrdata->fields['aggsortop']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data2\">{$lang['strowner']}</td>\n";
-			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->f['usename']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data2\">", htmlspecialchars($aggrdata->fields['usename']), "</td>\n</tr>\n";
 			echo "<tr>\n\t<td class=\"data1\">{$lang['strcomment']}</td>\n";
-			echo "\t<td class=\"data1\">", $misc->printVal($aggrdata->f['aggrcomment']), "</td>\n</tr>\n";
+			echo "\t<td class=\"data1\">", $misc->printVal($aggrdata->fields['aggrcomment']), "</td>\n</tr>\n";
 			echo "</table>\n";
 		}
 		else echo "<p>{$lang['strnodata']}</p>\n";
diff --git a/colproperties.php b/colproperties.php
index 5657f670..383730fc 100644
--- a/colproperties.php
+++ b/colproperties.php
@@ -50,33 +50,33 @@
 				echo "<th class=\"data\">{$lang['strnotnull']}</th><th class=\"data\">{$lang['strdefault']}</th><th class=\"data\">{$lang['strcomment']}</th></tr>";
 
 				$column = $data->getTableAttributes($_REQUEST['table'], $_REQUEST['column']);
-				$column->f['attnotnull'] = $data->phpBool($column->f['attnotnull']);
+				$column->fields['attnotnull'] = $data->phpBool($column->fields['attnotnull']);
 
 				// Upon first drawing the screen, load the existing column information
 				// from the database.
 				if (!isset($_REQUEST['default'])) {
-					$_REQUEST['field'] = $column->f['attname'];
-					$_REQUEST['type'] = $column->f['base_type'];
+					$_REQUEST['field'] = $column->fields['attname'];
+					$_REQUEST['type'] = $column->fields['base_type'];
 					// Check to see if its' an array type...
 					// XXX: HACKY
-					if (substr($column->f['base_type'], strlen($column->f['base_type']) - 2) == '[]') {
-						$_REQUEST['type'] = substr($column->f['base_type'], 0, strlen($column->f['base_type']) - 2);
+					if (substr($column->fields['base_type'], strlen($column->fields['base_type']) - 2) == '[]') {
+						$_REQUEST['type'] = substr($column->fields['base_type'], 0, strlen($column->fields['base_type']) - 2);
 						$_REQUEST['array'] = '[]';
 					}
 					else {
-						$_REQUEST['type'] = $column->f['base_type'];
+						$_REQUEST['type'] = $column->fields['base_type'];
 						$_REQUEST['array'] = '';
 					}
 					// To figure out the length, look in the brackets :(
 					// XXX: HACKY
-					if ($column->f['type'] != $column->f['base_type'] && ereg('\\(([0-9, ]*)\\)', $column->f['type'], $bits)) {
+					if ($column->fields['type'] != $column->fields['base_type'] && ereg('\\(([0-9, ]*)\\)', $column->fields['type'], $bits)) {
 						$_REQUEST['length'] = $bits[1];
 					}
 					else
 						$_REQUEST['length'] = '';
-					$_REQUEST['default'] = $_REQUEST['olddefault'] = $column->f['adsrc'];
-					if ($column->f['attnotnull']) $_REQUEST['notnull'] = 'YES';
-					$_REQUEST['comment'] = $column->f['comment'];
+					$_REQUEST['default'] = $_REQUEST['olddefault'] = $column->fields['adsrc'];
+					if ($column->fields['attnotnull']) $_REQUEST['notnull'] = 'YES';
+					$_REQUEST['comment'] = $column->fields['comment'];
 				}				
 
 				// Column name
@@ -96,7 +96,7 @@
 							$misc->printVal($v), "</option>\n";
 					}
 					while (!$types->EOF) {
-						$typname = $types->f['typname'];
+						$typname = $types->fields['typname'];
 						echo "<option value=\"", htmlspecialchars($typname), "\"", ($typname == $_REQUEST['type']) ? ' selected="selected"' : '', ">",
 							$misc->printVal($typname), "</option>\n";
 						$types->moveNext();
@@ -113,7 +113,7 @@
 						htmlspecialchars($_REQUEST['length']), "\" /></td>";
 				} else {
 					// Otherwise draw the read-only type name
-					echo "<td>", $misc->printVal($data->formatType($column->f['type'], $column->f['atttypmod'])), "</td>";
+					echo "<td>", $misc->printVal($data->formatType($column->fields['type'], $column->fields['atttypmod'])), "</td>";
 				}
 				
 				echo "<td><input type=\"checkbox\" name=\"notnull\"", (isset($_REQUEST['notnull'])) ? ' checked="checked"' : '', " /></td>\n";
@@ -129,8 +129,8 @@
 				echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
 				echo "<input type=\"hidden\" name=\"column\" value=\"", htmlspecialchars($_REQUEST['column']), "\" />\n";
 				echo "<input type=\"hidden\" name=\"olddefault\" value=\"", htmlspecialchars($_REQUEST['olddefault']), "\" />\n";
-				if ($column->f['attnotnull']) echo "<input type=\"hidden\" name=\"oldnotnull\" value=\"on\" />\n";
-				echo "<input type=\"hidden\" name=\"oldtype\" value=\"", htmlspecialchars($data->formatType($column->f['type'], $column->f['atttypmod'])), "\" />\n";
+				if ($column->fields['attnotnull']) echo "<input type=\"hidden\" name=\"oldnotnull\" value=\"on\" />\n";
+				echo "<input type=\"hidden\" name=\"oldtype\" value=\"", htmlspecialchars($data->formatType($column->fields['type'], $column->fields['atttypmod'])), "\" />\n";
 				// Add hidden variables to suppress error notices if we don't support altering column type
 				if (!$data->hasAlterColumnType()) {
 					echo "<input type=\"hidden\" name=\"type\" value=\"", htmlspecialchars($_REQUEST['type']), "\" />\n";				
@@ -184,7 +184,7 @@
 
 		function attPre(&$rowdata) {
 			global $data;
-			$rowdata->f['+type'] = $data->formatType($rowdata->f['type'], $rowdata->f['atttypmod']);
+			$rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
 		}
 		
 		if (empty($_REQUEST['column']))
@@ -202,8 +202,8 @@
 			$attrs = $data->getTableAttributes($tableName, $_REQUEST['column']);
 
 			// Show comment if any
-			if ($attrs->f['comment'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($attrs->f['comment']), "</p>\n";
+			if ($attrs->fields['comment'] !== null)
+				echo "<p class=\"comment\">", $misc->printVal($attrs->fields['comment']), "</p>\n";
 
 			$column = array(
 				'column' => array(
diff --git a/constraints.php b/constraints.php
index ce117402..fe1d1614 100644
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
 	/**
 	 * List constraints on a table
 	 *
-	 * $Id: constraints.php,v 1.43 2006/06/17 12:57:36 xzilla Exp $
+	 * $Id: constraints.php,v 1.44 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -58,7 +58,7 @@
 
 					if ($attrs->recordCount() > 0) {
 						while (!$attrs->EOF) {
-							$selColumns->add(new XHTML_Option($attrs->f['attname']));
+							$selColumns->add(new XHTML_Option($attrs->fields['attname']));
 							$attrs->moveNext();
 						}
 					}
@@ -161,7 +161,7 @@
 
 				if ($attrs->recordCount() > 0) {
 					while (!$attrs->EOF) {
-						$selColumns->add(new XHTML_Option($attrs->f['attname']));
+						$selColumns->add(new XHTML_Option($attrs->fields['attname']));
 						$attrs->moveNext();
 					}
 				}
@@ -190,13 +190,13 @@
 				echo "<tr>";
 				echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
 				while (!$tables->EOF) {
-					$key = array('schemaname' => $tables->f['nspname'], 'tablename' => $tables->f['relname']);
+					$key = array('schemaname' => $tables->fields['nspname'], 'tablename' => $tables->fields['relname']);
 					$key = serialize($key);
 					echo "<option value=\"", htmlspecialchars($key), "\">";
-					if ($data->hasSchemas() && $tables->f['nspname'] != $_REQUEST['schema']) {
-							echo htmlspecialchars($tables->f['nspname']), '.';
+					if ($data->hasSchemas() && $tables->fields['nspname'] != $_REQUEST['schema']) {
+							echo htmlspecialchars($tables->fields['nspname']), '.';
 					}
-					echo htmlspecialchars($tables->f['relname']), "</option>\n";
+					echo htmlspecialchars($tables->fields['relname']), "</option>\n";
 					$tables->moveNext();	
 				}
 				echo "</select>\n";
@@ -254,7 +254,7 @@
 	
 			if ($attrs->recordCount() > 0) {
 				while (!$attrs->EOF) {
-					$selColumns->add(new XHTML_Option($attrs->f['attname']));
+					$selColumns->add(new XHTML_Option($attrs->fields['attname']));
 					$attrs->moveNext();
 				} 
 			}
@@ -291,7 +291,7 @@
 					($_POST['tablespace'] == '') ? ' selected="selected"' : '', "></option>\n";
 				// Display all other tablespaces
 				while (!$tablespaces->EOF) {
-					$spcname = htmlspecialchars($tablespaces->f['spcname']);
+					$spcname = htmlspecialchars($tablespaces->fields['spcname']);
 					echo "\t\t\t\t<option value=\"{$spcname}\"",
 						($spcname == $_POST['tablespace']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
 					$tablespaces->moveNext();
@@ -437,11 +437,11 @@
 
 		function cnPre(&$rowdata) {
 			global $data, $lang;
-			if (is_null($rowdata->f['consrc'])) {
-				$atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->f['indkey']));
-				$rowdata->f['+definition'] = ($rowdata->f['contype'] == 'u' ? "UNIQUE (" : "PRIMARY KEY (") . join(',', $atts) . ')';
+			if (is_null($rowdata->fields['consrc'])) {
+				$atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->fields['indkey']));
+				$rowdata->fields['+definition'] = ($rowdata->fields['contype'] == 'u' ? "UNIQUE (" : "PRIMARY KEY (") . join(',', $atts) . ')';
 			} else {
-				$rowdata->f['+definition'] = $rowdata->f['consrc'];
+				$rowdata->fields['+definition'] = $rowdata->fields['consrc'];
 			}
 		}
 		
diff --git a/dataexport.php b/dataexport.php
index e330edcb..14e2ceab 100644
--- a/dataexport.php
+++ b/dataexport.php
@@ -4,7 +4,7 @@
 	 * Does an export to the screen or as a download.  This checks to
 	 * see if they have pg_dump set up, and will use it if possible.
 	 *
-	 * $Id: dataexport.php,v 1.23 2006/06/17 12:57:36 xzilla Exp $
+	 * $Id: dataexport.php,v 1.24 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	$extensions = array(
@@ -124,7 +124,7 @@
 				echo " FROM stdin;\n";
 				while (!$rs->EOF) {
 					$first = true;
-					while(list($k, $v) = each($rs->f)) {
+					while(list($k, $v) = each($rs->fields)) {
 						// Escape value
 						$v = $data->escapeBytea($v);
 						
@@ -154,7 +154,7 @@
 				if (!$rs->EOF) {
 					// Output header row
 					$j = 0;
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($j++);
 						if ($finfo->name == $data->id && !$oids) continue;
 						echo "\t\t<th>", $misc->printVal($finfo->name, true), "</th>\r\n";
@@ -164,7 +164,7 @@
 				while (!$rs->EOF) {
 					echo "\t<tr>\r\n";
 					$j = 0;
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($j++);
 						if ($finfo->name == $data->id && !$oids) continue;
 						echo "\t\t<td>", $misc->printVal($v, true, $finfo->type), "</td>\r\n";
@@ -186,7 +186,7 @@
 					// Output header row
 					$j = 0;
 					echo "\t<header>\n";
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($j++);
 						$name = htmlspecialchars($finfo->name);
 						$type = htmlspecialchars($finfo->type);
@@ -198,7 +198,7 @@
 				while (!$rs->EOF) {
 					$j = 0;
 					echo "\t\t<row>\n";
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($j++);
 						$name = htmlspecialchars($finfo->name);
 						if ($v != null) $v = htmlspecialchars($v);
@@ -216,7 +216,7 @@
 					echo "INSERT INTO \"{$_REQUEST['table']}\" (";
 					$first = true;
 					$j = 0;
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($j++);
 						$k = $finfo->name;
 						// SQL (INSERT) format cannot handle oids
@@ -259,7 +259,7 @@
 				if (!$rs->EOF) {
 					// Output header row
 					$first = true;
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						$finfo = $rs->fetchField($k);
 						$v = $finfo->name;
 						if ($v != null) $v = str_replace('"', '""', $v);
@@ -273,7 +273,7 @@
 				}
 				while (!$rs->EOF) {
 					$first = true;
-					foreach ($rs->f as $k => $v) {
+					foreach ($rs->fields as $k => $v) {
 						if ($v != null) $v = str_replace('"', '""', $v);
 						if ($first) {
 							echo ($v == null) ? "\"\\N\"" : "\"{$v}\"";
diff --git a/groups.php b/groups.php
index 0a97cf56..fba7ea2a 100644
--- a/groups.php
+++ b/groups.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage groups in a database cluster
 	 *
-	 * $Id: groups.php,v 1.21 2005/10/18 03:45:16 chriskl Exp $
+	 * $Id: groups.php,v 1.22 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -80,9 +80,9 @@
            	$i = 0;
            	while (!$groupdata->EOF) {
 					$id = (($i % 2) == 0 ? '1' : '2');
-            	echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->f['usename']), "</td>\n";
+            	echo "<tr><td class=\"data{$id}\">", $misc->printVal($groupdata->fields['usename']), "</td>\n";
 					echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop_member&{$misc->href}&group=",
-						urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->f['usename']), "\">{$lang['strdrop']}</a></td>\n";
+						urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->fields['usename']), "\">{$lang['strdrop']}</a></td>\n";
             	echo "</tr>\n";
             	$groupdata->moveNext();
            	}
@@ -94,7 +94,7 @@
 		echo "<form action=\"{$PHP_SELF}\" method=\"post\">\n";
 		echo "<select name=\"user\">";
 		while (!$users->EOF) {
-			$uname = $misc->printVal($users->f['usename']);
+			$uname = $misc->printVal($users->fields['usename']);
 			echo "<option value=\"{$uname}\"",
 				($uname == $_POST['user']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
 			$users->moveNext();
@@ -167,7 +167,7 @@
 			echo "\t\t<td class=\"data\">\n";
 			echo "\t\t\t<select name=\"members[]\" multiple=\"multiple\" size=\"", min(40, $users->recordCount()), "\">\n";
 			while (!$users->EOF) {
-				$username = $users->f['usename'];
+				$username = $users->fields['usename'];
 				echo "\t\t\t\t<option value=\"{$username}\"",
 						(in_array($username, $_POST['members']) ? ' selected="selected"' : ''), ">", $misc->printVal($username), "</option>\n";
 				$users->moveNext();
diff --git a/indexes.php b/indexes.php
index 67f994a5..da3aa474 100644
--- a/indexes.php
+++ b/indexes.php
@@ -3,7 +3,7 @@
 	/**
 	 * List indexes on a table
 	 *
-	 * $Id: indexes.php,v 1.38 2006/06/17 12:57:36 xzilla Exp $
+	 * $Id: indexes.php,v 1.39 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -92,7 +92,7 @@
 
 		if ($attrs->recordCount() > 0) {
 			while (!$attrs->EOF) {
-				$selColumns->add(new XHTML_Option($attrs->f['attname']));
+				$selColumns->add(new XHTML_Option($attrs->fields['attname']));
 				$attrs->moveNext();
 			}
 		}
@@ -154,7 +154,7 @@
 				($_POST['formSpc'] == '') ? ' selected="selected"' : '', "></option>\n";
 			// Display all other tablespaces
 			while (!$tablespaces->EOF) {
-				$spcname = htmlspecialchars($tablespaces->f['spcname']);
+				$spcname = htmlspecialchars($tablespaces->fields['spcname']);
 				echo "\t\t\t\t<option value=\"{$spcname}\"",
 					($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>\n";
 				$tablespaces->moveNext();
@@ -241,16 +241,16 @@
 		function indPre(&$rowdata, $actions) {
 			global $data, $lang;
 			
-			if ($data->phpBool($rowdata->f['indisprimary'])) {
-				$rowdata->f['+constraints'] = $lang['strprimarykey'];
+			if ($data->phpBool($rowdata->fields['indisprimary'])) {
+				$rowdata->fields['+constraints'] = $lang['strprimarykey'];
 				$actions['drop']['disable'] = true;
 			}
-			elseif ($data->phpBool($rowdata->f['indisunique'])) {
-				$rowdata->f['+constraints'] = $lang['struniquekey'];
+			elseif ($data->phpBool($rowdata->fields['indisunique'])) {
+				$rowdata->fields['+constraints'] = $lang['struniquekey'];
 				$actions['drop']['disable'] = true;
 			}
 			else
-				$rowdata->f['+constraints'] = '';
+				$rowdata->fields['+constraints'] = '';
 			
 			return $actions;
 		}
diff --git a/operators.php b/operators.php
index 70c43b77..91bd609a 100644
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage operators in a database
 	 *
-	 * $Id: operators.php,v 1.22 2006/06/17 12:57:36 xzilla Exp $
+	 * $Id: operators.php,v 1.23 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -25,36 +25,36 @@
 		$misc->printMsg($msg);
 		
 		$oprdata = $data->getOperator($_REQUEST['operator_oid']);
-		$oprdata->f['oprcanhash'] = $data->phpBool($oprdata->f['oprcanhash']);
+		$oprdata->fields['oprcanhash'] = $data->phpBool($oprdata->fields['oprcanhash']);
 
 		if ($oprdata->recordCount() > 0) {
 			echo "<table>\n";
 			echo "<tr><th class=\"data left\">{$lang['strname']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprname']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprname']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strleftarg']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprleftname']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprleftname']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strrightarg']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrightname']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrightname']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strcommutator']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprcom']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprcom']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strnegator']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprnegate']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprnegate']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strjoin']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprjoin']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprjoin']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strhashes']}</th>\n";
-			echo "<td class=\"data1\">", ($oprdata->f['oprcanhash']) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+			echo "<td class=\"data1\">", ($oprdata->fields['oprcanhash']) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strmerges']}</th>\n";
-			echo "<td class=\"data1\">", ($oprdata->f['oprlsortop'] !== '0' && $oprdata->f['oprrsortop'] !== '0') ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
+			echo "<td class=\"data1\">", ($oprdata->fields['oprlsortop'] !== '0' && $oprdata->fields['oprrsortop'] !== '0') ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strrestrict']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrest']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrest']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strleftsort']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprlsortop']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprlsortop']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strrightsort']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprrsortop']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprrsortop']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strlessthan']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprltcmpop']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprltcmpop']), "</td></tr>\n";
 			echo "<tr><th class=\"data left\">{$lang['strgreaterthan']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($oprdata->f['oprgtcmpop']), "</td></tr>\n";
+			echo "<td class=\"data1\">", $misc->printVal($oprdata->fields['oprgtcmpop']), "</td></tr>\n";
 			echo "</table>\n";
 
 			echo "<p><a class=\"navlink\" href=\"$PHP_SELF?{$misc->href}\">{$lang['strshowalloperators']}</a></p>\n";
diff --git a/privileges.php b/privileges.php
index f019a2cf..b60a6333 100644
--- a/privileges.php
+++ b/privileges.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage privileges in a database
 	 *
-	 * $Id: privileges.php,v 1.39 2006/06/17 12:57:36 xzilla Exp $
+	 * $Id: privileges.php,v 1.40 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -50,9 +50,9 @@
 			echo "<tr><th class=\"data left\">{$lang['strusers']}</th>\n";
 			echo "<td class=\"data1\"><select name=\"username[]\" multiple=\"multiple\" size=\"", min(6, $users->recordCount()), "\">\n";
 			while (!$users->EOF) {
-				$uname = htmlspecialchars($users->f['usename']);
+				$uname = htmlspecialchars($users->fields['usename']);
 				echo "<option value=\"{$uname}\"",
-					in_array($users->f['usename'], $_REQUEST['username']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
+					in_array($users->fields['usename'], $_REQUEST['username']) ? ' selected="selected"' : '', ">{$uname}</option>\n";
 				$users->moveNext();
 			}
 			echo "</select></td></tr>\n";
@@ -63,9 +63,9 @@
 			if ($groups->recordCount() > 0) {
 				echo "<br /><select name=\"groupname[]\" multiple=\"multiple\" size=\"", min(6, $groups->recordCount()), "\">\n";
 				while (!$groups->EOF) {
-					$gname = htmlspecialchars($groups->f['groname']);
+					$gname = htmlspecialchars($groups->fields['groname']);
 					echo "<option value=\"{$gname}\"",
-						in_array($groups->f['groname'], $_REQUEST['groupname']) ? ' selected="selected"' : '', ">{$gname}</option>\n";
+						in_array($groups->fields['groname'], $_REQUEST['groupname']) ? ' selected="selected"' : '', ">{$gname}</option>\n";
 					$groups->moveNext();
 				}
 				echo "</select>\n";
diff --git a/tablespaces.php b/tablespaces.php
index 1a7fb37a..cdade039 100755
--- a/tablespaces.php
+++ b/tablespaces.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage tablespaces in a database cluster
 	 *
-	 * $Id: tablespaces.php,v 1.11 2007/01/02 17:24:44 soranzo Exp $
+	 * $Id: tablespaces.php,v 1.12 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -31,10 +31,10 @@
 		
 		if ($tablespace->recordCount() > 0) {
 			
-			if (!isset($_POST['name'])) $_POST['name'] = $tablespace->f['spcname'];
-			if (!isset($_POST['owner'])) $_POST['owner'] = $tablespace->f['spcowner'];
+			if (!isset($_POST['name'])) $_POST['name'] = $tablespace->fields['spcname'];
+			if (!isset($_POST['owner'])) $_POST['owner'] = $tablespace->fields['spcowner'];
 			if (!isset($_POST['comment'])) {
-				$_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->f['spccomment'] : '';
+				$_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->fields['spccomment'] : '';
 			}
 			
 			echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -47,7 +47,7 @@
 			echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
 			echo "<td class=\"data1\"><select name=\"owner\">";
 			while (!$users->EOF) {
-				$uname = $users->f['usename'];
+				$uname = $users->fields['usename'];
 				echo "<option value=\"", htmlspecialchars($uname), "\"",
 					($uname == $_POST['owner']) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
 				$users->moveNext();
@@ -152,7 +152,7 @@
 		echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strowner']}</th>\n";
 		echo "\t\t<td class=\"data1\"><select name=\"formOwner\">\n";
 		while (!$users->EOF) {
-			$uname = $users->f['usename'];
+			$uname = $users->fields['usename'];
 			echo "\t\t\t<option value=\"", htmlspecialchars($uname), "\"",
 				($uname == $_POST['formOwner']) ? ' selected="selected"' : '', ">", htmlspecialchars($uname), "</option>\n";
 			$users->moveNext();
diff --git a/triggers.php b/triggers.php
index 38c88f8b..47f3686b 100644
--- a/triggers.php
+++ b/triggers.php
@@ -3,7 +3,7 @@
 	/**
 	 * List triggers on a table
 	 *
-	 * $Id: triggers.php,v 1.30 2006/08/13 15:31:13 xzilla Exp $
+	 * $Id: triggers.php,v 1.31 2007/01/15 15:48:17 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -41,7 +41,7 @@
 		
 		if ($triggerdata->recordCount() > 0) {
 			
-			if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->f['tgname'];
+			if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->fields['tgname'];
 			
 			echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
 			echo "<table>\n";
@@ -185,7 +185,7 @@
 		/* Populate functions */
 		$sel0 = new XHTML_Select('formFunction');
 		while (!$funcs->EOF) {
-			$sel0->add(new XHTML_Option($funcs->f['proname']));
+			$sel0->add(new XHTML_Option($funcs->fields['proname']));
 			$funcs->moveNext();
 		}
 
@@ -269,9 +269,9 @@
 		function tgPre(&$rowdata) {
 			global $data, $lang;
 			// Nasty hack to support pre-7.4 PostgreSQL
-			$rowdata->f['+tgdef'] = $rowdata->f['tgdef'] !== null
-									? $rowdata->f['tgdef']
-									: $data->getTriggerDef($rowdata->f);
+			$rowdata->fields['+tgdef'] = $rowdata->fields['tgdef'] !== null
+									? $rowdata->fields['tgdef']
+									: $data->getTriggerDef($rowdata->fields);
 		}
 		
 		$misc->printTrail('table');