Commit650cef6

Ekaterina Sokolova

committed

Fix code due to commit d20d8fbd3e4d.

1 parent92c9ec4 commit650cef6Copy full SHA for 650cef6

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,12 @@ get_partition_cooked_key_pl(PG_FUNCTION_ARGS)`
`174`	`174`
`175`	`175`	`expr_cstr=TextDatumGetCString(values[Anum_pathman_config_expr-1]);`
`176`	`176`	`expr=cook_partitioning_expression(relid,expr_cstr,NULL);`
	`177`	`+`
	`178`	`+#ifPG_VERSION_NUM >=170000/* for commit d20d8fbd3e4d */`
	`179`	`+cooked_cstr=nodeToStringWithLocations(expr);`
	`180`	`+#else`
`177`	`181`	`cooked_cstr=nodeToString(expr);`
	`182`	`+#endif`
`178`	`183`
`179`	`184`	`pfree(expr_cstr);`
`180`	`185`	`pfree(expr);`
`@@ -196,7 +201,13 @@ get_cached_partition_cooked_key_pl(PG_FUNCTION_ARGS)`
`196`	`201`
`197`	`202`	`prel=get_pathman_relation_info(relid);`
`198`	`203`	`shout_if_prel_is_invalid(relid,prel,PT_ANY);`
	`204`	`+`
	`205`	`+#ifPG_VERSION_NUM >=170000/* for commit d20d8fbd3e4d */`
	`206`	`+res=CStringGetTextDatum(nodeToStringWithLocations(prel->expr));`
	`207`	`+#else`
`199`	`208`	`res=CStringGetTextDatum(nodeToString(prel->expr));`
	`209`	`+#endif`
	`210`	`+`
`200`	`211`	`close_pathman_relation_info(prel);`
`201`	`212`
`202`	`213`	`PG_RETURN_DATUM(res);`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1491,7 +1491,8 @@ parse_partitioning_expression(const Oid relid,`
`1491`	`1491`	`return ((ResTarget*)linitial(select_stmt->targetList))->val;`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`		`-/* Parse partitioning expression and return its type and nodeToString() as TEXT */`
	`1494`	`+/* Parse partitioning expression and return its type and nodeToString()`
	`1495`	`+ * (or nodeToStringWithLocations() in version 17 and higher) as TEXT */`
`1495`	`1496`	`Node*`
`1496`	`1497`	`cook_partitioning_expression(constOidrelid,`
`1497`	`1498`	`constchar*expr_cstr,`

Comments

(0)