X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FODBC%2FFirebird.pm;h=c5254b491fe59d300afb130b2aba4962b77c08c3;hb=f3d7b702505f7eabec97857ffcba3f99edcd9d8d;hp=24fe0b4aecd6a4c7f97f9ce6ebcfe24524b5c8eb;hpb=3edfebff056f798162945fcacb06486fa3ee99ef;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
index 24fe0b4..c5254b4 100644
--- a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
@@ -31,17 +31,15 @@ makes it more suitable for long running processes such as under L<Catalyst>.
 
 =cut
 
-__PACKAGE__->datetime_parser_type ('DBIx::Class::Storage::DBI::ODBC::Firebird::DateTime::Format');
-
 # batch operations in DBD::ODBC 1.35 do not work with the official ODBC driver
-sub _init {
+sub _run_connection_actions {
   my $self = shift;
 
-  $self->next::method(@_);
-
   if ($self->_dbh_get_info('SQL_DRIVER_NAME') eq 'OdbcFb') {
-    $self->_get_dbh->{odbc_disable_array_operations} = 1;
+    $self->_disable_odbc_array_ops;
   }
+
+  return $self->next::method(@_);
 }
 
 # releasing savepoints doesn't work for some reason, but that shouldn't matter
@@ -61,37 +59,6 @@ sub _exec_svp_rollback {
   };
 }
 
-package # hide from PAUSE
-  DBIx::Class::Storage::DBI::ODBC::Firebird::DateTime::Format;
-
-# inherit parse/format date
-our @ISA = 'DBIx::Class::Storage::DBI::InterBase::DateTime::Format';
-
-my $timestamp_format = '%Y-%m-%d %H:%M:%S.%4N'; # %F %T
-my $timestamp_parser;
-
-sub parse_datetime {
-  shift;
-  require DateTime::Format::Strptime;
-  $timestamp_parser ||= DateTime::Format::Strptime->new(
-    pattern  => $timestamp_format,
-    on_error => 'croak',
-  );
-  return $timestamp_parser->parse_datetime(shift);
-}
-
-sub format_datetime {
-  shift;
-  require DateTime::Format::Strptime;
-  $timestamp_parser ||= DateTime::Format::Strptime->new(
-    pattern  => $timestamp_format,
-    on_error => 'croak',
-  );
-  return $timestamp_parser->format_datetime(shift);
-}
-
-1;
-
 =head1 AUTHOR
 
 See L<DBIx::Class/AUTHOR> and L<DBIx::Class/CONTRIBUTORS>.
@@ -102,3 +69,5 @@ You may distribute this code under the same terms as Perl itself.
 
 =cut
 # vim:sts=2 sw=2:
+
+1;