From 7170a668b961ee11e01e17b3bfd7415a5f96dde3 Mon Sep 17 00:00:00 2001
From: jollytoad <jollytoad>
Date: Fri, 17 Sep 2004 11:45:42 +0000
Subject: [PATCH] Added a language column to the functions list.

---
 classes/database/Postgres.php   |  6 ++++--
 classes/database/Postgres73.php | 12 +++++++-----
 functions.php                   |  6 +++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index fe99185d..bf74beed 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.245 2004/09/07 14:04:21 jollytoad Exp $
+ * $Id: Postgres.php,v 1.246 2004/09/17 11:45:42 jollytoad Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -3293,13 +3293,15 @@ class Postgres extends ADODB_base {
 				proname,
 				proretset,
 				pt.typname AS proresult,
+				pl.lanname AS prolanguage,
 				oidvectortypes(pc.proargtypes) AS proarguments,
 				(SELECT description FROM pg_description pd WHERE pc.oid=pd.objoid) AS procomment
 			FROM
-				pg_proc pc, pg_user pu, pg_type pt
+				pg_proc pc, pg_user pu, pg_type pt, pg_language pl
 			WHERE
 				pc.proowner = pu.usesysid
 				AND pc.prorettype = pt.oid
+				AND pc.prolang = pl.oid
 				{$where}
 			UNION
 			SELECT 
diff --git a/classes/database/Postgres73.php b/classes/database/Postgres73.php
index 34d7d8cf..6cffba80 100644
--- a/classes/database/Postgres73.php
+++ b/classes/database/Postgres73.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres73.php,v 1.137 2004/09/10 13:21:39 jollytoad Exp $
+ * $Id: Postgres73.php,v 1.138 2004/09/17 11:45:44 jollytoad Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -716,13 +716,15 @@ class Postgres73 extends Postgres72 {
 				p.proretset,
 				pg_catalog.format_type(p.prorettype, NULL) AS proresult,
 				pg_catalog.oidvectortypes(p.proargtypes) AS proarguments,
+				pl.lanname AS prolanguage,
 				pg_catalog.obj_description(p.oid, 'pg_proc') AS procomment
 			FROM pg_catalog.pg_proc p
-			LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
+				INNER JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
+				INNER JOIN pg_catalog.pg_language pl ON pl.oid = p.prolang
 			WHERE p.prorettype <> 'pg_catalog.cstring'::pg_catalog.regtype
-			AND p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype
-			AND NOT p.proisagg
-			AND {$where}
+				AND p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype
+				AND NOT p.proisagg
+				AND {$where}
 			ORDER BY p.proname, proresult
 			";
 
diff --git a/functions.php b/functions.php
index c0254ddc..3bb00381 100644
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage functions in a database
 	 *
-	 * $Id: functions.php,v 1.45 2004/09/07 13:58:21 jollytoad Exp $
+	 * $Id: functions.php,v 1.46 2004/09/17 11:45:46 jollytoad Exp $
 	 */
 
 	// Include application functions
@@ -493,6 +493,10 @@
 				'field' => '+proreturns',
 				'type'  => 'verbatim',
 			),
+			'language' => array(
+				'title' => $lang['strlanguage'],
+				'field' => 'prolanguage',
+			),
 			'actions' => array(
 				'title' => $lang['stractions'],
 			),
-- 
2.39.5