Merge ~lvoytek/ubuntu/+source/ruby-mysql2:restore-datetime-query-test-jammy into ubuntu/+source/ruby-mysql2:ubuntu/jammy-devel

[Lena Voytek]

Reverting autopkgtest patch for datetime and time since the changed behavior was fixed in mysql 8.0.29. This was fixed in kinetic in 0.5.3-3ubuntu5.

PPA: ppa:lvoytek/ruby-mysql2-revert-datetime-test-change-jammy

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the MP Lena. I added an inline comment about the changelog entry. Other than that, everything LGTM.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lucaskanashiro, lvoytek
Uploaders: lucaskanashiro
MP auto-approved

review: Approve

[Lena Voytek (lvoytek)]

updated, thanks!

[Lucas Kanashiro (lucaskanashiro)]

Lena, I'll be waiting for the SRU bug template to sponsor this upload for you. Let me know once it is ready.

[Lena Voytek (lvoytek)]

Alright, I added in the SRU template to the bug report. Thanks for sponsoring

[Lucas Kanashiro (lucaskanashiro)]

Package uploaded:

Uploading ruby-mysql2_0.5.3-3ubuntu4.22.04.1.dsc
Uploading ruby-mysql2_0.5.3.orig.tar.gz
Uploading ruby-mysql2_0.5.3-3ubuntu4.22.04.1.debian.tar.xz
Uploading ruby-mysql2_0.5.3-3ubuntu4.22.04.1_source.buildinfo
Uploading ruby-mysql2_0.5.3-3ubuntu4.22.04.1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 9ba329a..b5c9f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-mysql2 (0.5.3-3ubuntu4.22.04.1) jammy; urgency=medium
+
+  * d/p/adjust-test-acc-to-mysql-8.0.28-change.patch: Remove file to restore
+    original test setup since functionality was fixed for Time and
+    DateTime query's with 'SELECT ?' in mysql 8.0.29 (LP: #1981343)
+
+ -- Lena Voytek <[e-mail]>  Mon, 11 Jul 2022 08:49:58 -0700
+
 ruby-mysql2 (0.5.3-3ubuntu4) jammy; urgency=medium
 
   * d/p/adjust-test-acc-to-mysql-8.0.28-change.patch:
diff --git a/debian/patches/adjust-test-acc-to-mysql-8.0.28-change.patch b/debian/patches/adjust-test-acc-to-mysql-8.0.28-change.patch
 deleted file mode 100644
index c1dea77..0000000
--- a/debian/patches/adjust-test-acc-to-mysql-8.0.28-change.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Adjust tests according to mysql-8.0/8.0.28
- behavioral change. MySQL now returns a String instead
- of a DateTime object when called with "SELECT ? AS a"
- and a parameter of MYSQL_TYPE_DATETIME.
-Author: Utkarsh Gupta <[e-mail]>
-Origin: vendor
-Bug: https://github.com/brianmario/mysql2/issues/1243
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1961617
-Forwarded: https://github.com/brianmario/mysql2/issues/1243
-Last-Update: 2022-02-23
-
---- a/spec/mysql2/statement_spec.rb
-+++ b/spec/mysql2/statement_spec.rb
-@@ -1,4 +1,5 @@
- require './spec/spec_helper.rb'
-+require 'time'
- 
- RSpec.describe Mysql2::Statement do
-   before :each do
-@@ -165,7 +166,7 @@
-     statement = @client.prepare('SELECT ? AS a')
-     result = statement.execute(now)
-     # microseconds is six digits after the decimal, but only test on 5 significant figures
--    expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-+    expect(Time.parse(result.first['a']).strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-   end
- 
-   it "should prepare DateTime values with microseconds" do
-@@ -173,7 +174,7 @@
-     statement = @client.prepare('SELECT ? AS a')
-     result = statement.execute(now)
-     # microseconds is six digits after the decimal, but only test on 5 significant figures
--    expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-+    expect(Time.parse(result.first['a']).strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-   end
- 
-   it "should tell us about the fields" do
diff --git a/debian/patches/series b/debian/patches/series
index b9702e0..11094cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ mysql-8.0.patch
 skip-more-tests.patch
 fix-configuration.patch
 skip-test-that-depends-on-server.patch
-adjust-test-acc-to-mysql-8.0.28-change.patch