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

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-03-26 23:19:56 +0000 (Fri, 26 Mar 2010)
New Revision: 9063

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
   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:
move warning suppression into ::DBI::InterBase

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:12:37 UTC (rev 9062)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/InterBase.pm	2010-03-26 23:19:56 UTC (rev 9063)
@@ -155,6 +155,14 @@
   }
 }
 
+sub _populate_server_info {
+  my $self = shift;
+
+  local $SIG{__WARN__} = sub {}; # silence warning due to bug in DBD::InterBase
+
+  return $self->next::method(@_);
+}
+
 =head2 connect_call_use_softcommit
 
 Used as:

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:12:37 UTC (rev 9062)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm	2010-03-26 23:19:56 UTC (rev 9063)
@@ -38,6 +38,10 @@
 # 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'
 }

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-03-26 23:12:37 UTC (rev 9062)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2010-03-26 23:19:56 UTC (rev 9063)
@@ -940,7 +940,6 @@
 
   my $dbms_ver = eval {
       local $@;
-      local $SIG{__WARN__} = sub {};
       $self->_get_dbh->get_info(18)
   };