Merge ~racb/ubuntu/+source/php-horde-db:mysql-integer-column-limit into ubuntu/+source/php-horde-db:ubuntu/devel

[Robie Basak]

[Robie Basak (racb)]

I've tested that this passes dep8. In a lxd environment I got unrelated warnings that necessitated a "allow-stderr" restriction before tests would pass; I haven't included that change here as I believe it should be fine in the archive as we didn't see those errors in the archive previously.

[Bryce Harrington (bryce)]

* Changelog:
  - [ ] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [ ] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
    + Test has seen no code updates in a few years.
      https://github.com/horde/Db/blob/master/test/Horde/Db/Adapter/MysqlBase.php
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [x] patches match what was proposed upstream
    + The patch is not attached to the upstream bug report.
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
    + Instead of a PPA, I debuild'd the package and installed the .deb
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

I also saw weirdness running the autopkgtest in my local lxc. Hopefully it should work cleanly in the archive.

I wonder if it would be useful to also post the patch to the upstream bug report? Your description is really clear so probably not strictly necessary but might help it get attention.

Anyway, for the package itself it all LGTM, +1.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bdac6bf..c4d4b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php-horde-db (2.4.0-4ubuntu4) focal; urgency=medium
+
+  * d/p/mysql-integer-column-limit.patch: adjust test for MySQL >= 8.0.19
+    behaviour (LP: #1861099).
+
+ -- Robie Basak <[e-mail]>  Tue, 28 Jan 2020 14:32:30 +0000
+
 php-horde-db (2.4.0-4ubuntu3) focal; urgency=medium
 
   * Stop using adsrc. No idea if this will work, but hey tests pass.
diff --git a/debian/patches/mysql-integer-column-limit.patch b/debian/patches/mysql-integer-column-limit.patch
new file mode 100644
index 0000000..b084573
--- /dev/null
+++ b/debian/patches/mysql-integer-column-limit.patch
@@ -0,0 +1,25 @@
+Description: adjust test to match MySQL's new behaviour since 8.0.19
+ This patch is sufficient to cause the test to pass in the archive, where we
+ know that nothing else depends on the old behaviour. See the Launchpad bug for
+ details. It is unclear what solution would be better more generally; we can
+ see what upstream's view on this is in the upstream bug.
+Author: Robie Basak <[e-mail]>
+Bug: http://bugs.horde.org/ticket/14984
+Bug-Ubuntu: https://launchpad.net/bugs/1861099
+Forwarded: not-needed
+Last-Update: 2020-01-28
+
+--- a/Horde_Db-2.4.0/test/Horde/Db/Adapter/MysqlBase.php
++++ b/Horde_Db-2.4.0/test/Horde/Db/Adapter/MysqlBase.php
+@@ -257,9 +257,9 @@
+     public function testColumns()
+     {
+         $col = parent::testColumns();
+-        $this->assertEquals(10,        $col->getLimit());
++        $this->assertEquals(null,        $col->getLimit());
+         $this->assertEquals(true,      $col->isUnsigned());
+-        $this->assertEquals('int(10) unsigned', $col->getSqlType());
++        $this->assertEquals('int unsigned', $col->getSqlType());
+     }
+ 
+     public function testCreateTableWithSeparatePk()
diff --git a/debian/patches/series b/debian/patches/series
index d98d236..538042e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ phpunit6_compat.patch
 php-float-fix.patch
 phpunit-declarations.patch
 adsrc.patch
+mysql-integer-column-limit.patch