Merge 'trunk' into 'cdbicompat_integration'

diff --cc lib/DBIx/Class/ResultSet.pm
Simple merge
diff --cc lib/DBIx/Class/Row.pm
Simple merge
diff --cc lib/DBIx/Class/Storage/DBI.pm

index d8d918d,874d3a4..74fadd9
--- 1/lib/DBIx/Class/Storage/DBI.pm
--- 2/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@@ -1103,11 -1122,9 +1122,12 @@@ sub _select 
    } else {
      $self->throw_exception("rows attribute must be positive if present")
        if (defined($attrs->{rows}) && !($attrs->{rows} > 0));
+ +
+ +    # MySQL actually recommends this approach.  I cringe.
+ +    $attrs->{rows} = 2**48 if not defined $attrs->{rows} and defined $attrs->{offset};
      push @args, $attrs->{rows}, $attrs->{offset};
    }
+ 
    return $self->_execute(@args);
  }
  
diff --cc lib/SQL/Translator/Parser/DBIx/Class.pm
Simple merge
diff --cc t/84serialize.t

index 8940021,c1b67dc..51c7e56
--- 1/t/84serialize.t
--- 2/t/84serialize.t
+++ b/t/84serialize.t
@@@ -8,29 -8,25 +8,32 @@@ use Storable qw(dclone freeze thaw)
  
  my $schema = DBICTest->init_schema();
  
- -plan tests => 6;
- -
- -my $artist = $schema->resultset('Artist')->find(1);
- -
- -{
- -  my $copy = $schema->dclone($artist);
- -  is_deeply($copy, $artist, "dclone row object works");
- -  eval { $copy->discard_changes };
- -  ok( !$@, "discard_changes okay" );
- -  is($copy->id, $artist->id, "IDs still match ");
- -}
- -
- -{
- -  my $ice = $schema->freeze($artist);
- -  my $copy = $schema->thaw($ice);
- -  is_deeply($copy, $artist, 'dclone row object works');
- -
- -  eval { $copy->discard_changes };
- -  ok( !$@, "discard_changes okay" );
- -  is($copy->id, $artist->id, "IDs still okay");
+ +my %stores = (
+ +    dclone          => sub { return dclone($_[0]) },
+ +    "freeze/thaw"   => sub { return thaw(freeze($_[0])) },
+ +);
+ +
- plan tests => (5 * keys %stores);
++plan tests => (7 * keys %stores);
+ +
+ +for my $name (keys %stores) {
+ +    my $store = $stores{$name};
+ +
+ +    my $artist = $schema->resultset('Artist')->find(1);
+ +    my $copy = eval { $store->($artist) };
+ +    is_deeply($copy, $artist, "serialize row object works: $name");
+ +
+ +    # Test that an object with a related_resultset can be serialized.
+ +    my @cds = $artist->related_resultset("cds");
+ +    ok $artist->{related_resultsets}, 'has key: related_resultsets';
+ +
+ +    $copy = eval { $store->($artist) };
+ +    for my $key (keys %$artist) {
+ +        next if $key eq 'related_resultsets';
+ +        next if $key eq '_inflated_column';
+ +        is_deeply($copy->{$key}, $artist->{$key},
+ +                  qq[serialize with related_resultset "$key"]);
+ +    }
++  
++    ok eval { $copy->discard_changes; 1 };
++    is($copy->id, $artist->id, "IDs still match ");
  }
- -
		1	2
lib/DBIx/Class/ResultSet.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/DBIx/Class/Row.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/DBIx/Class/Storage/DBI.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/SQL/Translator/Parser/DBIx/Class.pm	patch \|	diff1 \|	diff2 \|	blob \| history
t/84serialize.t	patch \|	diff1 \|	diff2 \|	blob \| history