=== Applying patches on top of PostgreSQL commit ID e2809e3a1015697832ee4d37b75ba1cd0caac0f0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 31 10:55:23 UTC 2025
On branch cf/5667
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-support-create-index-on-virtual-generated-column.patch ===
Applying: support create index on virtual generated column.
.git/rebase-apply/patch:250: trailing whitespace.
	 * updated correctly, and they don't seem useful anyway.	
.git/rebase-apply/patch:271: trailing whitespace.
	 * Also check for system used in expressions or predicates.	 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/backend/commands/indexcmds.c
M	src/backend/commands/tablecmds.c
M	src/include/nodes/execnodes.h
M	src/test/regress/expected/generated_virtual.out
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/expected/generated_virtual.out
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/indexcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/indexcmds.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 support create index on virtual generated column.
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	contrib/pageinspect/expected/btree.out
M	contrib/pageinspect/sql/btree.sql
M	doc/src/sgml/catalogs.sgml
M	src/backend/catalog/index.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/utils/adt/ruleutils.c
M	src/backend/utils/cache/relcache.c
M	src/include/catalog/pg_index.h
M	src/include/nodes/execnodes.h
M	src/include/utils/relcache.h
M	src/test/regress/expected/fast_default.out
M	src/test/regress/expected/generated_virtual.out
M	src/test/regress/sql/fast_default.sql
M	src/test/regress/sql/generated_virtual.sql
=== using patch(1) to apply patch ./v1-0001-support-create-index-on-virtual-generated-column.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v1-0001-support-create-index-on-virtual-generated-column.patch ===
/work/patches/./v1-0001-support-create-index-on-virtual-generated-column.patch:273: trailing whitespace.
	 * updated correctly, and they don't seem useful anyway.	
/work/patches/./v1-0001-support-create-index-on-virtual-generated-column.patch:294: trailing whitespace.
	 * Also check for system used in expressions or predicates.	 
Applied patch to 'contrib/pageinspect/expected/btree.out' cleanly.
Applied patch to 'contrib/pageinspect/sql/btree.sql' cleanly.
Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly.
Applied patch to 'src/backend/catalog/index.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' with conflicts.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/include/catalog/pg_index.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/utils/relcache.h' cleanly.
Applied patch to 'src/test/regress/expected/fast_default.out' cleanly.
Applied patch to 'src/test/regress/expected/generated_virtual.out' cleanly.
Applied patch to 'src/test/regress/sql/fast_default.sql' cleanly.
Applied patch to 'src/test/regress/sql/generated_virtual.sql' cleanly.
U src/backend/commands/indexcmds.c
warning: 2 lines add whitespace errors.
diff --cc src/backend/commands/indexcmds.c
index 33c2106c17c,44e806520f8..00000000000
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@@ -1114,16 -1144,6 +1144,19 @@@ DefineIndex(Oid tableId
  			ereport(ERROR,
  					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
  					 errmsg("index creation on system columns is not supported")));
++<<<<<<< ours
 +
 +
 +		if (TupleDescAttr(RelationGetDescr(rel), attno - 1)->attgenerated == ATTRIBUTE_GENERATED_VIRTUAL)
 +			ereport(ERROR,
 +					errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 +					stmt->primary ?
 +					errmsg("primary keys on virtual generated columns are not supported") :
 +					stmt->isconstraint ?
 +					errmsg("unique constraints on virtual generated columns are not supported") :
 +					errmsg("indexes on virtual generated columns are not supported"));
++=======
++>>>>>>> theirs
  	}
  
  	/*