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

Proposed by Robie Basak on 2020-01-28
Status: Merged
Approved by: Robie Basak on 2020-01-29
Approved revision: 3be1db36119e8253910bed36b7d40dc9e32bc74f
Merged at revision: 3be1db36119e8253910bed36b7d40dc9e32bc74f
Proposed branch: ~racb/ubuntu/+source/php-horde-db:mysql-integer-column-limit
Merge into: ubuntu/+source/php-horde-db:ubuntu/devel
Diff against target: 55 lines (+33/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/mysql-integer-column-limit.patch (+25/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington 2020-01-28 Approve on 2020-01-29
Canonical Server MOTU reviewers 2020-01-28 Pending
Review via email: mp+378173@code.launchpad.net
To post a comment you must log in.
Robie Basak (racb) wrote :

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) wrote :

* 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index bdac6bf..c4d4b8e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+php-horde-db (2.4.0-4ubuntu4) focal; urgency=medium
7+
8+ * d/p/mysql-integer-column-limit.patch: adjust test for MySQL >= 8.0.19
9+ behaviour (LP: #1861099).
10+
11+ -- Robie Basak <robie.basak@ubuntu.com> Tue, 28 Jan 2020 14:32:30 +0000
12+
13 php-horde-db (2.4.0-4ubuntu3) focal; urgency=medium
14
15 * Stop using adsrc. No idea if this will work, but hey tests pass.
16diff --git a/debian/patches/mysql-integer-column-limit.patch b/debian/patches/mysql-integer-column-limit.patch
17new file mode 100644
18index 0000000..b084573
19--- /dev/null
20+++ b/debian/patches/mysql-integer-column-limit.patch
21@@ -0,0 +1,25 @@
22+Description: adjust test to match MySQL's new behaviour since 8.0.19
23+ This patch is sufficient to cause the test to pass in the archive, where we
24+ know that nothing else depends on the old behaviour. See the Launchpad bug for
25+ details. It is unclear what solution would be better more generally; we can
26+ see what upstream's view on this is in the upstream bug.
27+Author: Robie Basak <robie.basak@canonical.com>
28+Bug: http://bugs.horde.org/ticket/14984
29+Bug-Ubuntu: https://launchpad.net/bugs/1861099
30+Forwarded: not-needed
31+Last-Update: 2020-01-28
32+
33+--- a/Horde_Db-2.4.0/test/Horde/Db/Adapter/MysqlBase.php
34++++ b/Horde_Db-2.4.0/test/Horde/Db/Adapter/MysqlBase.php
35+@@ -257,9 +257,9 @@
36+ public function testColumns()
37+ {
38+ $col = parent::testColumns();
39+- $this->assertEquals(10, $col->getLimit());
40++ $this->assertEquals(null, $col->getLimit());
41+ $this->assertEquals(true, $col->isUnsigned());
42+- $this->assertEquals('int(10) unsigned', $col->getSqlType());
43++ $this->assertEquals('int unsigned', $col->getSqlType());
44+ }
45+
46+ public function testCreateTableWithSeparatePk()
47diff --git a/debian/patches/series b/debian/patches/series
48index d98d236..538042e 100644
49--- a/debian/patches/series
50+++ b/debian/patches/series
51@@ -3,3 +3,4 @@ phpunit6_compat.patch
52 php-float-fix.patch
53 phpunit-declarations.patch
54 adsrc.patch
55+mysql-integer-column-limit.patch

Subscribers

People subscribed via source and target branches