a bit cleaner warning suppression for DBD::InterBase only

diff --git a/lib/DBIx/Class/Storage/DBI/InterBase.pm b/lib/DBIx/Class/Storage/DBI/InterBase.pm
index 1abddf1..352dcc5 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/InterBase.pm
+++ b/lib/DBIx/Class/Storage/DBI/InterBase.pm
@@ -158,6 +158,8 @@ sub _set_sql_dialect {
 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(@_);

diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
index 2b91058..6f6acdf 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
@@ -38,10 +38,6 @@ sub _set_sql_dialect { 1 }
 # 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'
 }