From: Rafael Kitover Date: Fri, 3 Jul 2009 03:04:12 +0000 (+0000) Subject: fix sybase mro X-Git-Tag: v0.08112~14^2~110 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b0b44f974ad33fb7e2e899dcd844392eb09287d7;p=dbsrgits%2FDBIx-Class.git fix sybase mro --- diff --git a/lib/DBIx/Class/Storage/DBI/Sybase.pm b/lib/DBIx/Class/Storage/DBI/Sybase.pm index 39062a2..46da4a2 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm @@ -4,8 +4,8 @@ use strict; use warnings; use mro 'c3'; use base qw/ - DBIx::Class::Storage::DBI DBIx::Class::Storage::DBI::Sybase::Base + DBIx::Class::Storage::DBI /; use Carp::Clan qw/^DBIx::Class/; diff --git a/t/746sybase.t b/t/746sybase.t index 5554649..2eeeb11 100644 --- a/t/746sybase.t +++ b/t/746sybase.t @@ -1,5 +1,6 @@ use strict; use warnings; +no warnings 'uninitialized'; use Test::More; use Test::Exception; @@ -151,10 +152,11 @@ SQL ok(!$@, "inserted $size $type without dying"); diag $@ if $@; - ok(eval { + my $got = eval { $rs->search({ id=> $id }, { select => [$type] })->single->$type - } eq $binstr{$size}, "verified inserted $size $type" ); + }; diag $@ if $@; + ok($got eq $binstr{$size}, "verified inserted $size $type"); } }