=== Applying patches on top of PostgreSQL commit ID e76defbcf09e22941d8cea462e2deef36d43fa04 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Nov 17 06:39:21 UTC 2025
On branch cf/6179
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Disallow-generated-columns-in-COPY-WHERE-clause.patch ===
Applying: Disallow generated columns in COPY WHERE clause
Using index info to reconstruct a base tree...
M	src/backend/commands/copy.c
M	src/test/regress/expected/generated_stored.out
M	src/test/regress/expected/generated_virtual.out
M	src/test/regress/sql/copy2.sql
M	src/test/regress/sql/generated_stored.sql
M	src/test/regress/sql/generated_virtual.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/generated_virtual.sql
Auto-merging src/test/regress/sql/copy2.sql
Auto-merging src/test/regress/expected/generated_virtual.out
Auto-merging src/backend/commands/copy.c
CONFLICT (content): Merge conflict in src/backend/commands/copy.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 Disallow generated columns in COPY WHERE clause
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".
Unstaged changes after reset:
M	src/backend/commands/copy.c
M	src/test/regress/sql/copy2.sql
=== using patch(1) to apply patch ./0001-Disallow-generated-columns-in-COPY-WHERE-clause.patch ===
patching file src/backend/commands/copy.c
Hunk #1 FAILED at 133.
Hunk #2 succeeded at 184 with fuzz 2 (offset 39 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/backend/commands/copy.c.rej
patching file src/test/regress/expected/generated_stored.out
Hunk #1 FAILED at 502.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/generated_stored.out.rej
patching file src/test/regress/expected/generated_virtual.out
Hunk #1 FAILED at 496.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/generated_virtual.out.rej
patching file src/test/regress/sql/copy2.sql
Hunk #1 succeeded at 161 (offset 3 lines).
patching file src/test/regress/sql/generated_stored.sql
Hunk #1 succeeded at 221 with fuzz 2 (offset 4 lines).
patching file src/test/regress/sql/generated_virtual.sql
Hunk #1 succeeded at 221 with fuzz 2 (offset 4 lines).
Unstaged changes after reset:
M	src/backend/commands/copy.c
M	src/test/regress/sql/copy2.sql
M	src/test/regress/sql/generated_stored.sql
M	src/test/regress/sql/generated_virtual.sql
Removing src/backend/commands/copy.c.rej
Removing src/test/regress/expected/generated_stored.out.rej
Removing src/test/regress/expected/generated_virtual.out.rej
=== using 'git apply' to apply patch ./0001-Disallow-generated-columns-in-COPY-WHERE-clause.patch ===
Applied patch to 'src/backend/commands/copy.c' with conflicts.
Applied patch to 'src/test/regress/expected/generated_stored.out' cleanly.
Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly.
Applied patch to 'src/test/regress/sql/copy2.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_stored.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly.
U src/backend/commands/copy.c
diff --cc src/backend/commands/copy.c
index 28e878c3688,1a25d36e34a..00000000000
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@@ -178,7 -178,7 +178,11 @@@ DoCopy(ParseState *pstate, const CopySt
  				 */
  				if (TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated)
  					ereport(ERROR,
++<<<<<<< ours
 +							errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
++=======
+ 							errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
++>>>>>>> theirs
  							errmsg("generated columns are not supported in COPY FROM WHERE conditions"),
  							errdetail("Column \"%s\" is a generated column.",
  									  get_attname(RelationGetRelid(rel), attno, false)));