Subselects with =, >, etc.

Cleanup for vacuum help, manual page, and error message

src/backend/commands/vacuum.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.59 1998/01/31 04:38:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.60 1998/02/03 19:26:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -135,7 +135,9 @@ vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec)
 	pmem = PortalGetVariableMemory(vc_portal);
 	old = MemoryContextSwitchTo((MemoryContext) pmem);
 
-	Assert(va_spec == NIL || analyze);
+	if (va_spec == NIL || analyze)
+		elog(ERROR,"Can't vacuum columns, only tables.  You can 'vacuum analyze' columns.");
+
 	foreach(le, va_spec)
 	{
 		char	   *col = (char *) lfirst(le);

src/bin/psql/psqlHelp.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psqlHelp.h,v 1.39 1998/01/22 23:05:09 momjian Exp $
+ * $Id: psqlHelp.h,v 1.40 1998/02/03 19:27:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -292,9 +292,10 @@ set R_PLANS to {'ON' | 'OFF'}"},
 	"update <class_name> set <attr1>=<expr1>,...<attrN>=<exprN> [from <from_clause>] [where <qual>];"},
 	{"vacuum",
 		"vacuum the database, i.e. cleans out deleted records, updates statistics",
-	"vacuum [verbose] [analyze]\n\
+	"\
+vacuum [verbose] [analyze] [table]\n\
 \tor\n\
-vacuum [verbose] [analyze] table [analyze [(attr1, ... attrN)] ];"},
+vacuum [verbose]  analyze  [table [(attr1, ... attrN)]];"},
 	{NULL, NULL, NULL}			/* important to keep a NULL terminator
 								 * here! */
 };

src/include/catalog/pg_type.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.29 1998/02/03 01:53:24 momjian Exp $
+ * $Id: pg_type.h,v 1.30 1998/02/03 19:27:17 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -366,7 +366,7 @@ DESCR("limited-range ISO-format date and time");
 
 
 #define USE_ATTTYPMOD(typeid)	((typeid) == BPCHAROID || (typeid) == VARCHAROID)
-#define VARLENA_FIXED_SIZE(typeid)	((typeid) == BPCHAROID)
+#define VARLENA_FIXED_SIZE(attr)	(false && (attr)->atttypid == BPCHAROID && (attr)->atttypmod > 0)
 
 /*
  * prototypes for functions in pg_type.c

src/man/vacuum.l

 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/vacuum.l,v 1.7 1998/01/11 22:18:01 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/vacuum.l,v 1.8 1998/02/03 19:27:30 momjian Exp $
 .TH VACUUM SQL 11/05/95 PostgreSQL PostgreSQL
 .SH NAME
 vacuum - vacuum a database
 .SH SYNOPSIS
 .nf
-\fBvacuum [verbose] [analyze] [\fPtable [(column,...)]\fB]\fP
+\fBvacuum [verbose] [analyze] [\fPtable\fB]\fP
+\fBvacuum [verbose]  analyze  [\fPtable [(column,...)]\fB]\fP
 .fi
 .SH DESCRIPTION
 .BR Vacuum