postgrespro
diff --git a/‎src/bin/pg_dump/common.c
Lines changed: 29 additions & 6 deletions b/‎src/bin/pg_dump/common.c
Lines changed: 29 additions & 6 deletions
diff --git a/‎src/bin/pg_dump/pg_backup_archiver.h
Lines changed: 6 additions & 2 deletions b/‎src/bin/pg_dump/pg_backup_archiver.h
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/bin/pg_dump/pg_backup_db.c
Lines changed: 10 additions & 1 deletion b/‎src/bin/pg_dump/pg_backup_db.c
Lines changed: 10 additions & 1 deletion
@@ -8,14 +8,22 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.45 2000/08/06 17:50:48 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.46 2000/09/15 04:35:16 pjw Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
  *	 - Fixed dumpTable output to output lengths for char and varchar types!
  *	 - Added single. quote to twin single quote expansion for 'insert' string
  *	   mode.
  *
+ * Modifications 14-Sep-2000 - pjw@rhyme.com.au 
+ *	-	Added enum for findTypeByOid to specify how to handle OID and which 
+ *		string to return - formatted type, or base type. If the base type
+ *		is returned then fmtId is called on the string.
+ *
+ *		BEWARE: Since fmtId uses a static buffer, using 'useBaseTypeName' on more
+ *				than one call in a line will cause problems.
+ *
  *-------------------------------------------------------------------------
  */
 
@@ -50,17 +58,32 @@ static int	strInArray(const char *pattern, char **arr, int arr_size);
  */
 
 char *
-findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid)
+findTypeByOid(TypeInfo *tinfo, int numTypes, const char *oid, OidOptions opts)
 {
 	int			i;
 
-	if (strcmp(oid, "0") == 0)
-		return g_opaque_type;
+	if (strcmp(oid, "0") == 0) {
+
+		if ( (opts & zeroAsOpaque) != 0 ) {
+
+			return g_opaque_type;
+
+		} else if ( (opts & zeroAsAny) != 0 ) {
+
+			return "'any'";
+
+		}
+	}
 
 	for (i = 0; i < numTypes; i++)
 	{
-		if (strcmp(tinfo[i].oid, oid) == 0)
-			return tinfo[i].typname;
+		if (strcmp(tinfo[i].oid, oid) == 0) {
+			if ( (opts & useBaseTypeName) != 0 ) {
+				return fmtId(tinfo[i].typname, false);
+			} else {
+				return tinfo[i].typedefn;
+			}
+		}
 	}
 
 	/* should never get here */
 
@@ -20,7 +20,10 @@
  *
  * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
  *
- *	Initial version. 
+ *		Initial version. 
+ *
+ * Modifications - 15-Sep-2000 - pjw@rhyme.com.au
+ *	-	Added braceDepth to sqlparseInfo to handle braces in rule definitions.
  *
  *-------------------------------------------------------------------------
  */
@@ -59,7 +62,7 @@ typedef z_stream *z_streamp;
 
 #define K_VERS_MAJOR 1
 #define K_VERS_MINOR 4 
-#define K_VERS_REV 11 
+#define K_VERS_REV 14 
 
 /* Data block types */
 #define BLK_DATA 1
@@ -124,6 +127,7 @@ typedef struct {
 	sqlparseState		state;
 	char				lastChar;
 	char				quoteChar;
+	int					braceDepth;
 } sqlparseInfo;
 
 typedef struct _archiveHandle {
 
@@ -483,7 +483,7 @@ int ExecuteSqlCommandBuf(ArchiveHandle* AH, void *qryv, int bufLen)
 
 				case SQL_SCAN: /* Default state == 0, set in _allocAH */
 
-					if (qry[pos] == ';')
+					if (qry[pos] == ';' && AH->sqlparse.braceDepth == 0)
 					{
 						/* Send It & reset the buffer */
 						/* fprintf(stderr, "    sending: '%s'\n\n", AH->sqlBuf->data); */
@@ -507,7 +507,16 @@ int ExecuteSqlCommandBuf(ArchiveHandle* AH, void *qryv, int bufLen)
 						else if (qry[pos] == '*' && AH->sqlparse.lastChar == '/')
 						{
 							AH->sqlparse.state = SQL_IN_EXT_COMMENT;
+						} 
+						else if ( qry[pos] == '(' )
+						{
+							AH->sqlparse.braceDepth++;
 						}
+						else if (qry[pos] == ')')
+						{
+							AH->sqlparse.braceDepth--;
+						}
+
 						AH->sqlparse.lastChar = qry[pos];
 					}
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ int ExecuteSqlCommandBuf(ArchiveHandle* AH, void *qryv, int bufLen)`
`483`	`483`
`484`	`484`	`case SQL_SCAN: /* Default state == 0, set in _allocAH */`
`485`	`485`
`486`		`- if (qry[pos] == ';')`
	`486`	`+ if (qry[pos] == ';' && AH->sqlparse.braceDepth == 0)`
`487`	`487`	`{`
`488`	`488`	`/* Send It & reset the buffer */`
`489`	`489`	`/* fprintf(stderr, " sending: '%s'\n\n", AH->sqlBuf->data); */`
`@@ -507,7 +507,16 @@ int ExecuteSqlCommandBuf(ArchiveHandle* AH, void *qryv, int bufLen)`
`507`	`507`	`else if (qry[pos] == '*' && AH->sqlparse.lastChar == '/')`
`508`	`508`	`{`
`509`	`509`	`AH->sqlparse.state = SQL_IN_EXT_COMMENT;`
	`510`	`+ }`
	`511`	`+ else if ( qry[pos] == '(' )`
	`512`	`+ {`
	`513`	`+ AH->sqlparse.braceDepth++;`
`510`	`514`	`}`
	`515`	`+ else if (qry[pos] == ')')`
	`516`	`+ {`
	`517`	`+ AH->sqlparse.braceDepth--;`
	`518`	`+ }`
	`519`	`+`
`511`	`520`	`AH->sqlparse.lastChar = qry[pos];`
`512`	`521`	`}`
`513`	`522`