declare handling

Tanya Gupta · Tanya Gupta · commit 84f04e40031c · 2025-05-08T10:18:07.000Z
Signed-off-by: Tanya Gupta &lt;tanyagp@amazon.com&gt;
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
@@ -302,14 +302,6 @@ exprTypmod(const Node *expr)
 {
 	if (!expr)
 		return -1;
-	if (exprTypmod_hook)
-	{
-		int32 typmod = exprTypmod_hook(NULL, (Node *) expr);
-		if (typmod != -1)
-		{
-			return typmod;
-		}
-	}
 
 	switch (nodeTag(expr))
 	{
@@ -549,6 +541,9 @@ exprTypmod(const Node *expr)
 			break;
 	}
 
+	if (exprTypmod_hook)
+		return exprTypmod_hook(NULL, (Node *) expr);
+
 	return -1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -302,14 +302,6 @@ exprTypmod(const Node *expr)`
`302`	`302`	`{`
`303`	`303`	`if (!expr)`
`304`	`304`	`return -1;`
`305`		`- if (exprTypmod_hook)`
`306`		`- {`
`307`		`- int32 typmod = exprTypmod_hook(NULL, (Node *) expr);`
`308`		`- if (typmod != -1)`
`309`		`- {`
`310`		`- return typmod;`
`311`		`- }`
`312`		`- }`
`313`	`305`
`314`	`306`	`switch (nodeTag(expr))`
`315`	`307`	`{`
`@@ -549,6 +541,9 @@ exprTypmod(const Node *expr)`
`549`	`541`	`break;`
`550`	`542`	`}`
`551`	`543`
	`544`	`+ if (exprTypmod_hook)`
	`545`	`+ return exprTypmod_hook(NULL, (Node *) expr);`
	`546`	`+`
`552`	`547`	`return -1;`
`553`	`548`	`}`
`554`	`549`