[perl-DBIx-Class] Fix ::Ordered in combination with delete_all
Petr Pisar
ppisar at fedoraproject.org
Wed Jun 18 07:20:26 UTC 2014
commit f52cb4c6be5e872596ca0331ca5fb46a34e22e1d
Author: Petr Písař <ppisar at redhat.com>
Date: Wed Jun 18 08:46:40 2014 +0200
Fix ::Ordered in combination with delete_all
...ix-Ordered-in-combination-with-delete_all.patch | 144 ++++++++++++++++++++
perl-DBIx-Class.spec | 9 +-
2 files changed, 152 insertions(+), 1 deletions(-)
---
diff --git a/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch b/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch
new file mode 100644
index 0000000..aedd89a
--- /dev/null
+++ b/DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch
@@ -0,0 +1,144 @@
+From 72e545f8b77baec541e229d740308886f0598a82 Mon Sep 17 00:00:00 2001
+From: Peter Rabbitson <ribasushi at cpan.org>
+Date: Mon, 16 Jun 2014 16:15:44 +0200
+Subject: [PATCH] Fix ::Ordered in combination with delete_all
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See pod-changes for description of the solution. I cringe but... oh well
+
+Petr Pisar: Ported to 0.08270.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/DBIx/Class/Ordered.pm | 53 ++++++++++++++++++++++++++++++------------
+ t/ordered/unordered_movement.t | 25 +++++++++++---------
+ 2 files changed, 52 insertions(+), 26 deletions(-)
+
+diff --git a/lib/DBIx/Class/Ordered.pm b/lib/DBIx/Class/Ordered.pm
+index 5e40dc0..a5db68b 100644
+--- a/lib/DBIx/Class/Ordered.pm
++++ b/lib/DBIx/Class/Ordered.pm
+@@ -367,7 +367,30 @@ sub move_to {
+
+ my $position_column = $self->position_column;
+
+- if ($self->is_column_changed ($position_column) ) {
++ my $is_txn;
++ if ($is_txn = $self->result_source->schema->storage->transaction_depth) {
++ # Reload position state from storage
++ # The thinking here is that if we are in a transaction, it is
++ # *more likely* the object went out of sync due to resultset
++ # level shenanigans. Instead of always reloading (slow) - go
++ # ahead and hand-hold only in the case of higher layers
++ # requesting the safety of a txn
++
++ $self->store_column(
++ $position_column,
++ ( $self->result_source
++ ->resultset
++ ->search($self->_storage_ident_condition, { rows => 1, columns => $position_column })
++ ->cursor
++ ->next
++ )[0] || $self->throw_exception(
++ sprintf "Unable to locate object '%s' in storage - object went ouf of sync...?",
++ $self->ID
++ ),
++ );
++ delete $self->{_dirty_columns}{$position_column};
++ }
++ elsif ($self->is_column_changed ($position_column) ) {
+ # something changed our position, we need to know where we
+ # used to be - use the stashed value
+ $self->store_column($position_column, delete $self->{_column_data_in_storage}{$position_column});
+@@ -380,7 +403,7 @@ sub move_to {
+ return 0;
+ }
+
+- my $guard = $self->result_source->schema->txn_scope_guard;
++ my $guard = $is_txn ? undef : $self->result_source->schema->txn_scope_guard;
+
+ my ($direction, @between);
+ if ( $from_position < $to_position ) {
+@@ -402,7 +425,7 @@ sub move_to {
+ $self->_shift_siblings ($direction, @between);
+ $self->_ordered_internal_update({ $position_column => $new_pos_val });
+
+- $guard->commit;
++ $guard->commit if $guard;
+ return 1;
+ }
+
+@@ -861,18 +884,18 @@ will prevent such race conditions going undetected.
+
+ =head2 Multiple Moves
+
+-Be careful when issuing move_* methods to multiple objects. If
+-you've pre-loaded the objects then when you move one of the objects
+-the position of the other object will not reflect their new value
+-until you reload them from the database - see
+-L<DBIx::Class::Row/discard_changes>.
+-
+-There are times when you will want to move objects as groups, such
+-as changing the parent of several objects at once - this directly
+-conflicts with this problem. One solution is for us to write a
+-ResultSet class that supports a parent() method, for example. Another
+-solution is to somehow automagically modify the objects that exist
+-in the current object's result set to have the new position value.
++If you have multiple same-group result objects already loaded from storage,
++you need to be careful when executing C<move_*> operations on them:
++without a L</position_column> reload the L</_position_value> of the
++"siblings" will be out of sync with the underlying storage.
++
++Starting from version C<0.082800> DBIC will implicitly perform such
++reloads when the C<move_*> happens as a part of a transaction
++(a good example of such situation is C<< $ordered_resultset->delete_all >>).
++
++If it is not possible for you to wrap the entire call-chain in a transaction,
++you will need to call L<DBIx::Class::Row/discard_changes> to get an object
++up-to-date before proceeding, otherwise undefined behavior will result.
+
+ =head2 Default Values
+
+diff --git a/t/ordered/unordered_movement.t b/t/ordered/unordered_movement.t
+index 9cbc3da..dc08306 100644
+--- a/t/ordered/unordered_movement.t
++++ b/t/ordered/unordered_movement.t
+@@ -9,19 +9,22 @@ use DBICTest;
+ my $schema = DBICTest->init_schema();
+
+ my $cd = $schema->resultset('CD')->next;
++$cd->tracks->delete;
+
+-lives_ok {
+- $cd->tracks->delete;
++$schema->resultset('CD')->related_resultset('tracks')->delete;
+
+- my @tracks = map
+- { $cd->create_related('tracks', { title => "t_$_", position => $_ }) }
+- (4,2,5,1,3)
+- ;
++is $cd->tracks->count, 0, 'No tracks';
+
+- for (@tracks) {
+- $_->discard_changes;
+- $_->delete;
+- }
+-} 'Creation/deletion of out-of order tracks successful';
++$cd->create_related('tracks', { title => "t_$_", position => $_ })
++ for (4,2,3,1,5);
++
++is $cd->tracks->count, 5, 'Created 5 tracks';
++
++# a txn should force the implicit pos reload, regardless of order
++$schema->txn_do(sub {
++ $cd->tracks->delete_all
++});
++
++is $cd->tracks->count, 0, 'Successfully deleted everything';
+
+ done_testing;
+--
+1.9.3
+
diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index da0c6cb..4b11927 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.08250
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/DBIx-Class-%{version}.tar.gz
@@ -11,6 +11,9 @@ Patch0: DBIx-Class-0.08250-SQLite-changed-their-exception-text-again.pat
# Adapt to changes in SQL-Abstract-1.77, bug #1099741, CPAN RT#92331,
# in upstream version 0.08260
Patch1: DBIx-Class-0.08250-Fix-ridiculous-regex-anchor-mistake-from-66137dffe.patch
+# Fix ::Ordered in combination with delete_all visible with sqlite 3.8.5,
+# bug #1110272, CPAN RT#96499
+Patch2: DBIx-Class-0.08270-Fix-Ordered-in-combination-with-delete_all.patch
URL: http://search.cpan.org/dist/DBIx-Class/
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch: noarch
@@ -142,6 +145,7 @@ DISTINCT, GROUP BY and HAVING support.
%setup -q -n DBIx-Class-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
find t/ -type f -exec perl -pi -e 's|\r||; s|^#!perl|#!%{__perl}|' {} +
find . -type f -exec chmod -c -x {} +
@@ -189,6 +193,9 @@ make test
%changelog
+* Wed Jun 18 2014 Petr Pisar <ppisar at redhat.com> - 0.08250-6
+- Fix ::Ordered in combination with delete_all (bug #1110272)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.08250-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list