[Bast-commits] r6958 - in DBIx-Class/0.08/branches/sybase: lib/DBIx/Class/Storage/DBI t

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-07-03 03:04:12 +0000 (Fri, 03 Jul 2009)
New Revision: 6958

Modified:
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase.pm
   DBIx-Class/0.08/branches/sybase/t/746sybase.t
Log:
fix sybase mro

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase.pm	2009-07-03 01:29:49 UTC (rev 6957)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase.pm	2009-07-03 03:04:12 UTC (rev 6958)
@@ -4,8 +4,8 @@
 use warnings;
 use mro 'c3';
 use base qw/
+    DBIx::Class::Storage::DBI::Sybase::Base
     DBIx::Class::Storage::DBI
-    DBIx::Class::Storage::DBI::Sybase::Base
 /;
 use Carp::Clan qw/^DBIx::Class/;
 

Modified: DBIx-Class/0.08/branches/sybase/t/746sybase.t
===================================================================
--- DBIx-Class/0.08/branches/sybase/t/746sybase.t	2009-07-03 01:29:49 UTC (rev 6957)
+++ DBIx-Class/0.08/branches/sybase/t/746sybase.t	2009-07-03 03:04:12 UTC (rev 6958)
@@ -1,5 +1,6 @@
 use strict;
 use warnings;  
+no warnings 'uninitialized';
 
 use Test::More;
 use Test::Exception;
@@ -151,10 +152,11 @@
       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");
     }
   }