SF.net SVN: ledger-smb:[3171] trunk/sql/modules/admin.sql

[..hidden..]

Revision: 3171
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3171&view=rev
Author:   einhverfr
Date:     2011-05-23 03:26:39 +0000 (Mon, 23 May 2011)

Log Message:
-----------
Committing patch 2946682

Modified Paths:
--------------
    trunk/sql/modules/admin.sql

Modified: trunk/sql/modules/admin.sql
===================================================================
--- trunk/sql/modules/admin.sql	2011-05-22 23:58:24 UTC (rev 3170)
+++ trunk/sql/modules/admin.sql	2011-05-23 03:26:39 UTC (rev 3171)
@@ -273,7 +273,7 @@
 BEGIN
     SELECT CASE WHEN isfinite(rolvaliduntil) is not true THEN '1 year'::interval
                 ELSE rolvaliduntil - now() END AS expiration INTO outval 
-    FROM pg_authid WHERE rolname = SESSION_USER;
+    FROM pg_roles WHERE rolname = SESSION_USER;
     RETURN outval;
 end;
 $$ language plpgsql security definer;
@@ -381,7 +381,7 @@
 ) FROM public; 
 
 create view role_view as 
-    select * from pg_auth_members m join pg_authid a ON (m.roleid = a.oid);
+    select * from pg_auth_members m join pg_roles a ON (m.roleid = a.oid);
         
 
 create or replace function admin__is_group(in_group_name text) returns bool as $$
@@ -489,9 +489,9 @@
 DECLARE out_rolename RECORD;
 BEGIN
 	FOR out_rolename IN 
-		SELECT rolname FROM pg_authid 
+		SELECT rolname FROM pg_roles 
 		WHERE oid IN (SELECT id FROM connectby (
-			'(SELECT m.member, m.roleid, r.oid FROM pg_authid r 
+			'(SELECT m.member, m.roleid, r.oid FROM pg_roles r 
 			LEFT JOIN pg_auth_members m ON (r.oid = m.roleid)) a',
 			'oid', 'member', 'oid', '320461', '0', ','
 			) c(id integer, parent integer, "level" integer, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.