diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 0178e327d..f579f2997 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -3498,11 +3498,10 @@ function getConstraints($table) {
 	 * @return a recordset
 	 */
 	function getConstraintsWithFields($table) {
-		global $data;
 
 		$c_schema = $this->_schema;
 		$this->clean($c_schema);
-		$data->clean($table);
+		$this->clean($table);
 
 		// get the max number of col used in a constraint for the table
 		$sql = "SELECT DISTINCT
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index b6a6b02b0..b64327b76 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -176,11 +176,10 @@ function _alterTable($tblrs, $name, $owner, $schema, $comment, $tablespace) {
 	 * @return a recordset
 	 */
 	function getConstraintsWithFields($table) {
-		global $data;
 
 		$c_schema = $this->_schema;
 		$this->clean($c_schema);
-		$data->clean($table);
+		$this->clean($table);
 
 		// get the max number of col used in a constraint for the table
 		$sql = "SELECT DISTINCT