Source: libdbi-drivers Version: 0.9.0-8 Tags: patch User: [email protected] Usertags: origin-ubuntu focal ubuntu-patch
Hi, I noticed that the test suite during the build is currently failing, including on the Debian buildds, but this isn't causing the package built to fail. Regardless, attached is the fix for the failures themselves.
From ce4d5170dd8ebd179bfbb773b250667f15376e15 Mon Sep 17 00:00:00 2001 From: Robie Basak <[email protected]> Date: Thu, 27 Feb 2020 15:49:16 +0000 Subject: [PATCH] * d/p/test_mysql_date_tz.patch: fix MySQL test timezone inputs. --- debian/patches/series | 1 + debian/patches/test_mysql_date_tz.patch | 36 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 debian/patches/test_mysql_date_tz.patch diff --git a/debian/patches/series b/debian/patches/series index 975fbf4..b3fb76c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ freetds-1.0-fix.patch pgsql_precision.patch mysql-8.0.patch test_exception_failure.patch +test_mysql_date_tz.patch diff --git a/debian/patches/test_mysql_date_tz.patch b/debian/patches/test_mysql_date_tz.patch new file mode 100644 index 0000000..c50fcb5 --- /dev/null +++ b/debian/patches/test_mysql_date_tz.patch @@ -0,0 +1,36 @@ +Author: Robie Basak <[email protected]> +Description: fix MySQL test timezone inputs + MySQL 8.0 requires the timezone field in a DATETIME input string to + have no leading spaces, and does not support a timezone field in the + TIME type. Adjust accordingly. The test input time is therefore + different as it is not offset by the timezone, so the expected output + is also adjusted to match. + . + It isn't clear if this also applies to older MySQL or MariaDB as the + previous test failures weren't failing the build. +Last-Update: 2020-02-27 + +--- a/tests/test_dbi.c ++++ b/tests/test_dbi.c +@@ -253,7 +253,7 @@ + {"the_binary_quoted_string", 4, 0, 6, 0, .expect_val.string_val = "", 0, ""}, /* string */ + {"the_binary_escaped_string", 4, 0, 6, 0, .expect_val.string_val = "", 0, ""}, /* string */ + {"the_datetime", 5, 3, 0, 0, .expect_val.uint_val = 1009843199, 1009843199, "2001-12-31 23:59:59"}, /* DBI_DATETIME_DATE|TIME */ +- {"the_datetime_tz", 5, 3, 0, 0, .expect_val.uint_val = 1009843199, 1009843199, "2001-12-31 23:59:59"}, /* DBI_DATETIME_DATE|TIME */ ++ {"the_datetime_tz", 5, 3, 0, 0, .expect_val.uint_val = 1009879199, 1009879199, "2001-12-31 23:59:59"}, /* DBI_DATETIME_DATE|TIME */ + {"the_date", 5, 1, 0, 0, .expect_val.uint_val = 1009756800, 1009756800, "2001-12-31 00:00:00"}, /* DBI_DATETIME_DATE */ + {"the_time", 5, 2, 0, 0, .expect_val.uint_val = 86399, 86399, "1970-01-01 23:59:59"}, /* DBI_DATETIME_TIME */ + {"the_time_tz", 5, 2, 0, 0, .expect_val.uint_val = 86399, 86399, "1970-01-01 23:59:59"}, /* DBI_DATETIME_TIME */ +@@ -1567,10 +1567,10 @@ + "'AB\\0C\\\'D'," + "'AB\\0C\\\'D'," + "'2001-12-31 23:59:59'," +- "'2001-12-31 23:59:59 -10:00'," ++ "'2001-12-31 23:59:59-10:00'," + "'2001-12-31'," + "'23:59:59'," +- "'23:59:59-10:00')", ++ "'23:59:59')", + numstring); + } + else if (!strcmp(ptr_cinfo->drivername, "pgsql")) { -- 2.25.0
signature.asc
Description: PGP signature
