respect schema when finding relation privs

diff --git a/BUGS b/BUGS
index 92ac8eafb37f0454d589cb7e442cb391eed57551..5ad8133a0b28dd1cb13643691156d4196c2c6c44 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
 * Fix grant option/grantor stuff
-* Schema support for privileges
 * First and last links in browse table
+* Can't grant/revoke on functions with spaces in them
 

diff --git a/HISTORY b/HISTORY
index 7c4424d1a2ff00ad951aed2a12b7e569f12559b4..b6df9cb5d89dfd544a74c1bedabf52037af1eb47 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,7 @@ Version 3.0
 * Japanese update from Tadashi Jokagi
 * Fix drop database reload browser bug
 * Look & Feel upgrade from Davey
+* Value & expression on edit row
 
 Version 3.0-beta-1
 -------------------

diff --git a/TODO b/TODO
index 376e140f418d75c21710479edcbf3d299236366b..2ffb0de46208f3c9cead7a73f17bd17b3b071275 100644 (file)
--- a/TODO
+++ b/TODO
@@ -89,7 +89,6 @@ Languages
 ---------
 
 * Unimplemented
-* Note: Are not in schemas in 7.3 - they are database-wide
 
 Domains (7.3)
 -------------

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index a00f3251fd08cef9df1daf1b4c9069becf677c88..a991c6d5ccb747400e9512e5b6d1f77408a12be3 100755 (executable)
--- 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.116 2003/05/25 10:47:50 chriskl Exp $
+ * $Id: Postgres.php,v 1.117 2003/05/31 10:55:41 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -1949,7 +1949,7 @@ class Postgres extends BaseDB {
         * Grabs an array of users and their privileges for an object,
         * given its type.
         * @param $object The name of the object whose privileges are to be retrieved
-        * @param $type The type of the object (eg. database, schema, relation, function or language
+        * @param $type The type of the object (eg. relation, view or sequence)
         * @return Privileges array
         * @return -1 invalid type
         * @return -2 object not found
@@ -1958,25 +1958,11 @@ class Postgres extends BaseDB {
        function getPrivileges($object, $type) {
                $this->clean($object);
 
-               // @@ NEED SCHEMA SUPPORT FOR 7.3
                switch ($type) {
                        case 'table':
                        case 'view':
                        case 'sequence':
-                               $sql = "SELECT relacl AS acl FROM pg_class WHERE relname = '{$object}'";
-                               break;
-                       case 'database':
-                               $sql = "SELECT datacl AS acl FROM pg_database WHERE datname = '{$object}'";
-                               break;
-                       case 'function':
-                               $sql = "SELECT proacl AS acl FROM pg_proc WHERE oid = '{$object}'";
-                               break;
-                       case 'language':
-                               $sql = "SELECT lanacl AS acl FROM pg_language WHERE lanname = '{$object}'";
-                               break;
-                       case 'schema':
-                               // @@ MOVE THIS TO 7.3 ONLY
-                               $sql = "SELECT nspacl AS acl FROM pg_namespace WHERE nspname = '{$object}'";
+                               $sql = "SELECT relacl AS acl FROM pg_class WHERE relname='{$object}'";
                                break;
                        default:
                                return -1;

diff --git a/classes/database/Postgres73.php b/classes/database/Postgres73.php
index d0cdbe3d5d083e1d65cf82fac2a0ebba6ae8f54c..ae31055676d568157683792eeefb3061e0dae83b 100644 (file)
--- 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.46 2003/05/20 05:43:47 chriskl Exp $
+ * $Id: Postgres73.php,v 1.47 2003/05/31 10:55:41 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???
@@ -806,6 +806,107 @@ class Postgres73 extends Postgres72 {
                return $this->execute($sql);
        }
 
+       // Privilege functions
+
+       /**
+        * Grabs an array of users and their privileges for an object,
+        * given its type.
+        * @param $object The name of the object whose privileges are to be retrieved
+        * @param $type The type of the object (eg. database, schema, relation, function or language)
+        * @return Privileges array
+        * @return -1 invalid type
+        * @return -2 object not found
+        * @return -3 unknown privilege type
+        */
+       function getPrivileges($object, $type) {
+               $this->clean($object);
+
+               switch ($type) {
+                       case 'table':
+                       case 'view':
+                       case 'sequence':
+                               $sql = "SELECT relacl AS acl FROM pg_class WHERE relname='{$object}'
+                                               AND relnamespace=(SELECT oid FROM pg_namespace WHERE nspname='{$this->_schema}')";
+                               break;
+                       case 'database':
+                               $sql = "SELECT datacl AS acl FROM pg_database WHERE datname='{$object}'";
+                               break;
+                       case 'function':
+                               // Since we fetch functions by oid, they are already constrained to
+                               // the current schema.
+                               $sql = "SELECT proacl AS acl FROM pg_proc WHERE oid='{$object}'";
+                               break;
+                       case 'language':
+                               $sql = "SELECT lanacl AS acl FROM pg_language WHERE lanname='{$object}'";
+                               break;
+                       case 'schema':
+                               $sql = "SELECT nspacl AS acl FROM pg_namespace WHERE nspname='{$object}'";
+                               break;
+                       default:
+                               return -1;
+               }
+
+               // Fetch the ACL for object
+               $acl = $this->selectField($sql, 'acl');
+               if ($acl == -1) return -2;
+               elseif ($acl == '') return array();
+
+               // Take off the first and last characters (the braces)
+               $acl = substr($acl, 1, strlen($acl) - 2);
+
+               // Pick out individual ACE's by exploding on the comma
+               $aces = explode(',', $acl);
+
+               // Create the array to be returned
+               $temp = array();
+
+               // For each ACE, generate an entry in $temp
+               foreach ($aces as $v) {
+                       // If the ACE begins with a double quote, strip them off both ends
+                       if (strpos($v, '"') === 0) $v = substr($v, 1, strlen($v) - 2);
+
+                       // Figure out type of ACE (public, user or group)
+                       if (strpos($v, '=') === 0)
+                               $atype = 'public';
+                       elseif (strpos($v, 'group ') === 0) {
+                               $atype = 'group';
+                               // Tear off 'group' prefix
+                               $v = substr($v, 6);
+                       }
+                       else
+                               $atype = 'user';
+
+                       // Separate entity from character list
+                       list ($entity, $chars) = explode('=', $v);
+                       
+                       // New row to be added to $temp
+                       // (type, grantee, privilegs, grantor, grant option
+                       $row = array($atype, $entity, array(), '', false);
+
+                       // Loop over chars and add privs to $row
+                       for ($i = 0; $i < strlen($chars); $i++) {
+                               // Append to row's privs list the string representing
+                               // the privilege
+                               $char = substr($chars, $i, 1);
+                               if ($char == '*')
+                                       $row[4] = true;
+                               elseif ($char == '/') {
+                                       $row[5] = substr($chars, $i + 1);
+                                       break;
+                               }
+                               if (!isset($this->privmap[$char]))
+                                       return -3;
+                               else
+                                       $row[2][] = $this->privmap[$char];
+                       }
+                       
+                       // Append row to temp
+                       $temp[] = $row;
+               }
+
+               return $temp;
+       }
+       
        // Capabilities
        function hasSchemas() { return true; }
        function hasConversions() { return true; }