Only retrieve view definition if relation is a view (case statement)

Grunthos · Grunthos · commit 7cce011178f9 · 2000-09-18T06:47:46.000Z
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.167 2000/09/18 03:24:03 pjw Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.168 2000/09/18 06:47:46 pjw Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -1839,11 +1839,14 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 	appendPQExpBuffer(query,
 			   "SELECT pg_class.oid, relname, relkind, relacl, "
 					  "(select usename from pg_user where relowner = usesysid) as usename, "
-					  "relchecks, reltriggers, relhasindex, pg_get_viewdef(relname) as viewdef "
+					  "relchecks, reltriggers, relhasindex, "
+					  "Case When relkind = '%c' then pg_get_viewdef(relname) "
+					  "Else NULL End as viewdef "
 					  "from pg_class "
 					  "where relname !~ '^pg_' "
 					  "and relkind in ('%c', '%c', '%c') "
 					  "order by oid",
+				RELKIND_VIEW,
 				RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW);
 
 	res = PQexec(g_conn, query->data);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.167 2000/09/18 03:24:03 pjw Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.168 2000/09/18 06:47:46 pjw Exp $`
`26`	`26`	`*`
`27`	`27`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`28`	`28`	`*`
`@@ -1839,11 +1839,14 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`1839`	`1839`	`appendPQExpBuffer(query,`
`1840`	`1840`	`"SELECT pg_class.oid, relname, relkind, relacl, "`
`1841`	`1841`	`"(select usename from pg_user where relowner = usesysid) as usename, "`
`1842`		`- "relchecks, reltriggers, relhasindex, pg_get_viewdef(relname) as viewdef "`
	`1842`	`+ "relchecks, reltriggers, relhasindex, "`
	`1843`	`+ "Case When relkind = '%c' then pg_get_viewdef(relname) "`
	`1844`	`+ "Else NULL End as viewdef "`
`1843`	`1845`	`"from pg_class "`
`1844`	`1846`	`"where relname !~ '^pg_' "`
`1845`	`1847`	`"and relkind in ('%c', '%c', '%c') "`
`1846`	`1848`	`"order by oid",`
	`1849`	`+ RELKIND_VIEW,`
`1847`	`1850`	`RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW);`
`1848`	`1851`
`1849`	`1852`	`res = PQexec(g_conn, query->data);`