From: Rafael Kitover <rkitover@cpan.org>
Date: Fri, 26 Mar 2010 23:30:02 +0000 (+0000)
Subject: a bit cleaner warning suppression for DBD::InterBase only
X-Git-Tag: v0.08121~22
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b22700c4e5164fcbeea2cc14608221981f17db38;p=dbsrgits%2FDBIx-Class.git

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
--- 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
--- 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'
 }