From 31b826b783f6023b26665fe985e1b6858be5c294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 28 Feb 2017 10:27:21 +0100
Subject: [PATCH] Disable a test incompatible with sqlite >= 3.14

---
 DBIx-Class-0.082840-sqlite-3.14.patch | 48 +++++++++++++++++++++++++++
 perl-DBIx-Class.spec                  |  8 ++++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 DBIx-Class-0.082840-sqlite-3.14.patch

diff --git a/DBIx-Class-0.082840-sqlite-3.14.patch b/DBIx-Class-0.082840-sqlite-3.14.patch
new file mode 100644
index 0000000..c4b8d72
--- /dev/null
+++ b/DBIx-Class-0.082840-sqlite-3.14.patch
@@ -0,0 +1,48 @@
+Description: Drop test which expected SQLite behaviour from before 3.14
+ Cf. https://rt.cpan.org/Public/Bug/Display.html?id=118395#txn-1676851
+ .
+ Thanks to Peter Rabbitson for the help.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/841573
+Forwarded: not-needed
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2016-10-21
+
+--- a/t/resultset/update_delete.t
++++ b/t/resultset/update_delete.t
+@@ -138,35 +138,6 @@
+ ], 'Correct null-delete-SQL with multijoin without pruning' );
+ 
+ 
+-# try the same sql with forced multicolumn in
+-$schema->is_executed_sql_bind( sub {
+-  local $schema->storage->{_use_multicolumn_in} = 1;
+-
+-  # this can't actually execute on sqlite
+-  eval { $fks_multi->update ({ read_count => \ 'read_count + 1' }) };
+-}, [[
+-  'UPDATE fourkeys
+-    SET read_count = read_count + 1
+-    WHERE (
+-      (foo, bar, hello, goodbye) IN (
+-        SELECT me.foo, me.bar, me.hello, me.goodbye
+-          FROM fourkeys me
+-          LEFT JOIN fourkeys_to_twokeys fourkeys_to_twokeys ON
+-                fourkeys_to_twokeys.f_bar = me.bar
+-            AND fourkeys_to_twokeys.f_foo = me.foo
+-            AND fourkeys_to_twokeys.f_goodbye = me.goodbye
+-            AND fourkeys_to_twokeys.f_hello = me.hello
+-        WHERE ( bar = ? OR bar = ? ) AND ( foo = ? OR foo = ? ) AND fourkeys_to_twokeys.pilot_sequence != ? AND ( goodbye = ? OR goodbye = ? ) AND ( hello = ? OR hello = ? ) AND sensors != ?
+-        ORDER BY foo, bar, hello, goodbye
+-      )
+-    )
+-  ',
+-  ( 1, 2) x 2,
+-  666,
+-  ( 1, 2) x 2,
+-  'c',
+-]], 'Correct update-SQL with multicolumn in support' );
+-
+ $schema->is_executed_sql_bind( sub {
+   $fks->search({ 'twokeys.artist' => { '!=' => 666 } })->update({ read_count => \ 'read_count + 1' });
+ }, [
diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index a078e49..b9a0ca5 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -1,7 +1,7 @@
 Name:           perl-DBIx-Class
 Summary:        Extensible and flexible object <-> relational mapper
 Version:        0.082840
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz
@@ -9,6 +9,8 @@ URL:            http://search.cpan.org/dist/DBIx-Class/
 # Fix missing ORDER BY leading to failures of t/prefetch/grouped.t under
 # upcoming libsqlite (RT#117271)
 Patch0:         DBIx-Class-0.082840-Fix-test-RT117271.patch
+# Disable a test incompatible with sqlite >= 3.14, CPAN RT#119845
+Patch1:         DBIx-Class-0.082840-sqlite-3.14.patch
 BuildArch:      noarch
 # Build
 BuildRequires:  coreutils
@@ -271,6 +273,7 @@ DISTINCT, GROUP BY and HAVING support.
 %prep
 %setup -q -n DBIx-Class-%{version}
 %patch0 -p1
+%patch1 -p1
 chmod -c +x script/*
 # skip dbic_pretty.t when bootstrapping
 %if 0%{?perl_bootstrap}
@@ -301,6 +304,9 @@ make test
 %{_mandir}/man[13]/*
 
 %changelog
+* Tue Feb 28 2017 Petr Pisar <ppisar@redhat.com> - 0.082840-4
+- Disable a test incompatible with sqlite >= 3.14 (CPAN RT#119845)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.082840-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild