From 6ca16d7b807524b4a5121c578bcf6a9f935684b2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 11 Dec 2002 04:07:39 +0000
Subject: [PATCH] Bump version for 7.3 and 7.4.
---
src/bin/psql/help.c | 80 +++++++++++++++++++------------
src/interfaces/ecpg/lib/Makefile | 4 +-
src/interfaces/libpgtcl/Makefile | 4 +-
src/interfaces/libpq/Makefile | 4 +-
src/interfaces/python/GNUmakefile | 4 +-
5 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index f9dd6145ae2..b85da2fd0ab 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.61 2002/11/08 19:12:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.62 2002/12/11 04:07:39 momjian Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -171,14 +171,34 @@ slashUsage(unsigned short int pager)
* if this " is the start of the string then it ought to end there to
* fit in 80 columns >> "
*/
- fprintf(output, _(" \\a toggle between unaligned and aligned output mode\n"));
+ fprintf(output, _("General\n"));
fprintf(output, _(" \\c[onnect] [DBNAME|- [USER]]\n"
" connect to new database (currently \"%s\")\n"),
PQdb(pset.db));
- fprintf(output, _(" \\C [STRING] set table title, or unset if none\n"));
- fprintf(output, _(" \\cd [DIR] change the current working directory\n"));
- fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
+ fprintf(output, _(" \\q quit psql\n"));
+ fprintf(output, _(" \\h [NAME] help on syntax of SQL commands, * for all commands\n"));
fprintf(output, _(" \\copyright show PostgreSQL usage and distribution terms\n"));
+ fprintf(output, _(" \\cd [DIR] change the current working directory\n"));
+ fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));
+ fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n"));
+ fprintf(output, _(" \\set [NAME [VALUE]] set internal variable, or list all if no parameters\n"));
+ fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));
+ fprintf(output, _(" \\timing toggle timing of commands (currently %s)\n"),
+ ON(pset.timing));
+ fprintf(output, _("\n"));
+
+ fprintf(output, _("Query Buffer\n"));
+ fprintf(output, _(" \\g [FILE] send query buffer to server (and results to file or |pipe)\n"));
+ fprintf(output, _(" \\r reset (clear) the query buffer\n"));
+ fprintf(output, _(" \\e [FILE] edit the query buffer (or file) with external editor\n"));
+ fprintf(output, _(" \\i FILE execute commands from file\n"));
+ fprintf(output, _(" \\p show the contents of the query buffer\n"));
+ fprintf(output, _(" \\w [FILE] write query buffer to file\n"));
+ fprintf(output, _(" \\o FILE send all query results to file or |pipe\n"));
+ fprintf(output, _(" \\s [FILE] display history or save it to file\n"));
+ fprintf(output, _("\n"));
+
+ fprintf(output, _("Informational\n"));
fprintf(output, _(" \\d [NAME] describe table, index, sequence, or view\n"));
fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
" list tables/indexes/sequences/views/system tables\n"));
@@ -191,39 +211,37 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\dp [PATTERN] list table access privileges\n"));
fprintf(output, _(" \\dT [PATTERN] list data types (add \"+\" for more detail)\n"));
fprintf(output, _(" \\du [PATTERN] list users\n"));
- fprintf(output, _(" \\e [FILE] edit the query buffer (or file) with external editor\n"));
- fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
- fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n"));
+ fprintf(output, _(" \\l list all databases (add \"+\" for more detail)\n"));
+ fprintf(output, _(" \\z [PATTERN] list table access privileges (same as \\dp)\n"));
+ fprintf(output, _("\n"));
+
+ fprintf(output, _("Large Object, Copy\n"));
+ fprintf(output, _(" \\lo_export\n"));
+ fprintf(output, _(" \\lo_import\n"));
+ fprintf(output, _(" \\lo_list\n"));
+ fprintf(output, _(" \\lo_unlink large object operations\n"));
+ fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
+ fprintf(output, _("\n"));
+
+ fprintf(output, _("Formatting\n"));
+ fprintf(output, _(" \\x toggle expanded output (currently %s)\n"),
+ ON(pset.popt.topt.expanded));
+ fprintf(output, _(" \\a toggle between unaligned and aligned output mode\n"));
fprintf(output, _(" \\f [STRING] show or set field separator for unaligned query output\n"));
- fprintf(output, _(" \\g [FILE] send query buffer to server (and results to file or |pipe)\n"));
- fprintf(output, _(" \\h [NAME] help on syntax of SQL commands, * for all commands\n"));
- fprintf(output, _(" \\H toggle HTML output mode (currently %s)\n"),
- ON(pset.popt.topt.format == PRINT_HTML));
- fprintf(output, _(" \\i FILE execute commands from file\n"));
- fprintf(output, _(" \\l list all databases\n"));
- fprintf(output, _(" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
- " large object operations\n"));
- fprintf(output, _(" \\o FILE send all query results to file or |pipe\n"));
- fprintf(output, _(" \\p show the contents of the query buffer\n"));
fprintf(output, _(" \\pset NAME [VALUE] set table output option\n"
" (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
" tuples_only|title|tableattr|pager})\n"));
- fprintf(output, _(" \\q quit psql\n"));
- fprintf(output, _(" \\qecho [STRING] write string to query output stream (see \\o)\n"));
- fprintf(output, _(" \\r reset (clear) the query buffer\n"));
- fprintf(output, _(" \\s [FILE] display history or save it to file\n"));
- fprintf(output, _(" \\set [NAME [VALUE]] set internal variable, or list all if no parameters\n"));
+ fprintf(output, _(" \\C [STRING] set table title, or unset if none\n"));
fprintf(output, _(" \\t show only rows (currently %s)\n"),
ON(pset.popt.topt.tuples_only));
+ fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
+ fprintf(output, _(" \\qecho [STRING] write string to query output stream (see \\o)\n"));
+ fprintf(output, _("\n"));
+
+ fprintf(output, _("HTML Output\n"));
+ fprintf(output, _(" \\H toggle HTML output mode (currently %s)\n"),
+ ON(pset.popt.topt.format == PRINT_HTML));
fprintf(output, _(" \\T [STRING] set HTML <table> tag attributes, or unset if none\n"));
- fprintf(output, _(" \\timing toggle timing of commands (currently %s)\n"),
- ON(pset.timing));
- fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));
- fprintf(output, _(" \\w [FILE] write query buffer to file\n"));
- fprintf(output, _(" \\x toggle expanded output (currently %s)\n"),
- ON(pset.popt.topt.expanded));
- fprintf(output, _(" \\z [PATTERN] list table access privileges (same as \\dp)\n"));
- fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));
if (output != stdout)
{
diff --git a/src/interfaces/ecpg/lib/Makefile b/src/interfaces/ecpg/lib/Makefile
index db4071cea49..cfc630537c1 100644
--- a/src/interfaces/ecpg/lib/Makefile
+++ b/src/interfaces/ecpg/lib/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.17 2002/12/04 18:14:11 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.18 2002/12/11 04:07:39 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
NAME= ecpg
SO_MAJOR_VERSION= 3
-SO_MINOR_VERSION= 4.1
+SO_MINOR_VERSION= 4.2
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS)
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
index c88e44e6b50..6a227cf5eff 100644
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.28 2002/12/04 18:14:11 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.29 2002/12/11 04:07:39 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ include ../../Makefile.global
NAME= pgtcl
SO_MAJOR_VERSION= 2
-SO_MINOR_VERSION= 3
+SO_MINOR_VERSION= 4
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index f4e08f0a4b4..a6022453393 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.68 2002/12/06 04:37:05 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.69 2002/12/11 04:07:39 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -16,7 +16,7 @@ include $(top_builddir)/src/Makefile.global
# shared library parameters
NAME= pq
SO_MAJOR_VERSION= 2
-SO_MINOR_VERSION= 3
+SO_MINOR_VERSION= 4
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile
index 3045502126e..7576372c602 100644
--- a/src/interfaces/python/GNUmakefile
+++ b/src/interfaces/python/GNUmakefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.14 2002/12/04 18:14:11 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.15 2002/12/11 04:07:39 momjian Exp $
subdir = src/interfaces/python
top_builddir = ../../..
@@ -6,7 +6,7 @@ include $(top_builddir)/src/Makefile.global
NAME = _pgmodule
SO_MAJOR_VERSION = 2
-SO_MINOR_VERSION = 3
+SO_MINOR_VERSION = 4
OBJS = pgmodule.o
SHLIB_LINK = $(libpq)
ifeq ($(PORTNAME), win)
--
GitLab