Commit 4e8efb7

authored

Merge pull request #256 from postgrespro/PGPRO-7397

Fix build due to new checks in PostgreSQL 16

2 parents 7a24403 + 2680eee commit 4e8efb7Copy full SHA for 4e8efb7

File tree

3 files changed

-9

lines changed

3 files changed

-9

lines changed

`‎src/pl_funcs.c‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ get_partition_cooked_key_pl(PG_FUNCTION_ARGS)`
`179`	`179`	`pfree(expr_cstr);`
`180`	`180`	`pfree(expr);`
`181`	`181`
`182`		`- PG_RETURN_TEXT_P(CStringGetTextDatum(cooked_cstr));`
	`182`	`+ PG_RETURN_DATUM(CStringGetTextDatum(cooked_cstr));`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/*`
`@@ -199,7 +199,7 @@ get_cached_partition_cooked_key_pl(PG_FUNCTION_ARGS)`
`199`	`199`	`res = CStringGetTextDatum(nodeToString(prel->expr));`
`200`	`200`	`close_pathman_relation_info(prel);`
`201`	`201`
`202`		`- PG_RETURN_TEXT_P(res);`
	`202`	`+ PG_RETURN_DATUM(res);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/*`
`@@ -688,7 +688,7 @@ validate_expression(PG_FUNCTION_ARGS)`
`688`	`688`
`689`	`689`	`if (!PG_ARGISNULL(1))`
`690`	`690`	`{`
`691`		`- expression = TextDatumGetCString(PG_GETARG_TEXT_P(1));`
	`691`	`+ expression = TextDatumGetCString(PG_GETARG_DATUM(1));`
`692`	`692`	`}`
`693`	`693`	`else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`694`	`694`	`errmsg("'expression' should not be NULL")));`
`@@ -818,7 +818,7 @@ add_to_pathman_config(PG_FUNCTION_ARGS)`
`818`	`818`
`819`	`819`	`if (!PG_ARGISNULL(1))`
`820`	`820`	`{`
`821`		`- expression = TextDatumGetCString(PG_GETARG_TEXT_P(1));`
	`821`	`+ expression = TextDatumGetCString(PG_GETARG_DATUM(1));`
`822`	`822`	`}`
`823`	`823`	`else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`824`	`824`	`errmsg("'expression' should not be NULL")));`
`@@ -1203,7 +1203,7 @@ is_operator_supported(PG_FUNCTION_ARGS)`
`1203`	`1203`	`{`
`1204`	`1204`	`Oid opid,`
`1205`	`1205`	`typid = PG_GETARG_OID(0);`
`1206`		`- char *opname = TextDatumGetCString(PG_GETARG_TEXT_P(1));`
	`1206`	`+ char *opname = TextDatumGetCString(PG_GETARG_DATUM(1));`
`1207`	`1207`
`1208`	`1208`	`opid = compatible_oper_opid(list_make1(makeString(opname)),`
`1209`	`1209`	`typid, typid, true);`

`‎src/pl_hash_funcs.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ Datum`
`119`	`119`	`build_hash_condition(PG_FUNCTION_ARGS)`
`120`	`120`	`{`
`121`	`121`	`Oid expr_type = PG_GETARG_OID(0);`
`122`		`- char *expr_cstr = TextDatumGetCString(PG_GETARG_TEXT_P(1));`
	`122`	`+ char *expr_cstr = TextDatumGetCString(PG_GETARG_DATUM(1));`
`123`	`123`	`uint32 part_count = PG_GETARG_UINT32(2),`
`124`	`124`	`part_idx = PG_GETARG_UINT32(3);`
`125`	`125`

`‎src/pl_range_funcs.c‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ create_single_range_partition_pl(PG_FUNCTION_ARGS)`
`156`	`156`	`/* Fetch 'tablespace' */`
`157`	`157`	`if (!PG_ARGISNULL(4))`
`158`	`158`	`{`
`159`		`- tablespace = TextDatumGetCString(PG_GETARG_TEXT_P(4));`
	`159`	`+ tablespace = TextDatumGetCString(PG_GETARG_DATUM(4));`
`160`	`160`	`}`
`161`	`161`	`else tablespace = NULL; /* default */`
`162`	`162`
`@@ -429,7 +429,7 @@ validate_interval_value(PG_FUNCTION_ARGS)`
`429`	`429`	`ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`430`	`430`	`errmsg("'expression' should not be NULL")));`
`431`	`431`	`}`
`432`		`- else expr_cstr = TextDatumGetCString(PG_GETARG_TEXT_P(ARG_EXPRESSION));`
	`432`	`+ else expr_cstr = TextDatumGetCString(PG_GETARG_DATUM(ARG_EXPRESSION));`
`433`	`433`
`434`	`434`	`if (PG_ARGISNULL(ARG_PARTTYPE))`
`435`	`435`	`{`
`@@ -1086,7 +1086,7 @@ build_range_condition(PG_FUNCTION_ARGS)`
`1086`	`1086`
`1087`	`1087`	`if (!PG_ARGISNULL(1))`
`1088`	`1088`	`{`
`1089`		`- expression = TextDatumGetCString(PG_GETARG_TEXT_P(1));`
	`1089`	`+ expression = TextDatumGetCString(PG_GETARG_DATUM(1));`
`1090`	`1090`	`}`
`1091`	`1091`	`else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`1092`	`1092`	`errmsg("'expression' should not be NULL")));;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4e8efb7

File tree

3 files changed

3 files changed

`‎src/pl_funcs.c‎`

`‎src/pl_hash_funcs.c‎`

`‎src/pl_range_funcs.c‎`

0 commit comments