Merge ~paelzer/ubuntu/+source/mediawiki:fix-pg12 into ~paelzer/ubuntu/+source/mediawiki:master

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This isn't in git ubuntu, therefore I pushed master as it is and this branch to merge on top.
Allows for our usual workflow without too much extra hazzle.

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1852408-mediawiki-pg12/+packages

I have run the tests against the PPA locally and with the fix it works.
Test log: http://paste.ubuntu.com/p/Q4nkfxbTNB/

[Christian Ehrhardt  (paelzer)]

Submitted to Debian in: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944650

[Andreas Hasenack (ahasenack)]

Add Bug-Debian perhaps to the dep3 section of the patches?

I confirmed mediawiki tests pass with postgresql 12 from focal-proposed

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

I added the Debian bug to the headers - thanks.
No tagging since not in git-ubuntu, uploaded

diff --git a/debian/changelog b/debian/changelog
index 6d00cba..68c8396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mediawiki (1:1.31.5-1ubuntu1) focal; urgency=medium
+
+  * d/p/rdbms-*Postg: fix issues with postgresql12 (LP: #1852408)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 13 Nov 2019 10:54:11 +0100
+
 mediawiki (1:1.31.5-1) unstable; urgency=medium
 
   * New upstream version 1.31.5
diff --git a/debian/control b/debian/control
index bda472b..8ab319e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mediawiki
 Section: web
 Priority: optional
-Maintainer: Kunal Mehta <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Kunal Mehta <[e-mail]>
 Build-Depends: debhelper (>= 10),
  dh-buildinfo,
  apache2-dev
diff --git a/debian/patches/rdbms-Remove-references-to-pg_attrdef.adsrc-in-Postg.patch b/debian/patches/rdbms-Remove-references-to-pg_attrdef.adsrc-in-Postg.patch
new file mode 100644
index 0000000..c20a18c
--- /dev/null
+++ b/debian/patches/rdbms-Remove-references-to-pg_attrdef.adsrc-in-Postg.patch
@@ -0,0 +1,73 @@
+From 27d342ef4bd31da48b0e10655daf1320e3d00b50 Mon Sep 17 00:00:00 2001
+From: Jeff Janes <[e-mail]>
+Date: Thu, 17 Jan 2019 18:41:51 -0500
+Subject: [PATCH] rdbms: Remove references to pg_attrdef.adsrc in Postgres code
+
+PostgreSQL v12 will remove the long-deprecated column
+pg_attrdef.adsrc.  The supported way to introspect into column
+default values is pg_get_expr(adbin, adrelid), which works
+back through all versions of PostgreSQL supported by wikimedia.
+
+Changing to the supported method will allow the upcoming v12 of the
+database to be used while maintaining compatibility with older
+versions, without needing to write version-specific code.
+
+This patch has been tested with maintenance/update.php and
+with phpunit in PostgreSQL versions 9.2, 11, and 12dev.  It does
+not harm the first two, and fixes errors that would otherwise
+arise in the dev version.  All unit tests which pass under version
+11 now pass under 12dev as well.
+
+Change-Id: I874d347fd286b26773113d4f0c6c30d9a4055ad3
+
+Origin: upstream, https://github.com/wikimedia/mediawiki/commit/27d342ef4bd31da48b0e10655daf1320e3d00b50
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1852408
+Applied-Upstream: 1.33
+Last-Update: 2019-11-13
+---
+ includes/libs/rdbms/database/DatabasePostgres.php | 6 +++---
+ includes/libs/rdbms/field/PostgresField.php       | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php
+index 5f04e39718..0935d5a135 100644
+--- a/includes/libs/rdbms/database/DatabasePostgres.php
++++ b/includes/libs/rdbms/database/DatabasePostgres.php
+@@ -816,7 +816,7 @@ __INDEXATTR__;
+ 			. ' WHERE relkind = \'r\''
+ 			. ' AND nspname = ' . $this->addQuotes( $this->getCoreSchema() )
+ 			. ' AND relname = ' . $this->addQuotes( $oldName )
+-			. ' AND adsrc LIKE \'nextval(%\'',
++			. ' AND pg_get_expr(adbin, adrelid) LIKE \'nextval(%\'',
+ 			$fname
+ 		);
+ 		$row = $this->fetchObject( $res );
+@@ -851,10 +851,10 @@ __INDEXATTR__;
+ 			}
+ 
+ 			$oid = $this->fetchObject( $res )->oid;
+-			$res = $this->query( 'SELECT adsrc FROM pg_attribute a'
++			$res = $this->query( 'SELECT pg_get_expr(adbin, adrelid) AS adsrc FROM pg_attribute a'
+ 				. ' JOIN pg_attrdef d ON (a.attrelid=d.adrelid and a.attnum=d.adnum)'
+ 				. " WHERE a.attrelid = $oid"
+-				. ' AND adsrc LIKE \'nextval(%\'',
++				. ' AND pg_get_expr(adbin, adrelid) LIKE \'nextval(%\'',
+ 				$fname
+ 			);
+ 			$row = $this->fetchObject( $res );
+diff --git a/includes/libs/rdbms/field/PostgresField.php b/includes/libs/rdbms/field/PostgresField.php
+index 53c3d335b1..7596a3ba0a 100644
+--- a/includes/libs/rdbms/field/PostgresField.php
++++ b/includes/libs/rdbms/field/PostgresField.php
+@@ -17,7 +17,7 @@ class PostgresField implements Field {
+ SELECT
+  attnotnull, attlen, conname AS conname,
+  atthasdef,
+- adsrc,
++ pg_get_expr(adbin, adrelid) AS adsrc,
+  COALESCE(condeferred, 'f') AS deferred,
+  COALESCE(condeferrable, 'f') AS deferrable,
+  CASE WHEN typname = 'int2' THEN 'smallint'
+-- 
+2.24.0
+
diff --git a/debian/patches/rdbms-Use-correct-value-for-sslmode-in-DatabasePostg.patch b/debian/patches/rdbms-Use-correct-value-for-sslmode-in-DatabasePostg.patch
new file mode 100644
index 0000000..4215ec1
--- /dev/null
+++ b/debian/patches/rdbms-Use-correct-value-for-sslmode-in-DatabasePostg.patch
@@ -0,0 +1,38 @@
+From 2e5d114a99cf162074f92fc390590da44084362d Mon Sep 17 00:00:00 2001
+From: "Mark A. Hershberger" <[e-mail]>
+Date: Thu, 9 Aug 2018 16:18:34 -0400
+Subject: [PATCH] rdbms: Use correct value for 'sslmode' in DatabasePostgres
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix Postgres support by using ‘sslmode=require' instead of ‘sslmode=1'.
+
+See https://www.postgresql.org/docs/current/static/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS
+
+Change-Id: I424b0e3e144bbe9f0a2bde9a3b4a674dde10c729
+
+Origin: upstream, https://github.com/wikimedia/mediawiki/commit/2e5d114a99cf162074f92fc390590da44084362d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1852408
+Applied-Upstream: 1.33
+Last-Update: 2019-11-13
+---
+ includes/libs/rdbms/database/DatabasePostgres.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php
+index a043cd6a89..e7057dd102 100644
+--- a/includes/libs/rdbms/database/DatabasePostgres.php
++++ b/includes/libs/rdbms/database/DatabasePostgres.php
+@@ -117,7 +117,7 @@ class DatabasePostgres extends Database {
+ 			$connectVars['port'] = (int)$this->port;
+ 		}
+ 		if ( $this->flags & self::DBO_SSL ) {
+-			$connectVars['sslmode'] = 1;
++			$connectVars['sslmode'] = 'require';
+ 		}
+ 
+ 		$this->connectString = $this->makeConnectionString( $connectVars );
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 3105687..22d270a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 pear-phail-fail-shebang.diff
+rdbms-Remove-references-to-pg_attrdef.adsrc-in-Postg.patch
+rdbms-Use-correct-value-for-sslmode-in-DatabasePostg.patch