src/backend/tcop/postgres.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.86 1998/08/25 21:34:04 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.87 1998/08/30 21:05:27 scrappy Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -443,11 +443,41 @@ pg_parse_and_plan(char *query_string,	/* string to execute */
 
 		querytree = querytree_list->qtrees[i];
 
-		if (DebugPrintQuery == true)
+		if (DebugPrintQuery)
 		{
-			printf("\n---- \tquery is:\n%s\n", query_string);
-			printf("\n");
-			fflush(stdout);
+			if (DebugPrintQuery > 3) {
+				/* Print the query string as is if query debug level > 3 */
+				TPRINTF(TRACE_QUERY, "query: %s",query_string);
+			} else {
+				/* Print condensed query string to fit in one log line */
+				char	buff[8192+1];
+				char	c,
+						*s,
+						*d;
+				int 	n,
+						is_space=1;
+
+				for (s=query_string,d=buff,n=0; (c=*s) && (n<8192); s++) {
+					switch (c) {
+						case '\r':
+						case '\n':
+						case '\t':
+							c = ' ';
+							/* fall through */
+						case ' ':
+							if (is_space) continue;
+							is_space = 1;
+							break;
+						default:
+							is_space = 0;
+							break;
+					}
+					*d++ = c;
+					n++;
+				}
+				*d = '\0';
+				TPRINTF(TRACE_QUERY, "query: %s",buff);
+			}
 		}
 
 		/* don't rewrite utilites */
@@ -457,11 +487,10 @@ pg_parse_and_plan(char *query_string,	/* string to execute */
 			continue;
 		}
 
-		if (DebugPrintParse == true)
+		if (DebugPrintParse)
 		{
-			printf("\n---- \tparser outputs :\n");
+			TPRINTF(TRACE_PARSE, "parser outputs:");
 			nodeDisplay(querytree);
-			printf("\n");
 		}
 
 		/* rewrite queries (retrieve, append, delete, replace) */
@@ -906,8 +935,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	char			firstchar;
 	char			parser_input[MAX_PARSE_BUFFER];
 	char	   		*userName;
-	char	   		*remote_info;
-	char	   		*remote_host;
+
+	/* Used if verbose is set, must be initialized */
+	char	   		*remote_info = "interactive";
+	char	   		*remote_host = "";
 	unsigned short 	remote_port  = 0;
 
 	char	   		*DBDate = NULL;
@@ -1490,7 +1521,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface");
-		puts("$Revision: 1.86 $ $Date: 1998/08/25 21:34:04 $");
+		puts("$Revision: 1.87 $ $Date: 1998/08/30 21:05:27 $");
 	}
 
 	/* ----------------

src/man/create_sequence.l

 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/create_sequence.l,v 1.5 1998/07/14 01:45:25 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/create_sequence.l,v 1.6 1998/08/30 21:03:19 scrappy Exp $
 .TH "CREATE SEQUENCE" SQL 07/13/98 PostgreSQL PostgreSQL
 .SH NAME
 create sequence - create a new sequence number generator
@@ -82,6 +82,14 @@ given sequence in the current backend session.  Also beware that it
 does not give the last number ever allocated, only the last one allocated
 by this backend.
 .PP
+The function
+.BR setval
+('sequence_name', value)
+may be used to set the current value of the specified sequence.
+The next call to
+.BR nextval
+will return the given value + the sequence increment.
+.PP
 Use a query like
 .nf
 SELECT * FROM <sequence_name>;
@@ -134,6 +142,15 @@ select nextval ('seq');
 -- Use sequence in insert
 --
 insert into table _table_ values (nextval ('seq'),...);
+.nf
+--
+-- Set the sequence value after a copy in
+--
+create function table_id_max() returns int4
+    as 'select max(id) from _table_' 
+    language 'sql';
+copy _table_ from 'input_file';
+select setval('seq', table_id_max());
 .fi
 .SH "SEE ALSO"
 drop_sequence(l).

src/man/listen.l

 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.7 1998/07/09 03:29:09 scrappy Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/listen.l,v 1.8 1998/08/30 21:03:20 scrappy Exp $
 .TH "LISTEN" SQL 03/12/94 PostgreSQL PostgreSQL
 .SH NAME
 listen - listen for notification on a relation
@@ -27,16 +27,19 @@ in order to find out the name of the class to which a given
 notification corresponds.  If this code is not included in 
 the application, the event notification will be queued and 
 never be processed.
+.PP
+Note that
+.IR class_name
+needs not to be a valid class name but can be any ascii string up to 32
+characters long. It must however be eclosed in double-quotes if it is
+not valid as class name.
 .SH "SEE ALSO"
 create_rule(l),
 notify(l),
 select(l),
+unlisten(l),
 libpq.
 .SH BUGS
-There is no way to un-\c
-.BR listen
-except to drop the connection (i.e., restart the backend server).
-.PP
 The
 .IR psql(1)
 command does not poll for asynchronous events.