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

[Lena Voytek]

Removed a patch added to combat a deprication to DateTime and Time queries in 8.0.28. Now that Mysql is at 8.0.29 the correct functionality has been restored. From the release notes:

A prepared and executed query like 'SELECT ?' with a DATE, TIME, DATETIME, or TIMESTAMP as the bound argument could return the wrong column type. The issue is fixed by restoring the previous logic that reprepared such queries to give each dynamic parameter its literal value.

[Robie Basak (racb)]

review: Approve

[Robie Basak (racb)]

Uploaded

[Robie Basak (racb)]

Sorry it looks like I failed to upload this with rich history. It's in as f38ac0008439cb19d36adc00d3ca15f2d01f1e49, so marking Merged.

[Utkarsh Gupta (utkarsh)]

This could've been a sync, isn't it? :(

[Robie Basak (racb)]

I did look and there did seem to be considerable other delta. Maybe that could be synced but I'd leave that to our separate merge workflow/schedule since otherwise there'd have to be lots of duplicate analysis every time we need to fix something in a package that already has a delta.

If it can be synced then that isn't precluded by this fix.

[Utkarsh Gupta (utkarsh)]

If the work on src:mysql is going to be in Debian as well, I am sure this can be sync'd. I am the maintainer of ruby-mysql2 on the Debian side and I'd welcome this change.

diff --git a/debian/changelog b/debian/changelog
index 9ba329a..881dd16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-mysql2 (0.5.3-3ubuntu5) kinetic; urgency=medium
+
+  * remove d/p/adjust-test-acc-to-mysql-8.0.28-change.patch: correct
+    functionality was restored to Time and DateTime query's with 'SELECT ?' in
+    mysql 8.0.29
+
+ -- Lena Voytek <[e-mail]>  Wed, 25 May 2022 14:28:23 -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