=== Applying patches on top of PostgreSQL commit ID a8c2547eaac73cd6d499a4ab151f0401bf647f56 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Jul 5 02:39:24 UTC 2026 On branch cf/6848 nothing to commit, working tree clean === using 'git am' to apply patch ./0003-Properties-orphaned-by-dropping-a-label.patch === Applying: Properties orphaned by dropping a label Using index info to reconstruct a base tree... M src/backend/commands/propgraphcmds.c M src/test/regress/expected/create_property_graph.out M src/test/regress/sql/create_property_graph.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/create_property_graph.sql CONFLICT (content): Merge conflict in src/test/regress/sql/create_property_graph.sql Auto-merging src/test/regress/expected/create_property_graph.out CONFLICT (content): Merge conflict in src/test/regress/expected/create_property_graph.out Auto-merging src/backend/commands/propgraphcmds.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 Properties orphaned by dropping a label 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 ./0003-Properties-orphaned-by-dropping-a-label.patch === patching file src/backend/commands/propgraphcmds.c Hunk #1 succeeded at 1674 (offset 36 lines). patching file src/test/regress/expected/create_property_graph.out Hunk #1 FAILED at 82. Hunk #2 succeeded at 448 (offset 9 lines). Hunk #3 succeeded at 459 (offset 9 lines). Hunk #4 succeeded at 493 (offset 9 lines). Hunk #5 succeeded at 517 (offset 9 lines). Hunk #6 succeeded at 557 (offset 9 lines). Hunk #7 succeeded at 581 (offset 9 lines). Hunk #8 succeeded at 600 (offset 9 lines). Hunk #9 succeeded at 611 (offset 9 lines). Hunk #10 succeeded at 637 (offset 9 lines). Hunk #11 succeeded at 654 (offset 9 lines). Hunk #12 succeeded at 804 (offset 9 lines). 1 out of 12 hunks FAILED -- saving rejects to file src/test/regress/expected/create_property_graph.out.rej patching file src/test/regress/sql/create_property_graph.sql Hunk #1 FAILED at 75. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/sql/create_property_graph.sql.rej Unstaged changes after reset: M src/backend/commands/propgraphcmds.c M src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/create_property_graph.out.rej Removing src/test/regress/sql/create_property_graph.sql.rej === using 'git apply' to apply patch ./0003-Properties-orphaned-by-dropping-a-label.patch === Applied patch to 'src/backend/commands/propgraphcmds.c' cleanly. Applied patch to 'src/test/regress/expected/create_property_graph.out' with conflicts. Applied patch to 'src/test/regress/sql/create_property_graph.sql' with conflicts. U src/test/regress/expected/create_property_graph.out U src/test/regress/sql/create_property_graph.sql diff --cc src/test/regress/expected/create_property_graph.out index 2a52a396fb4,9a6018d717a..00000000000 --- a/src/test/regress/expected/create_property_graph.out +++ b/src/test/regress/expected/create_property_graph.out @@@ -89,8 -82,11 +89,16 @@@ CREATE PROPERTY GRAPH g ); ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 ADD PROPERTIES (k * 2 AS kk); ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 DROP PROPERTIES (k); ++<<<<<<< ours +ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 DROP PROPERTIES (yy); -- error +ERROR: property graph "g4" element "t2" label "t2" has no property "yy" ++======= + -- Dropping a label should drop only orphaned properties. zz is orphaned because + -- it is only associated with the dropped label t3l2, while x is not orphaned + -- because it remains associated with t3l1. We will verify this in the + -- information schema queries outputs below. + ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t3 DROP LABEL t3l2; ++>>>>>>> theirs CREATE TABLE t11 (a int PRIMARY KEY); CREATE TABLE t12 (b int PRIMARY KEY); CREATE TABLE t13 ( diff --cc src/test/regress/sql/create_property_graph.sql index 3b27d4170bb,c1ceaba7384..00000000000 --- a/src/test/regress/sql/create_property_graph.sql +++ b/src/test/regress/sql/create_property_graph.sql @@@ -80,7 -75,11 +80,15 @@@ CREATE PROPERTY GRAPH g ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 ADD PROPERTIES (k * 2 AS kk); ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 DROP PROPERTIES (k); ++<<<<<<< ours +ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t2 ALTER LABEL t2 DROP PROPERTIES (yy); -- error ++======= + -- Dropping a label should drop only orphaned properties. zz is orphaned because + -- it is only associated with the dropped label t3l2, while x is not orphaned + -- because it remains associated with t3l1. We will verify this in the + -- information schema queries outputs below. + ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t3 DROP LABEL t3l2; ++>>>>>>> theirs CREATE TABLE t11 (a int PRIMARY KEY); CREATE TABLE t12 (b int PRIMARY KEY);