Fix some methods using nonstandard escaped string in the database access classes

6 files changed, 348 insertions, 119 deletions

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 9f1e916f..1d007b7d 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -700,17 +700,25 @@ class Postgres extends ADODB_base {
 	function findObject($term, $filter) {
 		global $conf;
 
+		/*about escaping:
+		 * SET standard_conforming_string is not available before 8.2
+		 * So we must use PostgreSQL specific notation :/
+		 * E'' notation is not available before 8.1
+		 * $$ is available since 8.0
+		 * Nothing specific from 7.4
+		 **/
+
 		// Escape search term for ILIKE match
-		$term = str_replace('_', '\\_', $term);
-		$term = str_replace('%', '\\%', $term);
 		$this->clean($term);
 		$this->clean($filter);
+		$term = str_replace('_', '\_', $term);
+		$term = str_replace('%', '\%', $term);
 
 		// Exclude system relations if necessary
 		if (!$conf['show_system']) {
 			// XXX: The mention of information_schema here is in the wrong place, but
 			// it's the quickest fix to exclude the info schema from 7.4
-			$where = " AND pn.nspname NOT LIKE 'pg\\\\_%' AND pn.nspname != 'information_schema'";
+			$where = " AND pn.nspname NOT LIKE \$_PATERN_\$pg\_%\$_PATERN_\$ AND pn.nspname != 'information_schema'";
 			$lan_where = "AND pl.lanispl";
 		}
 		else {
@@ -724,20 +732,22 @@ class Postgres extends ADODB_base {
 			$sql = "SELECT * FROM (";
 		}
 
+		$term = "\$_PATERN_\$%{$term}%\$_PATERN_\$";
+
 		$sql .= "
 			SELECT 'SCHEMA' AS type, oid, NULL AS schemaname, NULL AS relname, nspname AS name
-				FROM pg_catalog.pg_namespace pn WHERE nspname ILIKE '%{$term}%' {$where}
+				FROM pg_catalog.pg_namespace pn WHERE nspname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT CASE WHEN relkind='r' THEN 'TABLE' WHEN relkind='v' THEN 'VIEW' WHEN relkind='S' THEN 'SEQUENCE' END, pc.oid,
 				pn.nspname, NULL, pc.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn
-				WHERE pc.relnamespace=pn.oid AND relkind IN ('r', 'v', 'S') AND relname ILIKE '%{$term}%' {$where}
+				WHERE pc.relnamespace=pn.oid AND relkind IN ('r', 'v', 'S') AND relname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT CASE WHEN pc.relkind='r' THEN 'COLUMNTABLE' ELSE 'COLUMNVIEW' END, NULL, pn.nspname, pc.relname, pa.attname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_attribute pa WHERE pc.relnamespace=pn.oid AND pc.oid=pa.attrelid
-				AND pa.attname ILIKE '%{$term}%' AND pa.attnum > 0 AND NOT pa.attisdropped AND pc.relkind IN ('r', 'v') {$where}
+				AND pa.attname ILIKE {$term} AND pa.attnum > 0 AND NOT pa.attisdropped AND pc.relkind IN ('r', 'v') {$where}
 			UNION ALL
 			SELECT 'FUNCTION', pp.oid, pn.nspname, NULL, pp.proname || '(' || pg_catalog.oidvectortypes(pp.proargtypes) || ')' FROM pg_catalog.pg_proc pp, pg_catalog.pg_namespace pn
-				WHERE pp.pronamespace=pn.oid AND NOT pp.proisagg AND pp.proname ILIKE '%{$term}%' {$where}
+				WHERE pp.pronamespace=pn.oid AND NOT pp.proisagg AND pp.proname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'INDEX', NULL, pn.nspname, pc.relname, pc2.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_index pi, pg_catalog.pg_class pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pi.indrelid
@@ -747,7 +757,7 @@ class Postgres extends ADODB_base {
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
 				)
-				AND pc2.relname ILIKE '%{$term}%' {$where}
+				AND pc2.relname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'CONSTRAINTTABLE', NULL, pn.nspname, pc.relname, pc2.conname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_constraint pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pc2.conrelid AND pc2.conrelid != 0
@@ -756,11 +766,11 @@ class Postgres extends ADODB_base {
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
 				) END
-				AND pc2.conname ILIKE '%{$term}%' {$where}
+				AND pc2.conname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'CONSTRAINTDOMAIN', pt.oid, pn.nspname, pt.typname, pc.conname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_constraint pc WHERE pt.typnamespace=pn.oid AND pt.oid=pc.contypid AND pc.contypid != 0
-				AND pc.conname ILIKE '%{$term}%' {$where}
+				AND pc.conname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'TRIGGER', NULL, pn.nspname, pc.relname, pt.tgname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_trigger pt WHERE pc.relnamespace=pn.oid AND pc.oid=pt.tgrelid
@@ -768,17 +778,17 @@ class Postgres extends ADODB_base {
 					(SELECT 1 FROM pg_catalog.pg_depend d JOIN pg_catalog.pg_constraint c
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pt.tableoid AND d.objid = pt.oid AND d.deptype = 'i' AND c.contype = 'f'))
-				AND pt.tgname ILIKE '%{$term}%' {$where}
+				AND pt.tgname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'RULETABLE', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
 				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
 				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
-				WHERE c.relkind='r' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+				WHERE c.relkind='r' AND r.rulename != '_RETURN' AND r.rulename ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'RULEVIEW', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
 				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
 				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
-				WHERE c.relkind='v' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+				WHERE c.relkind='v' AND r.rulename != '_RETURN' AND r.rulename ILIKE {$term} {$where}
 		";
 
 		// Add advanced objects if show_advanced is set
@@ -787,26 +797,26 @@ class Postgres extends ADODB_base {
 				UNION ALL
 				SELECT CASE WHEN pt.typtype='d' THEN 'DOMAIN' ELSE 'TYPE' END, pt.oid, pn.nspname, NULL,
 					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
-					WHERE pt.typnamespace=pn.oid AND typname ILIKE '%{$term}%'
+					WHERE pt.typnamespace=pn.oid AND typname ILIKE {$term}
 					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
 					{$where}
 			 	UNION ALL
 				SELECT 'OPERATOR', po.oid, pn.nspname, NULL, po.oprname FROM pg_catalog.pg_operator po, pg_catalog.pg_namespace pn
-					WHERE po.oprnamespace=pn.oid AND oprname ILIKE '%{$term}%' {$where}
+					WHERE po.oprnamespace=pn.oid AND oprname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT 'CONVERSION', pc.oid, pn.nspname, NULL, pc.conname FROM pg_catalog.pg_conversion pc,
-					pg_catalog.pg_namespace pn WHERE pc.connamespace=pn.oid AND conname ILIKE '%{$term}%' {$where}
+					pg_catalog.pg_namespace pn WHERE pc.connamespace=pn.oid AND conname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT 'LANGUAGE', pl.oid, NULL, NULL, pl.lanname FROM pg_catalog.pg_language pl
-					WHERE lanname ILIKE '%{$term}%' {$lan_where}
+					WHERE lanname ILIKE {$term} {$lan_where}
 				UNION ALL
 				SELECT DISTINCT ON (p.proname) 'AGGREGATE', p.oid, pn.nspname, NULL, p.proname FROM pg_catalog.pg_proc p
 					LEFT JOIN pg_catalog.pg_namespace pn ON p.pronamespace=pn.oid
-					WHERE p.proisagg AND p.proname ILIKE '%{$term}%' {$where}
+					WHERE p.proisagg AND p.proname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT DISTINCT ON (po.opcname) 'OPCLASS', po.oid, pn.nspname, NULL, po.opcname FROM pg_catalog.pg_opclass po,
 					pg_catalog.pg_namespace pn WHERE po.opcnamespace=pn.oid
-					AND po.opcname ILIKE '%{$term}%' {$where}
+					AND po.opcname ILIKE {$term} {$where}
 			";
 		}
 		// Otherwise just add domains
@@ -815,7 +825,7 @@ class Postgres extends ADODB_base {
 				UNION ALL
 				SELECT 'DOMAIN', pt.oid, pn.nspname, NULL,
 					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
-					WHERE pt.typnamespace=pn.oid AND pt.typtype='d' AND typname ILIKE '%{$term}%'
+					WHERE pt.typnamespace=pn.oid AND pt.typtype='d' AND typname ILIKE {$term}
 					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
 					{$where}
 			";
@@ -3505,7 +3515,7 @@ class Postgres extends ADODB_base {
 
 		// get the max number of col used in a constraint for the table
 		$sql = "SELECT DISTINCT
-			max(SUBSTRING(array_dims(c.conkey) FROM  E'^\\\[.*:(.*)\\\]$')) as nb
+			max(SUBSTRING(array_dims(c.conkey) FROM  \$patern\$^\\[.*:(.*)\\]$\$patern\$)) as nb
 		FROM pg_catalog.pg_constraint AS c
 			JOIN pg_catalog.pg_class AS r ON (c.conrelid=r.oid)
 			JOIN pg_catalog.pg_namespace AS ns ON (r.relnamespace=ns.oid)
@@ -3539,7 +3549,7 @@ class Postgres extends ADODB_base {
 				LEFT JOIN pg_catalog.pg_attribute AS f2 ON
 					(f2.attrelid=r2.oid AND ((c.confkey[1]=f2.attnum AND c.conkey[1]=f1.attnum)';
 		for ($i = 2; $i <= $rs->fields['nb']; $i++)
-			$sql.= "OR (c.confkey[$i]=f2.attnum AND c.conkey[$i]=f1.attnum)";
+			$sql.= " OR (c.confkey[$i]=f2.attnum AND c.conkey[$i]=f1.attnum)";
 
 		$sql .= sprintf("))
 			WHERE
@@ -4701,11 +4711,11 @@ class Postgres extends ADODB_base {
 		if ($conf['show_system'])
 			$where = '';
 		else
-			$where = "
-				AND n1.nspname NOT LIKE 'pg\\\\_%'
-				AND n2.nspname NOT LIKE 'pg\\\\_%'
-				AND n3.nspname NOT LIKE 'pg\\\\_%'
-			";
+			$where = '
+				AND n1.nspname NOT LIKE $$pg\_%$$
+				AND n2.nspname NOT LIKE $$pg\_%$$
+				AND n3.nspname NOT LIKE $$pg\_%$$
+			';
 
 		$sql = "
 			SELECT
@@ -6963,7 +6973,7 @@ class Postgres extends ADODB_base {
 					FROM pg_catalog.pg_tablespace";
 
 		if (!$conf['show_system'] && !$all) {
-			$sql .= " WHERE spcname NOT LIKE 'pg\\\\_%'";
+			$sql .= ' WHERE spcname NOT LIKE $$pg\_%$$';
 		}
 
 		$sql .= " ORDER BY spcname";
@@ -7236,7 +7246,7 @@ class Postgres extends ADODB_base {
 		global $conf;
 
 		if (!$conf['show_system'])
-			$where = "AND pn.nspname NOT LIKE 'pg\\\\_%'";
+			$where = 'AND pn.nspname NOT LIKE $$pg\_%$$';
 		else
 			$where = "AND nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
 
diff --git a/classes/database/Postgres74.php b/classes/database/Postgres74.php
index 3cec2264..c4f2c28c 100644
--- a/classes/database/Postgres74.php
+++ b/classes/database/Postgres74.php
@@ -103,6 +103,176 @@ class Postgres74 extends Postgres80 {
 		return $this->selectSet($sql);
 	}
 
+	/**
+	 * Searches all system catalogs to find objects that match a certain name.
+	 * @param $term The search term
+	 * @param $filter The object type to restrict to ('' means no restriction)
+	 * @return A recordset
+	 */
+	function findObject($term, $filter) {
+		global $conf;
+
+		/*about escaping:
+		 * SET standard_conforming_string is not available before 8.2
+		 * So we must use PostgreSQL specific notation :/
+		 * E'' notation is not available before 8.1
+		 * $$ is available since 8.0
+		 * Nothing specific from 7.4
+		 **/
+
+		// Escape search term for ILIKE match
+		$term = str_replace('_', '\\_', $term);
+		$term = str_replace('%', '\\%', $term);
+		$this->clean($term);
+		$this->clean($filter);
+
+		// Exclude system relations if necessary
+		if (!$conf['show_system']) {
+			// XXX: The mention of information_schema here is in the wrong place, but
+			// it's the quickest fix to exclude the info schema from 7.4
+			$where = " AND pn.nspname NOT LIKE 'pg\\\\_%' AND pn.nspname != 'information_schema'";
+			$lan_where = "AND pl.lanispl";
+		}
+		else {
+			$where = '';
+			$lan_where = '';
+		}
+
+		// Apply outer filter
+		$sql = '';
+		if ($filter != '') {
+			$sql = "SELECT * FROM (";
+		}
+
+		$sql .= "
+			SELECT 'SCHEMA' AS type, oid, NULL AS schemaname, NULL AS relname, nspname AS name
+				FROM pg_catalog.pg_namespace pn WHERE nspname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT CASE WHEN relkind='r' THEN 'TABLE' WHEN relkind='v' THEN 'VIEW' WHEN relkind='S' THEN 'SEQUENCE' END, pc.oid,
+				pn.nspname, NULL, pc.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn
+				WHERE pc.relnamespace=pn.oid AND relkind IN ('r', 'v', 'S') AND relname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT CASE WHEN pc.relkind='r' THEN 'COLUMNTABLE' ELSE 'COLUMNVIEW' END, NULL, pn.nspname, pc.relname, pa.attname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
+				pg_catalog.pg_attribute pa WHERE pc.relnamespace=pn.oid AND pc.oid=pa.attrelid
+				AND pa.attname ILIKE '%{$term}%' AND pa.attnum > 0 AND NOT pa.attisdropped AND pc.relkind IN ('r', 'v') {$where}
+			UNION ALL
+			SELECT 'FUNCTION', pp.oid, pn.nspname, NULL, pp.proname || '(' || pg_catalog.oidvectortypes(pp.proargtypes) || ')' FROM pg_catalog.pg_proc pp, pg_catalog.pg_namespace pn
+				WHERE pp.pronamespace=pn.oid AND NOT pp.proisagg AND pp.proname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'INDEX', NULL, pn.nspname, pc.relname, pc2.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
+				pg_catalog.pg_index pi, pg_catalog.pg_class pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pi.indrelid
+				AND pi.indexrelid=pc2.oid
+				AND NOT EXISTS (
+					SELECT 1 FROM pg_catalog.pg_depend d JOIN pg_catalog.pg_constraint c
+					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
+					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
+				)
+				AND pc2.relname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'CONSTRAINTTABLE', NULL, pn.nspname, pc.relname, pc2.conname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
+				pg_catalog.pg_constraint pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pc2.conrelid AND pc2.conrelid != 0
+				AND CASE WHEN pc2.contype IN ('f', 'c') THEN TRUE ELSE NOT EXISTS (
+					SELECT 1 FROM pg_catalog.pg_depend d JOIN pg_catalog.pg_constraint c
+					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
+					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
+				) END
+				AND pc2.conname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'CONSTRAINTDOMAIN', pt.oid, pn.nspname, pt.typname, pc.conname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn,
+				pg_catalog.pg_constraint pc WHERE pt.typnamespace=pn.oid AND pt.oid=pc.contypid AND pc.contypid != 0
+				AND pc.conname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'TRIGGER', NULL, pn.nspname, pc.relname, pt.tgname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
+				pg_catalog.pg_trigger pt WHERE pc.relnamespace=pn.oid AND pc.oid=pt.tgrelid
+					AND ( pt.tgisconstraint = 'f' OR NOT EXISTS
+					(SELECT 1 FROM pg_catalog.pg_depend d JOIN pg_catalog.pg_constraint c
+					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
+					WHERE d.classid = pt.tableoid AND d.objid = pt.oid AND d.deptype = 'i' AND c.contype = 'f'))
+				AND pt.tgname ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'RULETABLE', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
+				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
+				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
+				WHERE c.relkind='r' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+			UNION ALL
+			SELECT 'RULEVIEW', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
+				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
+				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
+				WHERE c.relkind='v' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+		";
+
+		// Add advanced objects if show_advanced is set
+		if ($conf['show_advanced']) {
+			$sql .= "
+				UNION ALL
+				SELECT CASE WHEN pt.typtype='d' THEN 'DOMAIN' ELSE 'TYPE' END, pt.oid, pn.nspname, NULL,
+					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
+					WHERE pt.typnamespace=pn.oid AND typname ILIKE '%{$term}%'
+					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
+					{$where}
+				UNION ALL
+				SELECT 'OPERATOR', po.oid, pn.nspname, NULL, po.oprname FROM pg_catalog.pg_operator po, pg_catalog.pg_namespace pn
+					WHERE po.oprnamespace=pn.oid AND oprname ILIKE '%{$term}%' {$where}
+				UNION ALL
+				SELECT 'CONVERSION', pc.oid, pn.nspname, NULL, pc.conname FROM pg_catalog.pg_conversion pc,
+					pg_catalog.pg_namespace pn WHERE pc.connamespace=pn.oid AND conname ILIKE '%{$term}%' {$where}
+				UNION ALL
+				SELECT 'LANGUAGE', pl.oid, NULL, NULL, pl.lanname FROM pg_catalog.pg_language pl
+					WHERE lanname ILIKE '%{$term}%' {$lan_where}
+				UNION ALL
+				SELECT DISTINCT ON (p.proname) 'AGGREGATE', p.oid, pn.nspname, NULL, p.proname FROM pg_catalog.pg_proc p
+					LEFT JOIN pg_catalog.pg_namespace pn ON p.pronamespace=pn.oid
+					WHERE p.proisagg AND p.proname ILIKE '%{$term}%' {$where}
+				UNION ALL
+				SELECT DISTINCT ON (po.opcname) 'OPCLASS', po.oid, pn.nspname, NULL, po.opcname FROM pg_catalog.pg_opclass po,
+					pg_catalog.pg_namespace pn WHERE po.opcnamespace=pn.oid
+					AND po.opcname ILIKE '%{$term}%' {$where}
+			";
+		}
+		// Otherwise just add domains
+		else {
+			$sql .= "
+				UNION ALL
+				SELECT 'DOMAIN', pt.oid, pn.nspname, NULL,
+					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
+					WHERE pt.typnamespace=pn.oid AND pt.typtype='d' AND typname ILIKE '%{$term}%'
+					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
+					{$where}
+			";
+		}
+
+		if ($filter != '') {
+			// We use like to make RULE, CONSTRAINT and COLUMN searches work
+			$sql .= ") AS sub WHERE type LIKE '{$filter}%' ";
+		}
+
+		$sql .= "ORDER BY type, schemaname, relname, name";
+
+		return $this->selectSet($sql);
+	}
+
+	// Database functions
+
+	/**
+	 * Returns table locks information in the current database
+	 * @return A recordset
+	 */
+	function getLocks() {
+		global $conf;
+
+		if (!$conf['show_system'])
+			$where = "AND pn.nspname NOT LIKE 'pg\\\\_%'";
+		else
+			$where = "AND nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
+
+		$sql = "SELECT pn.nspname, pc.relname AS tablename, pl.transaction, pl.pid, pl.mode, pl.granted
+		FROM pg_catalog.pg_locks pl, pg_catalog.pg_class pc, pg_catalog.pg_namespace pn
+		WHERE pl.relation = pc.oid AND pc.relnamespace=pn.oid {$where}
+		ORDER BY nspname,tablename";
+
+		return $this->selectSet($sql);
+	}
+
 	// Table functions
 
 	/**
@@ -275,6 +445,67 @@ class Postgres74 extends Postgres80 {
 		return 'on';
 		}
 
+	// Constraint functions
+
+	/**
+	 * Returns a list of all constraints on a table,
+	 * including constraint name, definition, related col and referenced namespace,
+	 * table and col if needed
+	 * @param $table the table where we are looking for fk
+	 * @return a recordset
+	 */
+	function getConstraintsWithFields($table) {
+
+		$c_schema = $this->_schema;
+		$this->clean($c_schema);
+		$this->clean($table);
+
+		// get the max number of col used in a constraint for the table
+		$sql = "SELECT DISTINCT
+			max(SUBSTRING(array_dims(c.conkey) FROM '^\\\\[.*:(.*)\\\\]$')) as nb
+		FROM pg_catalog.pg_constraint AS c
+			JOIN pg_catalog.pg_class AS r ON (c.conrelid=r.oid)
+		    JOIN pg_catalog.pg_namespace AS ns ON (r.relnamespace=ns.oid)
+		WHERE
+			r.relname = '{$table}' AND ns.nspname='{$c_schema}'";
+
+		$rs = $this->selectSet($sql);
+
+		if ($rs->EOF) $max_col = 0;
+		else $max_col = $rs->fields['nb'];
+
+		$sql = '
+			SELECT
+				c.oid AS conid, c.contype, c.conname, pg_catalog.pg_get_constraintdef(c.oid, true) AS consrc,
+				ns1.nspname as p_schema, r1.relname as p_table, ns2.nspname as f_schema,
+				r2.relname as f_table, f1.attname as p_field, f1.attnum AS p_attnum, f2.attname as f_field,
+				f2.attnum AS f_attnum, pg_catalog.obj_description(c.oid, \'pg_constraint\') AS constcomment,
+				c.conrelid, c.confrelid
+			FROM
+				pg_catalog.pg_constraint AS c
+				JOIN pg_catalog.pg_class AS r1 ON (c.conrelid=r1.oid)
+				JOIN pg_catalog.pg_attribute AS f1 ON (f1.attrelid=r1.oid AND (f1.attnum=c.conkey[1]';
+		for ($i = 2; $i <= $rs->fields['nb']; $i++) {
+			$sql.= " OR f1.attnum=c.conkey[$i]";
+		}
+		$sql.= '))
+				JOIN pg_catalog.pg_namespace AS ns1 ON r1.relnamespace=ns1.oid
+				LEFT JOIN (
+					pg_catalog.pg_class AS r2 JOIN pg_catalog.pg_namespace AS ns2 ON (r2.relnamespace=ns2.oid)
+				) ON (c.confrelid=r2.oid)
+				LEFT JOIN pg_catalog.pg_attribute AS f2 ON
+					(f2.attrelid=r2.oid AND ((c.confkey[1]=f2.attnum AND c.conkey[1]=f1.attnum)';
+		for ($i = 2; $i <= $rs->fields['nb']; $i++)
+			$sql.= " OR (c.confkey[$i]=f2.attnum AND c.conkey[$i]=f1.attnum)";
+
+		$sql .= sprintf("))
+			WHERE
+				r1.relname = '%s' AND ns1.nspname='%s'
+			ORDER BY 1", $table, $c_schema);
+
+		return $this->selectSet($sql);
+	}
+
 	// Sequence functions
 
 	/**
@@ -339,6 +570,48 @@ class Postgres74 extends Postgres80 {
 		return $this->selectSet($sql);
 	}
 
+	/**
+	 * Returns a list of all casts in the database
+	 * @return All casts
+	 */
+	function getCasts() {
+		global $conf;
+
+		if ($conf['show_system'])
+			$where = '';
+		else
+			$where = "
+				AND n1.nspname NOT LIKE 'pg\\\\_%'
+				AND n2.nspname NOT LIKE 'pg\\\\_%'
+				AND n3.nspname NOT LIKE 'pg\\\\_%'
+			";
+
+		$sql = "
+			SELECT
+				c.castsource::pg_catalog.regtype AS castsource,
+				c.casttarget::pg_catalog.regtype AS casttarget,
+				CASE WHEN c.castfunc=0 THEN NULL
+				ELSE c.castfunc::pg_catalog.regprocedure END AS castfunc,
+				c.castcontext,
+				obj_description(c.oid, 'pg_cast') as castcomment
+			FROM
+				(pg_catalog.pg_cast c LEFT JOIN pg_catalog.pg_proc p ON c.castfunc=p.oid JOIN pg_catalog.pg_namespace n3 ON p.pronamespace=n3.oid),
+				pg_catalog.pg_type t1,
+				pg_catalog.pg_type t2,
+				pg_catalog.pg_namespace n1,
+				pg_catalog.pg_namespace n2
+			WHERE
+				c.castsource=t1.oid
+				AND c.casttarget=t2.oid
+				AND t1.typnamespace=n1.oid
+				AND t2.typnamespace=n2.oid
+				{$where}
+			ORDER BY 1, 2
+		";
+
+		return $this->selectSet($sql);
+	}
+
 	// Capabilities
 
 	function hasAlterColumnType() { return false; }
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index 0bb9db64..c8eb5d31 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -193,69 +193,6 @@ class Postgres80 extends Postgres81 {
 		return 0;
 	}
 
-
-	// Constraint functions
-
-	/**
-	 * Returns a list of all constraints on a table,
-	 * including constraint name, definition, related col and referenced namespace,
-	 * table and col if needed
-	 * @param $table the table where we are looking for fk
-	 * @return a recordset
-	 */
-	function getConstraintsWithFields($table) {
-
-		$c_schema = $this->_schema;
-		$this->clean($c_schema);
-		$this->clean($table);
-
-		// get the max number of col used in a constraint for the table
-		$sql = "SELECT DISTINCT
-			max(SUBSTRING(array_dims(c.conkey) FROM '^\\\[.*:(.*)\\\]$')) as nb
-		FROM pg_catalog.pg_constraint AS c
-			JOIN pg_catalog.pg_class AS r ON (c.conrelid=r.oid)
-		    JOIN pg_catalog.pg_namespace AS ns ON (r.relnamespace=ns.oid)
-		WHERE
-			r.relname = '{$table}' AND ns.nspname='{$c_schema}'";
-
-		$rs = $this->selectSet($sql);
-
-		if ($rs->EOF) $max_col = 0;
-		else $max_col = $rs->fields['nb'];
-
-		$sql = '
-			SELECT
-				c.oid AS conid, c.contype, c.conname, pg_catalog.pg_get_constraintdef(c.oid, true) AS consrc,
-				ns1.nspname as p_schema, r1.relname as p_table, ns2.nspname as f_schema,
-				r2.relname as f_table, f1.attname as p_field, f1.attnum AS p_attnum, f2.attname as f_field,
-				f2.attnum AS f_attnum, pg_catalog.obj_description(c.oid, \'pg_constraint\') AS constcomment,
-				c.conrelid, c.confrelid
-			FROM
-				pg_catalog.pg_constraint AS c
-				JOIN pg_catalog.pg_class AS r1 ON (c.conrelid=r1.oid)
-				JOIN pg_catalog.pg_attribute AS f1 ON (f1.attrelid=r1.oid AND (f1.attnum=c.conkey[1]';
-		for ($i = 2; $i <= $rs->fields['nb']; $i++) {
-			$sql.= " OR f1.attnum=c.conkey[$i]";
-		}
-		$sql.= '))
-				JOIN pg_catalog.pg_namespace AS ns1 ON r1.relnamespace=ns1.oid
-				LEFT JOIN (
-					pg_catalog.pg_class AS r2 JOIN pg_catalog.pg_namespace AS ns2 ON (r2.relnamespace=ns2.oid)
-				) ON (c.confrelid=r2.oid)
-				LEFT JOIN pg_catalog.pg_attribute AS f2 ON
-					(f2.attrelid=r2.oid AND ((c.confkey[1]=f2.attnum AND c.conkey[1]=f1.attnum)';
-		for ($i = 2; $i <= $rs->fields['nb']; $i++)
-			$sql.= "OR (c.confkey[$i]=f2.attnum AND c.conkey[$i]=f1.attnum)";
-
-		$sql .= sprintf("))
-			WHERE
-				r1.relname = '%s' AND ns1.nspname='%s'
-			ORDER BY 1", $table, $c_schema);
-
-		return $this->selectSet($sql);
-	}
-
-
 	// View functions
 
 	/**
diff --git a/classes/database/Postgres81.php b/classes/database/Postgres81.php
index 71584d51..0e964615 100644
--- a/classes/database/Postgres81.php
+++ b/classes/database/Postgres81.php
@@ -165,8 +165,8 @@ class Postgres81 extends Postgres82 {
 					FROM pg_catalog.pg_tablespace";
 
 		if (!$conf['show_system'] && !$all) {
-			$sql .= " WHERE spcname NOT LIKE 'pg\\\\_%'";
-	}
+			$sql .= ' WHERE spcname NOT LIKE $$pg\_%$$';
+		}
 	
 		$sql .= " ORDER BY spcname";
 
diff --git a/classes/database/Postgres82.php b/classes/database/Postgres82.php
index 19e5fd37..e30cd673 100644
--- a/classes/database/Postgres82.php
+++ b/classes/database/Postgres82.php
@@ -43,7 +43,7 @@ class Postgres82 extends Postgres83 {
 		global $conf;
 
 		if (!$conf['show_system'])
-			$where = "AND pn.nspname NOT LIKE 'pg\\\\_%'";
+			$where = 'AND pn.nspname NOT LIKE $$pg\_%$$';
 		else
 			$where = "AND nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
 
diff --git a/classes/database/Postgres84.php b/classes/database/Postgres84.php
index e395bf6a..702b1631 100755
--- a/classes/database/Postgres84.php
+++ b/classes/database/Postgres84.php
@@ -41,7 +41,7 @@ class Postgres84 extends Postgres {
 		return $this->help_page;
 	}
 
-	// Databse functions
+	// Database functions
 
 	/**
 	 * Grabs a list of triggers on a table
@@ -71,7 +71,6 @@ class Postgres84 extends Postgres {
 		return $this->selectSet($sql);
 	}
 
-
 	/**
 	 * Searches all system catalogs to find objects that match a certain name.
 	 * @param $term The search term
@@ -81,23 +80,31 @@ class Postgres84 extends Postgres {
 	function findObject($term, $filter) {
 		global $conf;
 
+		/*about escaping:
+		 * SET standard_conforming_string is not available before 8.2
+		 * So we must use PostgreSQL specific notation :/
+		 * E'' notation is not available before 8.1
+		 * $$ is available since 8.0
+		 * Nothing specific from 7.4
+		 **/
+
 		// Escape search term for ILIKE match
-		$term = str_replace('_', '\\_', $term);
-		$term = str_replace('%', '\\%', $term);
 		$this->clean($term);
 		$this->clean($filter);
+		$term = str_replace('_', '\_', $term);
+		$term = str_replace('%', '\%', $term);
 
 		// Exclude system relations if necessary
 		if (!$conf['show_system']) {
 			// XXX: The mention of information_schema here is in the wrong place, but
 			// it's the quickest fix to exclude the info schema from 7.4
-			$where = " AND pn.nspname NOT LIKE 'pg\\\\_%' AND pn.nspname != 'information_schema'";
+			$where = " AND pn.nspname NOT LIKE \$_PATERN_\$pg\_%\$_PATERN_\$ AND pn.nspname != 'information_schema'";
 			$lan_where = "AND pl.lanispl";
 		}
 		else {
 			$where = '';
 			$lan_where = '';
-	}
+		}
 
 		// Apply outer filter
 		$sql = '';
@@ -105,20 +112,22 @@ class Postgres84 extends Postgres {
 			$sql = "SELECT * FROM (";
 		}
 
+		$term = "\$_PATERN_\$%{$term}%\$_PATERN_\$";
+
 		$sql .= "
 			SELECT 'SCHEMA' AS type, oid, NULL AS schemaname, NULL AS relname, nspname AS name
-				FROM pg_catalog.pg_namespace pn WHERE nspname ILIKE '%{$term}%' {$where}
+				FROM pg_catalog.pg_namespace pn WHERE nspname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT CASE WHEN relkind='r' THEN 'TABLE' WHEN relkind='v' THEN 'VIEW' WHEN relkind='S' THEN 'SEQUENCE' END, pc.oid,
 				pn.nspname, NULL, pc.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn
-				WHERE pc.relnamespace=pn.oid AND relkind IN ('r', 'v', 'S') AND relname ILIKE '%{$term}%' {$where}
+				WHERE pc.relnamespace=pn.oid AND relkind IN ('r', 'v', 'S') AND relname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT CASE WHEN pc.relkind='r' THEN 'COLUMNTABLE' ELSE 'COLUMNVIEW' END, NULL, pn.nspname, pc.relname, pa.attname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_attribute pa WHERE pc.relnamespace=pn.oid AND pc.oid=pa.attrelid
-				AND pa.attname ILIKE '%{$term}%' AND pa.attnum > 0 AND NOT pa.attisdropped AND pc.relkind IN ('r', 'v') {$where}
+				AND pa.attname ILIKE {$term} AND pa.attnum > 0 AND NOT pa.attisdropped AND pc.relkind IN ('r', 'v') {$where}
 			UNION ALL
 			SELECT 'FUNCTION', pp.oid, pn.nspname, NULL, pp.proname || '(' || pg_catalog.oidvectortypes(pp.proargtypes) || ')' FROM pg_catalog.pg_proc pp, pg_catalog.pg_namespace pn
-				WHERE pp.pronamespace=pn.oid AND NOT pp.proisagg AND pp.proname ILIKE '%{$term}%' {$where}
+				WHERE pp.pronamespace=pn.oid AND NOT pp.proisagg AND pp.proname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'INDEX', NULL, pn.nspname, pc.relname, pc2.relname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_index pi, pg_catalog.pg_class pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pi.indrelid
@@ -128,7 +137,7 @@ class Postgres84 extends Postgres {
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
 				)
-				AND pc2.relname ILIKE '%{$term}%' {$where}
+				AND pc2.relname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'CONSTRAINTTABLE', NULL, pn.nspname, pc.relname, pc2.conname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_constraint pc2 WHERE pc.relnamespace=pn.oid AND pc.oid=pc2.conrelid AND pc2.conrelid != 0
@@ -137,29 +146,29 @@ class Postgres84 extends Postgres {
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pc2.tableoid AND d.objid = pc2.oid AND d.deptype = 'i' AND c.contype IN ('u', 'p')
 				) END
-				AND pc2.conname ILIKE '%{$term}%' {$where}
+				AND pc2.conname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'CONSTRAINTDOMAIN', pt.oid, pn.nspname, pt.typname, pc.conname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_constraint pc WHERE pt.typnamespace=pn.oid AND pt.oid=pc.contypid AND pc.contypid != 0
-				AND pc.conname ILIKE '%{$term}%' {$where}
+				AND pc.conname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'TRIGGER', NULL, pn.nspname, pc.relname, pt.tgname FROM pg_catalog.pg_class pc, pg_catalog.pg_namespace pn,
 				pg_catalog.pg_trigger pt WHERE pc.relnamespace=pn.oid AND pc.oid=pt.tgrelid
-					AND (NOT pt.tgisconstraint OR NOT EXISTS
+					AND ( NOT pt.tgisconstraint OR NOT EXISTS
 					(SELECT 1 FROM pg_catalog.pg_depend d JOIN pg_catalog.pg_constraint c
 					ON (d.refclassid = c.tableoid AND d.refobjid = c.oid)
 					WHERE d.classid = pt.tableoid AND d.objid = pt.oid AND d.deptype = 'i' AND c.contype = 'f'))
-				AND pt.tgname ILIKE '%{$term}%' {$where}
+				AND pt.tgname ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'RULETABLE', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
 				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
 				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
-				WHERE c.relkind='r' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+				WHERE c.relkind='r' AND r.rulename != '_RETURN' AND r.rulename ILIKE {$term} {$where}
 			UNION ALL
 			SELECT 'RULEVIEW', NULL, pn.nspname AS schemaname, c.relname AS tablename, r.rulename FROM pg_catalog.pg_rewrite r
 				JOIN pg_catalog.pg_class c ON c.oid = r.ev_class
 				LEFT JOIN pg_catalog.pg_namespace pn ON pn.oid = c.relnamespace
-				WHERE c.relkind='v' AND r.rulename != '_RETURN' AND r.rulename ILIKE '%{$term}%' {$where}
+				WHERE c.relkind='v' AND r.rulename != '_RETURN' AND r.rulename ILIKE {$term} {$where}
 		";
 
 		// Add advanced objects if show_advanced is set
@@ -168,26 +177,26 @@ class Postgres84 extends Postgres {
 				UNION ALL
 				SELECT CASE WHEN pt.typtype='d' THEN 'DOMAIN' ELSE 'TYPE' END, pt.oid, pn.nspname, NULL,
 					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
-					WHERE pt.typnamespace=pn.oid AND typname ILIKE '%{$term}%'
+					WHERE pt.typnamespace=pn.oid AND typname ILIKE {$term}
 					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
 					{$where}
 			 	UNION ALL
 				SELECT 'OPERATOR', po.oid, pn.nspname, NULL, po.oprname FROM pg_catalog.pg_operator po, pg_catalog.pg_namespace pn
-					WHERE po.oprnamespace=pn.oid AND oprname ILIKE '%{$term}%' {$where}
+					WHERE po.oprnamespace=pn.oid AND oprname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT 'CONVERSION', pc.oid, pn.nspname, NULL, pc.conname FROM pg_catalog.pg_conversion pc,
-					pg_catalog.pg_namespace pn WHERE pc.connamespace=pn.oid AND conname ILIKE '%{$term}%' {$where}
+					pg_catalog.pg_namespace pn WHERE pc.connamespace=pn.oid AND conname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT 'LANGUAGE', pl.oid, NULL, NULL, pl.lanname FROM pg_catalog.pg_language pl
-					WHERE lanname ILIKE '%{$term}%' {$lan_where}
+					WHERE lanname ILIKE {$term} {$lan_where}
 				UNION ALL
 				SELECT DISTINCT ON (p.proname) 'AGGREGATE', p.oid, pn.nspname, NULL, p.proname FROM pg_catalog.pg_proc p
 					LEFT JOIN pg_catalog.pg_namespace pn ON p.pronamespace=pn.oid
-					WHERE p.proisagg AND p.proname ILIKE '%{$term}%' {$where}
+					WHERE p.proisagg AND p.proname ILIKE {$term} {$where}
 				UNION ALL
 				SELECT DISTINCT ON (po.opcname) 'OPCLASS', po.oid, pn.nspname, NULL, po.opcname FROM pg_catalog.pg_opclass po,
 					pg_catalog.pg_namespace pn WHERE po.opcnamespace=pn.oid
-					AND po.opcname ILIKE '%{$term}%' {$where}
+					AND po.opcname ILIKE {$term} {$where}
 			";
 		}
 		// Otherwise just add domains
@@ -196,7 +205,7 @@ class Postgres84 extends Postgres {
 				UNION ALL
 				SELECT 'DOMAIN', pt.oid, pn.nspname, NULL,
 					pt.typname FROM pg_catalog.pg_type pt, pg_catalog.pg_namespace pn
-					WHERE pt.typnamespace=pn.oid AND pt.typtype='d' AND typname ILIKE '%{$term}%'
+					WHERE pt.typnamespace=pn.oid AND pt.typtype='d' AND typname ILIKE {$term}
 					AND (pt.typrelid = 0 OR (SELECT c.relkind = 'c' FROM pg_catalog.pg_class c WHERE c.oid = pt.typrelid))
 					{$where}
 			";