aboutsummaryrefslogtreecommitdiffstats
path: root/testing/perl-dbix-class
diff options
context:
space:
mode:
Diffstat (limited to 'testing/perl-dbix-class')
-rw-r--r--testing/perl-dbix-class/0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch23
-rw-r--r--testing/perl-dbix-class/0002-sqlite-3.14.patch48
-rw-r--r--testing/perl-dbix-class/APKBUILD8
3 files changed, 2 insertions, 77 deletions
diff --git a/testing/perl-dbix-class/0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch b/testing/perl-dbix-class/0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch
deleted file mode 100644
index fcadbe6774..0000000000
--- a/testing/perl-dbix-class/0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001
-From: Peter Rabbitson <ribasushi@cpan.org>
-Date: Tue, 13 Sep 2016 17:15:48 +0200
-Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite)
- libsqlite version
- .
- - Fix missing ORDER BY leading to failures of t/prefetch/grouped.t
- under upcoming libsqlite (RT#117271)
-Bug-Debian: https://bugs.debian.org/835731
-Bug: https://rt.cpan.org/Ticket/Display.html?id=117271
-
-
---- a/t/prefetch/grouped.t
-+++ b/t/prefetch/grouped.t
-@@ -100,7 +100,7 @@
-
- # add an extra track to one of the cds, and then make sure we can get it on top
- # (check if limit works)
-- my $top_cd = $cd_rs->slice (1,1)->next;
-+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next;
- $top_cd->create_related ('tracks', {
- title => 'over the top',
- });
diff --git a/testing/perl-dbix-class/0002-sqlite-3.14.patch b/testing/perl-dbix-class/0002-sqlite-3.14.patch
deleted file mode 100644
index c4b8d723a2..0000000000
--- a/testing/perl-dbix-class/0002-sqlite-3.14.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/testing/perl-dbix-class/APKBUILD b/testing/perl-dbix-class/APKBUILD
index 18d2cc99e0..c6bc546932 100644
--- a/testing/perl-dbix-class/APKBUILD
+++ b/testing/perl-dbix-class/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=perl-dbix-class
_pkgreal=DBIx-Class
-pkgver=0.082840
+pkgver=0.082841
pkgrel=0
pkgdesc="Extensible and flexible object <-> relational mapper."
url="http://search.cpan.org/dist/DBIx-Class/"
@@ -17,8 +17,6 @@ makedepends="perl-dev perl-module-install $cpanmakedepends"
checkdepends="$cpancheckdepends"
subpackages="$pkgname-doc"
source="http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/$_pkgreal-$pkgver.tar.gz
- 0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch
- 0002-sqlite-3.14.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -48,6 +46,4 @@ check() {
make test
}
-sha512sums="0ae0c724c57cd2b62b9d711633bfc2ba4320c15f6e9d0253381c9ffae495355e32888ec87d6a85c85000d434cedb51789f4b7807da157de8b08723333b66a0d2 DBIx-Class-0.082840.tar.gz
-37ab4f90b3595adc5376d903c7b0408679c0915125e0973d3fcd7e3d41423112eff736ee653b7fd3146b53c1fd283b82fd10fbcf8b767e30ddab9f1d63cd2c7f 0001-Fix-for-upcoming-not-yet-available-via-DBD-SQLite-li.patch
-f6d1d879d9787992ef8f52719720cbcbf1eae8be654a488d3d601eac7f0b2a91feb0c8d3c2ee62dfa628dfacf6656b76572e0472daeaa63a034bcebefc17a254 0002-sqlite-3.14.patch"
+sha512sums="a9c54c0cdb7a2dc93a4b3acb90974e6db80d5eaa95c723c0c3895c99b53be00ed182d4cdc6c5350ee7f120f29172c06494d5c647b8eb4643b91387c0ffee694b DBIx-Class-0.082841.tar.gz"