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=6f6acdfdec5a0faa4d9d90fc4ac1f2ea4a5ddd36;hpb=d1fc96c751817183519e91eac61129ec3629a325;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 6f6acdf..c5254b4 100644
--- a/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
+++ b/lib/DBIx/Class/Storage/DBI/ODBC/Firebird.pm
@@ -2,8 +2,13 @@ package DBIx::Class::Storage::DBI::ODBC::Firebird;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class::Storage::DBI::InterBase/;
+use base qw/
+  DBIx::Class::Storage::DBI::ODBC
+  DBIx::Class::Storage::DBI::Firebird::Common
+/;
 use mro 'c3';
+use Try::Tiny;
+use namespace::clean;
 
 =head1 NAME
 
@@ -12,78 +17,48 @@ through ODBC
 
 =head1 DESCRIPTION
 
-Most functionality is provided by L<DBIx::Class::Storage::DBI::Interbase>, see
-that module for details.
+Most functionality is provided by
+L<DBIx::Class::Storage::DBI::Firebird::Common>, see that driver for details.
 
 To build the ODBC driver for Firebird on Linux for unixODBC, see:
 
 L<http://www.firebirdnews.org/?p=1324>
 
 This driver does not suffer from the nested statement handles across commits
-issue that the L<DBD::InterBase|DBIx::Class::Storage::DBI::InterBase> based
-driver does. This makes it more suitable for long running processes such as
-under L<Catalyst>.
+issue that the L<DBD::InterBase|DBIx::Class::Storage::DBI::InterBase> or the
+L<DBD::Firebird|DBIx::Class::Storage::DBI::Firebird> based driver does. This
+makes it more suitable for long running processes such as under L<Catalyst>.
 
 =cut
 
-# XXX seemingly no equivalent to ib_time_all from DBD::InterBase via ODBC
-sub connect_call_datetime_setup { 1 }
+# batch operations in DBD::ODBC 1.35 do not work with the official ODBC driver
+sub _run_connection_actions {
+  my $self = shift;
 
-# we don't need DBD::InterBase-specific initialization
-sub _init { 1 }
+  if ($self->_dbh_get_info('SQL_DRIVER_NAME') eq 'OdbcFb') {
+    $self->_disable_odbc_array_ops;
+  }
 
-# ODBC uses dialect 3 by default, good
-sub _set_sql_dialect { 1 }
-
-# releasing savepoints doesn't work, but that shouldn't matter
-sub _svp_release { 1 }
-
-sub datetime_parser_type {
-  'DBIx::Class::Storage::DBI::ODBC::Firebird::DateTime::Format'
-}
-
-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'; # %F %T, no fractional part
-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);
+  return $self->next::method(@_);
 }
 
-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);
+# releasing savepoints doesn't work for some reason, but that shouldn't matter
+sub _exec_svp_release { 1 }
+
+sub _exec_svp_rollback {
+  my ($self, $name) = @_;
+
+  try {
+    $self->_dbh->do("ROLLBACK TO SAVEPOINT $name")
+  }
+  catch {
+    # Firebird ODBC driver bug, ignore
+    if (not /Unable to fetch information about the error/) {
+      $self->throw_exception($_);
+    }
+  };
 }
 
-1;
-
-=head1 CAVEATS
-
-=over 4
-
-=item *
-
-This driver (unlike L<DBD::InterBase>) does not currently support reading or
-writing C<TIMESTAMP> values with sub-second precision.
-
-=back
-
 =head1 AUTHOR
 
 See L<DBIx::Class/AUTHOR> and L<DBIx::Class/CONTRIBUTORS>.
@@ -93,3 +68,6 @@ See L<DBIx::Class/AUTHOR> and L<DBIx::Class/CONTRIBUTORS>.
 You may distribute this code under the same terms as Perl itself.
 
 =cut
+# vim:sts=2 sw=2:
+
+1;