NMU diff for 2.4.1-8.1 attached. Christoph
No differences were encountered between the control files
diff -Nru php-horde-db-2.4.1/debian/changelog php-horde-db-2.4.1/debian/changelog --- php-horde-db-2.4.1/debian/changelog 2023-01-23 22:58:57.000000000 +0000 +++ php-horde-db-2.4.1/debian/changelog 2024-09-25 12:44:52.000000000 +0000 @@ -1,3 +1,11 @@ +php-horde-db (2.4.1-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use a PG-native catalog query in primaryKey method to fix unstable + * ordering. (Closes: #1082106) + + -- Christoph Berg <m...@debian.org> Wed, 25 Sep 2024 14:44:52 +0200 + php-horde-db (2.4.1-8) unstable; urgency=medium * d/control: diff -Nru php-horde-db-2.4.1/debian/patches/1014_pg17.patch php-horde-db-2.4.1/debian/patches/1014_pg17.patch --- php-horde-db-2.4.1/debian/patches/1014_pg17.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-db-2.4.1/debian/patches/1014_pg17.patch 2024-09-18 12:45:06.000000000 +0000 @@ -0,0 +1,29 @@ +--- a/Horde_Db-2.4.1/lib/Horde/Db/Adapter/Postgresql/Schema.php ++++ b/Horde_Db-2.4.1/lib/Horde/Db/Adapter/Postgresql/Schema.php +@@ -271,15 +271,18 @@ class Horde_Db_Adapter_Postgresql_Schema + public function primaryKey($tableName, $name = null) + { + $sql = ' +- SELECT column_name +- FROM information_schema.constraint_column_usage +- WHERE table_name = ? +- AND constraint_name = (SELECT constraint_name +- FROM information_schema.table_constraints +- WHERE table_name = ? +- AND constraint_type = ?)'; ++ SELECT a.attname ++ FROM ++ pg_index i, ++ unnest(indkey) WITH ORDINALITY u (attnum, pos) ++ JOIN pg_attribute a ON u.attnum = a.attnum ++ WHERE ++ i.indisprimary ++ AND i.indrelid = ?::regclass ++ AND a.attrelid = i.indrelid ++ ORDER BY u.pos'; + $pk = $this->selectValues($sql, +- array($tableName, $tableName, 'PRIMARY KEY'), ++ array($tableName), + $name); + + return $this->makeIndex($tableName, 'PRIMARY', true, true, $pk); diff -Nru php-horde-db-2.4.1/debian/patches/series php-horde-db-2.4.1/debian/patches/series --- php-horde-db-2.4.1/debian/patches/series 2023-01-22 21:44:13.000000000 +0000 +++ php-horde-db-2.4.1/debian/patches/series 2024-09-25 12:44:52.000000000 +0000 @@ -2,3 +2,4 @@ 1011_psql-avoid-access-array-offset-on-val-of-type-bool.patch 1012_php8.1.patch 1013_php8.2.patch +1014_pg17.patch