[Bast-commits] r9064 - in DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI: . ODBC

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-03-26 23:30:02 +0000 (Fri, 26 Mar 2010)
New Revision: 9064

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/InterBase.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
Log:
a bit cleaner warning suppression for DBD::InterBase only

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/InterBase.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/InterBase.pm	2010-03-26 23:19:56 UTC (rev 9063)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/InterBase.pm	2010-03-26 23:30:02 UTC (rev 9064)
@@ -158,6 +158,8 @@
 sub _populate_server_info {
   my $self = shift;
 
+  return $self->next::method(@_) if ref $self ne __PACKAGE__;
+
   local $SIG{__WARN__} = sub {}; # silence warning due to bug in DBD::InterBase
 
   return $self->next::method(@_);

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm	2010-03-26 23:19:56 UTC (rev 9063)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm	2010-03-26 23:30:02 UTC (rev 9064)
@@ -38,10 +38,6 @@
 # releasing savepoints doesn't work, but that shouldn't matter
 sub _svp_release { 1 }
 
-sub _populate_server_info {
-  goto &DBIx::Class::Storage::DBI::_populate_server_info
-}
-
 sub datetime_parser_type {
   'DBIx::Class::Storage::DBI::ODBC::Firebird::DateTime::Format'
 }