Here's a version of my suggested diffs transplanted to 7.1 beta 5.  I'm
still looking at the best way to integrate Tom Vijlbrief's fixes
(insofar as they're still needed); would 7.2 be a suitable time for
incompatible API changes?


Jeroen


Changes:

(*) Introduced bool, true, false (replacing some int, 1, 0)
(*) Made some member functions const
(*) Documented GetIsNull()
(*) Marked DisplayTuples() and PrintTuples() as obsolescent; fixed possible
    portability problem (assumed that NULL pointer equals all-zero bit pattern)
(*) PrintTuples(): renamed width parameter to fillAlign to conform with other
    usage; fixed memory leak and compile issue w.r.t. field separator (should
    also slightly improve performance)
(*) Fixed some minor compilation issues
(*) Moved "using namespace std;" out of headers, where they didn't belong; used
    new (temporary) preprocessor macro PGSTD to do this
(*) Made ToString() static, removed unneeded memset(), made buffer size adapt
    to sizeof(int)
(*) Made some constructors explicit
(*) Changed some const std::string & parameters to plain std::string
(*) Marked PgCursor::Cursor(std::string) as obsolescent (setter with same name
    as getter--bad style)
(*) Renamed some paramaters previously named "string"
(*) Introduced size_type typedef for number of tuples in result set
(*) PgTransaction now supports re-opening after closing, and aborts if not
    explicitly committed prior to destruction

J. T. Vermeulen

Author: bmomjian

doc/src/sgml/libpq++.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:57 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.29 2001/05/09 17:29:09 momjian Exp $
 -->
 
  <chapter id="libpqplusplus">
@@ -227,9 +227,9 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        returns whether or not the connection to the backend server succeeded or
        failed.  
        <synopsis>
-	int PgConnection::ConnectionBad()
+	bool PgConnection::ConnectionBad() const
        </synopsis>
-       Returns TRUE if the connection failed.
+       Returns true if the connection failed.
       </para>
      </listitem>
      <listitem>
@@ -368,7 +368,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        <function>Tuples</function>
        Returns the number of tuples (rows) in the query result. 
        <synopsis>
-	int PgDatabase::Tuples()
+	int PgDatabase::Tuples() const
        </synopsis>
       </para>
      </listitem>
@@ -387,7 +387,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns the field (attribute) name associated with the given field index. 
        Field indices start at 0. 
        <synopsis>
-	const char *PgDatabase::FieldName(int field_num)
+	const char *PgDatabase::FieldName(int field_num) const
        </synopsis>
       </para>
      </listitem>
@@ -397,7 +397,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        PQfnumber Returns the field (attribute) index associated with 
        the given field name. 
        <synopsis>
-	int PgDatabase::FieldNum(const char* field_name)
+	int PgDatabase::FieldNum(const char* field_name) const
        </synopsis>
        -1 is returned if the given name does not match any field.
       </para>
@@ -409,7 +409,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        integer returned is an internal coding of the type. Field indices
        start at 0. 
        <synopsis>
-	Oid PgDatabase::FieldType(int field_num)
+	Oid PgDatabase::FieldType(int field_num) const
        </synopsis>
       </para>
      </listitem>
@@ -420,7 +420,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        integer returned is an internal coding of the type. Field indices
        start at 0. 
        <synopsis>
-	Oid PgDatabase::FieldType(const char* field_name)
+	Oid PgDatabase::FieldType(const char* field_name) const
        </synopsis>
       </para>
      </listitem>
@@ -430,7 +430,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns the size in bytes of the field associated with the given 
        field index. Field indices start at 0. 
        <synopsis>
-	short PgDatabase::FieldSize(int field_num)
+	short PgDatabase::FieldSize(int field_num) const
        </synopsis>
        Returns the space allocated for this field in a database tuple given
        the field number. In other words the size of the server's binary 
@@ -444,7 +444,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns the size in bytes of the field associated with the given 
        field index. Field indices start at 0. 
        <synopsis>
-	short PgDatabase::FieldSize(const char *field_name)
+	short PgDatabase::FieldSize(const char *field_name) const
        </synopsis>
        Returns the space allocated for this field in a database tuple given
        the field name. In other words the size of the server's binary 
@@ -466,7 +466,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns a single field (attribute) value of one tuple of a PGresult. 
        Tuple and field indices start at 0. 
        <synopsis>
-	const char *PgDatabase::GetValue(int tup_num, int field_num)
+	const char *PgDatabase::GetValue(int tup_num, int field_num) const
        </synopsis>
        For most queries, the value returned by GetValue is a null-terminated 
        ASCII string representation of the attribute value. But if BinaryTuples() 
@@ -486,7 +486,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns a single field (attribute) value of one tuple of a PGresult. 
        Tuple and field indices start at 0. 
        <synopsis>
-	const char *PgDatabase::GetValue(int tup_num, const char *field_name)
+	const char *PgDatabase::GetValue(int tup_num, const char *field_name) const
        </synopsis>
        For most queries, the value returned by GetValue is a null-terminated 
        ASCII string representation of the attribute value. But if BinaryTuples() 
@@ -506,7 +506,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns the length of a field (attribute) in bytes. Tuple and field 
        indices start at 0. 
        <synopsis>
-	int PgDatabase::GetLength(int tup_num, int field_num)
+	int PgDatabase::GetLength(int tup_num, int field_num) const
        </synopsis>
        This is the actual data length for the particular data value, that 
        is the size of the object pointed to by GetValue. Note that for
@@ -520,33 +520,55 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
        Returns the length of a field (attribute) in bytes. Tuple and field 
        indices start at 0. 
        <synopsis>
-	int PgDatabase::GetLength(int tup_num, const char* field_name)
+	int PgDatabase::GetLength(int tup_num, const char* field_name) const
        </synopsis>
        This is the actual data length for the particular data value, that 
        is the size of the object pointed to by GetValue. Note that for
        ASCII-represented values, this size has little to do with the binary 
        size reported by PQfsize.
       </para>
      </listitem>
+     <listitem>
+      <para>
+       <function>GetIsNull</function>
+       Returns whether a field has the null value.
+       <synopsis>
+        bool GetIsNull(int tup_num, int field_num) const
+       </synopsis>
+       Note that GetValue will return the empty string for null fields, not
+       the NULL pointer.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <function>GetIsNull</function>
+       Returns whether a field has the null value.
+       <synopsis>
+        bool GetIsNull(int tup_num, const char *field_name) const
+       </synopsis>
+       Note that GetValue will return the empty string for null fields, not
+       the NULL pointer.
+      </para>
+     </listitem>
      <listitem>
       <para>
        <function>DisplayTuples</function>
-       Prints out all the tuples and, optionally, the attribute names to the 
+       OBSOLESCENT: Prints out all the tuples and, optionally, the attribute names to the 
        specified output stream. 
        <synopsis>
-	void PgDatabase::DisplayTuples(FILE *out = 0, int fillAlign = 1, 
-	const char* fieldSep = "|",int printHeader = 1, int quiet = 0)
+	void PgDatabase::DisplayTuples(FILE *out = 0, bool fillAlign = true, 
+	const char* fieldSep = "|",bool printHeader = true, bool quiet = false) const
        </synopsis>
       </para>
      </listitem>
      <listitem>
       <para>
        <function>PrintTuples</function>
-       Prints out all the tuples and, optionally, the attribute names to the 
+       OBSOLESCENT: Prints out all the tuples and, optionally, the attribute names to the 
        specified output stream. 
        <synopsis>
-	void PgDatabase::PrintTuples(FILE *out = 0, int printAttName = 1, 
-	int terseOutput = 0, int width = 0) 
+	void PgDatabase::PrintTuples(FILE *out = 0, bool printAttName = true, 
+	bool terseOutput = false, bool fillAlign = false) const
        </synopsis>
       </para>
      </listitem>
@@ -563,7 +585,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
               Returns the number of rows affected after an INSERT, UPDATE or DELETE. 
               If the command was anything else, it returns -1. 
        <synopsis>
-      int PgDatabase::CmdTuples()
+      int PgDatabase::CmdTuples() const
        </synopsis>
       </para>
      </listitem>
@@ -572,7 +594,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
       <para>
        <function>OidStatus</function>
        <synopsis>
-	const char *PgDatabase::OidStatus()
+	const char *PgDatabase::OidStatus() const
        </synopsis>
       </para>
      </listitem>
@@ -650,8 +672,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.28 2001/05/01 10:48:
     to see if any notification data is currently available from the backend. 
     <function>PgDatabase::Notifies</function>
     returns the notification from a list of unhandled notifications from the
-    backend. The function eturns NULL if there is no pending notifications from the
-    backend.   
+    backend. The function returns NULL if there are no pending notifications 
+    from the backend.   
     <function>PgDatabase::Notifies</function>
     behaves like the popping of a stack.  Once a notification is returned
     from <function>PgDatabase::Notifies</function>,

doc/src/sgml/ref/psql-ref.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.50 2001/05/07 19:31:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.51 2001/05/09 17:29:10 momjian Exp $
 Postgres documentation
 -->
 
@@ -494,6 +494,16 @@ testdb=>
       </varlistentry>
 
 
+      <varlistentry>
+        <term><literal>\du [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
+        <listitem>
+        <para>
+        Lists all configured users or only those that match <replaceable class="parameter">pattern</replaceable>.
+        </para>
+        </listitem>
+      </varlistentry>
+
+
       <varlistentry>
         <term><literal>\edit</literal> (or <literal>\e</literal>) [ <replaceable class="parameter">filename</replaceable> ]</term>
 

src/bin/psql/command.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.51 2001/05/07 19:31:33 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.52 2001/05/09 17:29:10 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -357,6 +357,9 @@ exec_command(const char *cmd,
 			case 'S':
 				success = listTables(&cmd[1], name, show_verbose);
 				break;
+			case 'u':
+				success = describeUsers(name);
+  				break;
 			default:
 				status = CMD_UNKNOWN;
 		}

src/bin/psql/describe.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.28 2001/03/22 04:00:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.29 2001/05/09 17:29:10 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -890,6 +890,103 @@ describeTableDetails(const char *name, bool desc)
 }
 
 
+/*
+ * describeUsers()
+ *
+ * \du [user]
+ *
+ * Describes users, possibly based on a simplistic prefix search on the
+ * argument.
+ */
+
+bool
+describeUsers (const char *name)
+{
+	char		buf[384 + REGEXP_CUTOFF];
+	PGresult   *res;
+	printTableOpt myopt = pset.popt.topt;
+	int 		i;
+	char 	   *title;
+    const char *headers[4];
+	char	  **cells	= NULL;
+	unsigned int cols;
+	
+	/*
+	 * All we want to know is the user names and permissions
+	 * for the system.
+	 */
+
+	title = "List of Users";
+
+	cols = 0;
+	headers[cols++] = "User Name";
+	headers[cols++] = "User ID";
+	headers[cols++] = "Attributes";
+	headers[cols] = NULL;
+
+	strcpy(buf,
+		   "SELECT u.usename AS \"User Name\"\n
+                 , u.usesysid AS \"User ID\"\n
+                 , u.usesuper AS \"Super User\"\n
+                 , u.usecreatedb AS \"Create DB\"\n
+              FROM pg_user u\n");
+	if (name)
+	{
+		strcat(buf, "   WHERE u.usename ~ '^");
+		strncat(buf, name, REGEXP_CUTOFF);
+		strcat(buf, "'\n");
+	}
+	strcat(buf, "ORDER BY \"User Name\"\n");
+
+	res = PSQLexec(buf);
+	if (!res)
+		return false;
+
+	cells = xmalloc((PQntuples(res) * cols + 1) * sizeof(*cells));
+	cells[PQntuples(res) * cols] = NULL;
+
+	for (i = 0; i < PQntuples(res); i++)
+	{
+		char createuser[2] = "";
+		char createdb[2]  = "";
+
+		/* Name */
+		cells[i * cols + 0] = PQgetvalue(res, i, 0);
+
+		/* ID */
+		cells[i * cols + 1] = PQgetvalue(res, i, 1);
+
+		/* Super */
+		strcpy(createuser, PQgetvalue(res, i, 2));
+
+		/* Create DB */
+		strcpy(createdb, PQgetvalue(res, i, 3));
+
+		cells[i * cols + 2] = xmalloc((strlen("create user, create DB") * sizeof(char)) + 1);
+		strcpy(cells[i * cols + 2], "");
+		
+ 		if (strcmp(createuser, "t") == 0)
+ 			strcat(cells[i * cols + 2], "create user");
+		
+ 		if (strcmp(createdb, "t") == 0) {
+			if (strcmp(createuser, "t") == 0) 
+				strcat(cells[i * cols + 2], ", ");
+ 			strcat(cells[i * cols + 2], "create DB");
+		}
+	}	   
+
+	printTable(title, headers,
+			   (const char **) cells,
+			   NULL,
+			   "lll", &myopt, pset.queryFout);
+
+	/* clean up */
+	free(cells);
+
+	PQclear(res);
+	return true;
+}
+
 
 /*
  * listTables()

src/bin/psql/describe.h

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.9 2000/04/12 17:16:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.10 2001/05/09 17:29:10 momjian Exp $
  */
 #ifndef DESCRIBE_H
 #define DESCRIBE_H
@@ -22,6 +22,9 @@ bool		describeTypes(const char *name, bool verbose);
 /* \do */
 bool		describeOperators(const char *name);
 
+/* \du */
+bool 		describeUsers(const char *name);
+
 /* \z (or \dp) */
 bool		permissionsList(const char *name);
 

src/interfaces/libpq++/examples/testlibpq4.cc

@@ -22,12 +22,12 @@ INSERT INTO TBL1 values (10);
 #include "libpq++.h"
 #include <stdlib.h>
 
-main()
+int main()
 {
   // Begin, by connecting to the backend using hardwired constants
   // and a test database created by the user prior to the invokation
   // of this test program.
-  char* dbName = "dbname=template1";
+  const char* dbName = "dbname=template1";
   PgDatabase data(dbName);
 
   // Check to see that the backend connection was successfully made