summaryrefslogtreecommitdiffstats
path: root/src/backend/catalog/dependency.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/catalog/dependency.c')
-rw-r--r--src/backend/catalog/dependency.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 85e2a90..3cca107 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -75,6 +75,7 @@
#include "commands/trigger.h"
#include "commands/typecmds.h"
#include "funcapi.h"
+#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
#include "parser/parsetree.h"
#include "rewrite/rewriteRemove.h"
@@ -517,6 +518,12 @@ findDependentObjects(const ObjectAddress *object,
return;
/*
+ * since this function recurses, it could be driven to stack overflow,
+ * because of the deep dependency tree, not only due to dependency loops.
+ */
+ check_stack_depth();
+
+ /*
* It's also possible that the target object has already been completely
* processed and put into targetObjects. If so, again we just add the
* specified objflags to its entry and return.
@@ -2378,7 +2385,11 @@ process_function_rte_ref(RangeTblEntry *rte, AttrNumber attnum,
{
TupleDesc tupdesc;
- tupdesc = get_expr_result_tupdesc(rtfunc->funcexpr, true);
+ /* If it has a coldeflist, it certainly returns RECORD */
+ if (rtfunc->funccolnames != NIL)
+ tupdesc = NULL; /* no need to work hard */
+ else
+ tupdesc = get_expr_result_tupdesc(rtfunc->funcexpr, true);
if (tupdesc && tupdesc->tdtypeid != RECORDOID)
{
/*