=== Applying patches on top of PostgreSQL commit ID 83032dc42cab67dfdd33152d08434785977f069f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Sep 3 21:09:27 UTC 2026 On branch cf/5941 nothing to commit, working tree clean === using 'git am' to apply patch ./v32-0001-error-safe-for-casting-text-to-other-types-per-pg_cast.patch === Applying: error safe for casting text to other types per pg_cast === using 'git am' to apply patch ./v32-0002-introduce-pg_proc.proerrorsafe.patch === Applying: introduce pg_proc.proerrorsafe Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M src/backend/catalog/pg_aggregate.c M src/backend/catalog/pg_proc.c M src/backend/commands/functioncmds.c M src/backend/commands/typecmds.c M src/backend/parser/gram.y M src/backend/utils/adt/ruleutils.c M src/bin/pg_dump/pg_dump.c M src/include/catalog/pg_proc.dat M src/test/regress/expected/misc_functions.out M src/test/regress/expected/opr_sanity.out M src/test/regress/sql/misc_functions.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/misc_functions.sql Auto-merging src/test/regress/expected/opr_sanity.out Auto-merging src/test/regress/expected/misc_functions.out Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/commands/typecmds.c Auto-merging src/backend/commands/functioncmds.c Auto-merging src/backend/catalog/pg_proc.c Auto-merging src/backend/catalog/pg_aggregate.c Auto-merging doc/src/sgml/catalogs.sgml === using 'git am' to apply patch ./v32-0003-CAST-expr-AS-newtype-DEFAULT-expr-ON-CONVERSION-ERROR.patch === Applying: CAST(expr AS newtype DEFAULT expr ON CONVERSION ERROR) Using index info to reconstruct a base tree... M src/backend/executor/execExpr.c M src/backend/executor/execExprInterp.c M src/backend/jit/llvm/llvmjit_expr.c M src/backend/optimizer/util/clauses.c M src/backend/parser/gram.y M src/backend/parser/parse_agg.c M src/backend/parser/parse_coerce.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_type.c M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/arrayfuncs.c M src/backend/utils/adt/ruleutils.c M src/include/executor/executor.h M src/include/nodes/execnodes.h M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/parse_type.h M src/test/regress/expected/xml.out M src/test/regress/parallel_schedule M src/test/regress/sql/xml.sql M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/sql/xml.sql Auto-merging src/test/regress/parallel_schedule Auto-merging src/test/regress/expected/xml.out Auto-merging src/include/parser/parse_type.h CONFLICT (content): Merge conflict in src/include/parser/parse_type.h Auto-merging src/include/nodes/primnodes.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/nodes/execnodes.h Auto-merging src/include/executor/executor.h Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/utils/adt/arrayfuncs.c Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/parse_type.c Auto-merging src/backend/parser/parse_func.c Auto-merging src/backend/parser/parse_expr.c Auto-merging src/backend/parser/parse_coerce.c Auto-merging src/backend/parser/parse_agg.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/optimizer/util/clauses.c Auto-merging src/backend/jit/llvm/llvmjit_expr.c Auto-merging src/backend/executor/execExprInterp.c Auto-merging src/backend/executor/execExpr.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 CAST(expr AS newtype DEFAULT expr ON CONVERSION ERROR) When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v32-0003-CAST-expr-AS-newtype-DEFAULT-expr-ON-CONVERSION-ERROR.patch === patching file contrib/citext/expected/citext.out patching file contrib/citext/expected/citext_1.out patching file contrib/citext/sql/citext.sql patching file contrib/pg_stat_statements/expected/select.out patching file contrib/pg_stat_statements/sql/select.sql patching file doc/src/sgml/syntax.sgml patching file src/backend/executor/execExpr.c Hunk #8 succeeded at 2782 (offset -1 lines). Hunk #9 succeeded at 4784 (offset -1 lines). patching file src/backend/executor/execExprInterp.c patching file src/backend/jit/llvm/llvmjit_expr.c Hunk #1 succeeded at 2257 (offset -1 lines). patching file src/backend/nodes/nodeFuncs.c patching file src/backend/optimizer/prep/prepagg.c patching file src/backend/optimizer/util/clauses.c Hunk #2 succeeded at 2612 (offset 101 lines). Hunk #3 succeeded at 2631 (offset 101 lines). Hunk #4 succeeded at 2774 (offset 101 lines). Hunk #5 succeeded at 2800 (offset 101 lines). Hunk #6 succeeded at 3266 (offset 101 lines). Hunk #7 succeeded at 3286 (offset 101 lines). Hunk #8 succeeded at 3410 (offset 101 lines). Hunk #9 succeeded at 3588 (offset 101 lines). Hunk #10 succeeded at 3596 (offset 101 lines). Hunk #11 succeeded at 3608 (offset 101 lines). Hunk #12 succeeded at 3626 (offset 101 lines). Hunk #13 succeeded at 3827 (offset 101 lines). Hunk #14 succeeded at 3910 (offset 101 lines). Hunk #15 succeeded at 4022 (offset 115 lines). Hunk #16 succeeded at 4352 (offset 115 lines). Hunk #17 succeeded at 4752 (offset 115 lines). Hunk #18 succeeded at 5479 (offset 115 lines). Hunk #19 succeeded at 5933 (offset 115 lines). Hunk #20 succeeded at 5964 (offset 115 lines). Hunk #21 succeeded at 5984 (offset 115 lines). patching file src/backend/parser/gram.y Hunk #1 succeeded at 157 (offset -1 lines). Hunk #2 succeeded at 16825 (offset -57 lines). Hunk #3 succeeded at 19988 (offset -61 lines). patching file src/backend/parser/parse_agg.c patching file src/backend/parser/parse_coerce.c Hunk #14 succeeded at 750 (offset 4 lines). Hunk #15 succeeded at 781 (offset 4 lines). Hunk #16 succeeded at 831 (offset 4 lines). Hunk #17 succeeded at 857 (offset 4 lines). Hunk #18 succeeded at 916 (offset 4 lines). Hunk #19 succeeded at 952 (offset 4 lines). Hunk #20 succeeded at 1042 (offset 4 lines). Hunk #21 succeeded at 1232 (offset 4 lines). Hunk #22 succeeded at 1388 (offset 4 lines). patching file src/backend/parser/parse_expr.c patching file src/backend/parser/parse_func.c Hunk #1 succeeded at 2848 (offset 55 lines). patching file src/backend/parser/parse_target.c patching file src/backend/parser/parse_type.c patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 677 (offset -3 lines). Hunk #2 succeeded at 4911 (offset -282 lines). patching file src/backend/utils/adt/arrayfuncs.c Hunk #1 succeeded at 3292 (offset -2 lines). patching file src/backend/utils/adt/ruleutils.c Hunk #1 succeeded at 11117 (offset -2 lines). patching file src/include/executor/execExpr.h patching file src/include/executor/executor.h patching file src/include/nodes/execnodes.h Hunk #1 succeeded at 1095 (offset -1 lines). patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 401 (offset -1 lines). patching file src/include/nodes/primnodes.h Hunk #1 succeeded at 764 (offset 4 lines). patching file src/include/optimizer/optimizer.h patching file src/include/parser/parse_coerce.h patching file src/include/parser/parse_node.h patching file src/include/parser/parse_type.h Hunk #1 FAILED at 47. 1 out of 1 hunk FAILED -- saving rejects to file src/include/parser/parse_type.h.rej patching file src/test/regress/expected/cast.out patching file src/test/regress/expected/create_cast.out patching file src/test/regress/expected/equivclass.out patching file src/test/regress/expected/xml.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/cast.sql patching file src/test/regress/sql/create_cast.sql patching file src/test/regress/sql/equivclass.sql patching file src/test/regress/sql/xml.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2793 (offset 5 lines). Unstaged changes after reset: M contrib/citext/expected/citext.out M contrib/citext/expected/citext_1.out M contrib/citext/sql/citext.sql M contrib/pg_stat_statements/expected/select.out M contrib/pg_stat_statements/sql/select.sql M doc/src/sgml/syntax.sgml M src/backend/executor/execExpr.c M src/backend/executor/execExprInterp.c M src/backend/jit/llvm/llvmjit_expr.c M src/backend/nodes/nodeFuncs.c M src/backend/optimizer/prep/prepagg.c M src/backend/optimizer/util/clauses.c M src/backend/parser/gram.y M src/backend/parser/parse_agg.c M src/backend/parser/parse_coerce.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_target.c M src/backend/parser/parse_type.c M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/arrayfuncs.c M src/backend/utils/adt/ruleutils.c M src/include/executor/execExpr.h M src/include/executor/executor.h M src/include/nodes/execnodes.h M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/optimizer/optimizer.h M src/include/parser/parse_coerce.h M src/include/parser/parse_node.h M src/test/regress/expected/create_cast.out M src/test/regress/expected/equivclass.out M src/test/regress/expected/xml.out M src/test/regress/parallel_schedule M src/test/regress/sql/create_cast.sql M src/test/regress/sql/equivclass.sql M src/test/regress/sql/xml.sql M src/tools/pgindent/typedefs.list Removing src/include/parser/parse_type.h.rej Removing src/test/regress/expected/cast.out Removing src/test/regress/sql/cast.sql === using 'git apply' to apply patch ./v32-0003-CAST-expr-AS-newtype-DEFAULT-expr-ON-CONVERSION-ERROR.patch === Applied patch to 'contrib/citext/expected/citext.out' cleanly. Applied patch to 'contrib/citext/expected/citext_1.out' cleanly. Applied patch to 'contrib/citext/sql/citext.sql' cleanly. Applied patch to 'contrib/pg_stat_statements/expected/select.out' cleanly. Applied patch to 'contrib/pg_stat_statements/sql/select.sql' cleanly. Applied patch to 'doc/src/sgml/syntax.sgml' cleanly. Applied patch to 'src/backend/executor/execExpr.c' cleanly. Applied patch to 'src/backend/executor/execExprInterp.c' cleanly. Applied patch to 'src/backend/jit/llvm/llvmjit_expr.c' cleanly. Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepagg.c' cleanly. Applied patch to 'src/backend/optimizer/util/clauses.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_agg.c' cleanly. Applied patch to 'src/backend/parser/parse_coerce.c' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' cleanly. Applied patch to 'src/backend/parser/parse_func.c' cleanly. Applied patch to 'src/backend/parser/parse_target.c' cleanly. Applied patch to 'src/backend/parser/parse_type.c' cleanly. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/backend/utils/adt/arrayfuncs.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/include/executor/execExpr.h' cleanly. Applied patch to 'src/include/executor/executor.h' cleanly. Applied patch to 'src/include/nodes/execnodes.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/nodes/primnodes.h' cleanly. Applied patch to 'src/include/optimizer/optimizer.h' cleanly. Applied patch to 'src/include/parser/parse_coerce.h' cleanly. Applied patch to 'src/include/parser/parse_node.h' cleanly. Applied patch to 'src/include/parser/parse_type.h' with conflicts. Falling back to direct application... Applied patch to 'src/test/regress/expected/create_cast.out' cleanly. Applied patch to 'src/test/regress/expected/equivclass.out' cleanly. Applied patch to 'src/test/regress/expected/xml.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/sql/create_cast.sql' cleanly. Applied patch to 'src/test/regress/sql/equivclass.sql' cleanly. Applied patch to 'src/test/regress/sql/xml.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/include/parser/parse_type.h diff --cc src/include/parser/parse_type.h index 79f10b5b5b2,e303a1073c1..00000000000 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@@ -46,7 -46,9 +46,13 @@@ extern bool typeByVal(Type t) extern char *typeTypeName(Type t); extern Oid typeTypeRelid(Type typ); extern Oid typeTypeCollation(Type typ); ++<<<<<<< ours +extern Datum stringTypeDatum(Type tp, const char *string, int32 atttypmod); ++======= + extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod); + extern bool stringTypeDatumSafe(Type tp, char *string, int32 atttypmod, + Node *escontext, Datum *result); ++>>>>>>> theirs extern Oid typeidTypeRelid(Oid type_id); extern Oid typeOrDomainTypeRelid(Oid type_id);