=== Applying patches on top of PostgreSQL commit ID a7187c3723b41057522038c5e5db329d84f41ac4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Apr  3 06:07:20 UTC 2025
On branch cf/4764
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Improve-SQL-comments-on-echo-hidden-output.patch ===
Patch format detection failed.
=== using patch(1) to apply patch ./v6-0001-Improve-SQL-comments-on-echo-hidden-output.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 ./v6-0001-Improve-SQL-comments-on-echo-hidden-output.patch ===
Applied patch to 'src/bin/psql/command.c' cleanly.
Applied patch to 'src/bin/psql/common.c' cleanly.
Applied patch to 'src/bin/psql/common.h' cleanly.
Applied patch to 'src/bin/psql/describe.c' with conflicts.
U src/bin/psql/describe.c
diff --cc src/bin/psql/describe.c
index e038e9dc9e2,af3cd405438..00000000000
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@@ -2550,124 -2552,139 +2559,187 @@@ describeOneTableDetails(const char *sch
  			PQclear(result);
  		}
  
 -		/*
 -		 * Print foreign-key constraints (there are none if no triggers,
 -		 * except if the table is partitioned, in which case the triggers
 -		 * appear in the partitions)
 -		 */
 -		if (tableinfo.hastriggers ||
 -			tableinfo.relkind == RELKIND_PARTITIONED_TABLE)
 +		/* Print foreign-key constraints */
 +		if (pset.sversion >= 120000 &&
 +			(tableinfo.ispartition || tableinfo.relkind == RELKIND_PARTITIONED_TABLE))
  		{
++<<<<<<< ours
 +			/*
 +			 * Put the constraints defined in this table first, followed by
 +			 * the constraints defined in ancestor partitioned tables.
 +			 */
 +			printfPQExpBuffer(&buf,
 +							  "SELECT conrelid = '%s'::pg_catalog.regclass AS sametable,\n"
 +							  "       conname,\n"
 +							  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef,\n"
 +							  "       conrelid::pg_catalog.regclass AS ontable\n"
 +							  "  FROM pg_catalog.pg_constraint,\n"
 +							  "       pg_catalog.pg_partition_ancestors('%s')\n"
 +							  " WHERE conrelid = relid AND contype = " CppAsString2(CONSTRAINT_FOREIGN) " AND conparentid = 0\n"
 +							  "ORDER BY sametable DESC, conname;",
 +							  oid, oid);
 +		}
 +		else
 +		{
 +			printfPQExpBuffer(&buf,
 +							  "SELECT true as sametable, conname,\n"
 +							  "  pg_catalog.pg_get_constraintdef(r.oid, true) as condef,\n"
 +							  "  conrelid::pg_catalog.regclass AS ontable\n"
 +							  "FROM pg_catalog.pg_constraint r\n"
 +							  "WHERE r.conrelid = '%s' AND r.contype = " CppAsString2(CONSTRAINT_FOREIGN) "\n",
 +							  oid);
++=======
+ 			OutputComment(&buf, _("Get information about foreign key constraints"));
+ 
+ 			if (pset.sversion >= 120000 &&
+ 				(tableinfo.ispartition || tableinfo.relkind == RELKIND_PARTITIONED_TABLE))
+ 			{
+ 				/*
+ 				 * Put the constraints defined in this table first, followed
+ 				 * by the constraints defined in ancestor partitioned tables.
+ 				 */
+ 				appendPQExpBuffer(&buf,
+ 								  "SELECT conrelid = '%s'::pg_catalog.regclass AS sametable,\n"
+ 								  "       conname,\n"
+ 								  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef,\n"
+ 								  "       conrelid::pg_catalog.regclass AS ontable\n"
+ 								  "  FROM pg_catalog.pg_constraint,\n"
+ 								  "       pg_catalog.pg_partition_ancestors('%s')\n"
+ 								  " WHERE conrelid = relid AND contype = " CppAsString2(CONSTRAINT_FOREIGN) " AND conparentid = 0\n"
+ 								  "ORDER BY sametable DESC, conname;",
+ 								  oid, oid);
+ 			}
+ 			else
+ 			{
+ 				appendPQExpBuffer(&buf,
+ 								  "SELECT true as sametable, conname,\n"
+ 								  "  pg_catalog.pg_get_constraintdef(r.oid, true) as condef,\n"
+ 								  "  conrelid::pg_catalog.regclass AS ontable\n"
+ 								  "FROM pg_catalog.pg_constraint r\n"
+ 								  "WHERE r.conrelid = '%s' AND r.contype = " CppAsString2(CONSTRAINT_FOREIGN) "\n",
+ 								  oid);
+ 
+ 				if (pset.sversion >= 120000)
+ 					appendPQExpBufferStr(&buf, "     AND conparentid = 0\n");
+ 				appendPQExpBufferStr(&buf, "ORDER BY conname");
+ 			}
++>>>>>>> theirs
  
 -			result = PSQLexec(buf.data);
 -			if (!result)
 -				goto error_return;
 -			else
 -				tuples = PQntuples(result);
 +			if (pset.sversion >= 120000)
 +				appendPQExpBufferStr(&buf, "     AND conparentid = 0\n");
 +			appendPQExpBufferStr(&buf, "ORDER BY conname");
 +		}
  
 -			if (tuples > 0)
 -			{
 -				int			i_sametable = PQfnumber(result, "sametable"),
 -							i_conname = PQfnumber(result, "conname"),
 -							i_condef = PQfnumber(result, "condef"),
 -							i_ontable = PQfnumber(result, "ontable");
 +		result = PSQLexec(buf.data);
 +		if (!result)
 +			goto error_return;
 +		else
 +			tuples = PQntuples(result);
  
 -				printTableAddFooter(&cont, _("Foreign-key constraints:"));
 -				for (i = 0; i < tuples; i++)
 -				{
 -					/*
 -					 * Print untranslated constraint name and definition. Use
 -					 * a "TABLE tab" prefix when the constraint is defined in
 -					 * a parent partitioned table.
 -					 */
 -					if (strcmp(PQgetvalue(result, i, i_sametable), "f") == 0)
 -						printfPQExpBuffer(&buf, "    TABLE \"%s\" CONSTRAINT \"%s\" %s",
 -										  PQgetvalue(result, i, i_ontable),
 -										  PQgetvalue(result, i, i_conname),
 -										  PQgetvalue(result, i, i_condef));
 -					else
 -						printfPQExpBuffer(&buf, "    \"%s\" %s",
 -										  PQgetvalue(result, i, i_conname),
 -										  PQgetvalue(result, i, i_condef));
 +		if (tuples > 0)
 +		{
 +			int			i_sametable = PQfnumber(result, "sametable"),
 +						i_conname = PQfnumber(result, "conname"),
 +						i_condef = PQfnumber(result, "condef"),
 +						i_ontable = PQfnumber(result, "ontable");
  
 -					printTableAddFooter(&cont, buf.data);
 -				}
 +			printTableAddFooter(&cont, _("Foreign-key constraints:"));
 +			for (i = 0; i < tuples; i++)
 +			{
 +				/*
 +				 * Print untranslated constraint name and definition. Use a
 +				 * "TABLE tab" prefix when the constraint is defined in a
 +				 * parent partitioned table.
 +				 */
 +				if (strcmp(PQgetvalue(result, i, i_sametable), "f") == 0)
 +					printfPQExpBuffer(&buf, "    TABLE \"%s\" CONSTRAINT \"%s\" %s",
 +									  PQgetvalue(result, i, i_ontable),
 +									  PQgetvalue(result, i, i_conname),
 +									  PQgetvalue(result, i, i_condef));
 +				else
 +					printfPQExpBuffer(&buf, "    \"%s\" %s",
 +									  PQgetvalue(result, i, i_conname),
 +									  PQgetvalue(result, i, i_condef));
 +
 +				printTableAddFooter(&cont, buf.data);
  			}
 -			PQclear(result);
  		}
 +		PQclear(result);
  
  		/* print incoming foreign-key references */
 -		if (tableinfo.hastriggers ||
 -			tableinfo.relkind == RELKIND_PARTITIONED_TABLE)
 +		if (pset.sversion >= 120000)
  		{
++<<<<<<< ours
 +			printfPQExpBuffer(&buf,
 +							  "SELECT conname, conrelid::pg_catalog.regclass AS ontable,\n"
 +							  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef\n"
 +							  "  FROM pg_catalog.pg_constraint c\n"
 +							  " WHERE confrelid IN (SELECT pg_catalog.pg_partition_ancestors('%s')\n"
 +							  "                     UNION ALL VALUES ('%s'::pg_catalog.regclass))\n"
 +							  "       AND contype = " CppAsString2(CONSTRAINT_FOREIGN) " AND conparentid = 0\n"
 +							  "ORDER BY conname;",
 +							  oid, oid);
 +		}
 +		else
 +		{
 +			printfPQExpBuffer(&buf,
 +							  "SELECT conname, conrelid::pg_catalog.regclass AS ontable,\n"
 +							  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef\n"
 +							  "  FROM pg_catalog.pg_constraint\n"
 +							  " WHERE confrelid = %s AND contype = " CppAsString2(CONSTRAINT_FOREIGN) "\n"
 +							  "ORDER BY conname;",
 +							  oid);
 +		}
++=======
+ 			OutputComment(&buf, _("Get information about incoming foreign key references"));
+ 			if (pset.sversion >= 120000)
+ 			{
+ 				appendPQExpBuffer(&buf,
+ 								  "SELECT conname, conrelid::pg_catalog.regclass AS ontable,\n"
+ 								  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef\n"
+ 								  "  FROM pg_catalog.pg_constraint c\n"
+ 								  " WHERE confrelid IN (SELECT pg_catalog.pg_partition_ancestors('%s')\n"
+ 								  "                     UNION ALL VALUES ('%s'::pg_catalog.regclass))\n"
+ 								  "       AND contype = " CppAsString2(CONSTRAINT_FOREIGN) " AND conparentid = 0\n"
+ 								  "ORDER BY conname;",
+ 								  oid, oid);
+ 			}
+ 			else
+ 			{
+ 				appendPQExpBuffer(&buf,
+ 								  "SELECT conname, conrelid::pg_catalog.regclass AS ontable,\n"
+ 								  "       pg_catalog.pg_get_constraintdef(oid, true) AS condef\n"
+ 								  "  FROM pg_catalog.pg_constraint\n"
+ 								  " WHERE confrelid = %s AND contype = " CppAsString2(CONSTRAINT_FOREIGN) "\n"
+ 								  "ORDER BY conname;",
+ 								  oid);
+ 			}
++>>>>>>> theirs
  
 -			result = PSQLexec(buf.data);
 -			if (!result)
 -				goto error_return;
 -			else
 -				tuples = PQntuples(result);
 +		result = PSQLexec(buf.data);
 +		if (!result)
 +			goto error_return;
 +		else
 +			tuples = PQntuples(result);
  
 -			if (tuples > 0)
 -			{
 -				int			i_conname = PQfnumber(result, "conname"),
 -							i_ontable = PQfnumber(result, "ontable"),
 -							i_condef = PQfnumber(result, "condef");
 +		if (tuples > 0)
 +		{
 +			int			i_conname = PQfnumber(result, "conname"),
 +						i_ontable = PQfnumber(result, "ontable"),
 +						i_condef = PQfnumber(result, "condef");
  
 -				printTableAddFooter(&cont, _("Referenced by:"));
 -				for (i = 0; i < tuples; i++)
 -				{
 -					printfPQExpBuffer(&buf, "    TABLE \"%s\" CONSTRAINT \"%s\" %s",
 -									  PQgetvalue(result, i, i_ontable),
 -									  PQgetvalue(result, i, i_conname),
 -									  PQgetvalue(result, i, i_condef));
 +			printTableAddFooter(&cont, _("Referenced by:"));
 +			for (i = 0; i < tuples; i++)
 +			{
 +				printfPQExpBuffer(&buf, "    TABLE \"%s\" CONSTRAINT \"%s\" %s",
 +								  PQgetvalue(result, i, i_ontable),
 +								  PQgetvalue(result, i, i_conname),
 +								  PQgetvalue(result, i, i_condef));
  
 -					printTableAddFooter(&cont, buf.data);
 -				}
 +				printTableAddFooter(&cont, buf.data);
  			}
 -			PQclear(result);
  		}
 +		PQclear(result);
  
  		/* print any row-level policies */
  		if (pset.sversion >= 90500)