Fix datetimes in ODBC/Firebird (merge identical code left after a870aa85e)

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / InterBase.pm

diff --git a/lib/DBIx/Class/Storage/DBI/InterBase.pm b/lib/DBIx/Class/Storage/DBI/InterBase.pm
index 6779e47..cb6d8f9 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/InterBase.pm
+++ b/lib/DBIx/Class/Storage/DBI/InterBase.pm
@@ -2,21 +2,20 @@ package DBIx::Class::Storage::DBI::InterBase;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class::Storage::DBI/;
+use base qw/DBIx::Class::Storage::DBI::Firebird::Common/;
 use mro 'c3';
-use List::Util 'first';
 use Try::Tiny;
 use namespace::clean;
 
 =head1 NAME
 
-DBIx::Class::Storage::DBI::InterBase - Driver for the Firebird RDBMS
+DBIx::Class::Storage::DBI::InterBase - Driver for the Firebird RDBMS via
+L<DBD::InterBase>
 
 =head1 DESCRIPTION
 
-This class implements autoincrements for Firebird using C<RETURNING> as well as
-L<auto_nextval|DBIx::Class::ResultSource/auto_nextval> and provides
-L<DBIx::Class::InflateColumn::DateTime> support.
+This driver is a subclass of L<DBIx::Class::Storage::DBI::Firebird::Common> for
+use with L<DBD::InterBase>, see that driver for general details.
 
 You need to use either the
 L<disable_sth_caching|DBIx::Class::Storage::DBI/disable_sth_caching> option or
@@ -31,88 +30,6 @@ L</connect_call_datetime_setup>.
 
 =cut
 
-# set default
-__PACKAGE__->_use_insert_returning (1);
-__PACKAGE__->sql_limit_dialect ('FirstSkip');
-__PACKAGE__->sql_quote_char ('"');
-__PACKAGE__->datetime_parser_type(
-  'DBIx::Class::Storage::DBI::InterBase::DateTime::Format'
-);
-
-sub _sequence_fetch {
-  my ($self, $nextval, $sequence) = @_;
-
-  $self->throw_exception("Can only fetch 'nextval' for a sequence")
-    if $nextval !~ /^nextval$/i;
-
-  $self->throw_exception('No sequence to fetch') unless $sequence;
-
-  my ($val) = $self->_get_dbh->selectrow_array(sprintf
-    'SELECT GEN_ID(%s, 1) FROM rdb$database',
-    $self->sql_maker->_quote($sequence)
-  );
-
-  return $val;
-}
-
-sub _dbh_get_autoinc_seq {
-  my ($self, $dbh, $source, $col) = @_;
-
-  my $table_name = $source->from;
-  $table_name    = $$table_name if ref $table_name;
-  $table_name    = $self->sql_maker->quote_char ? $table_name : uc($table_name);
-
-  local $dbh->{LongReadLen} = 100000;
-  local $dbh->{LongTruncOk} = 1;
-
-  my $sth = $dbh->prepare(<<'EOF');
-SELECT t.rdb$trigger_source
-FROM rdb$triggers t
-WHERE t.rdb$relation_name = ?
-AND t.rdb$system_flag = 0 -- user defined
-AND t.rdb$trigger_type = 1 -- BEFORE INSERT
-EOF
-  $sth->execute($table_name);
-
-  while (my ($trigger) = $sth->fetchrow_array) {
-    my @trig_cols = map {
-      /^"([^"]+)/ ? $1 : uc($1)
-    } $trigger =~ /new\.("?\w+"?)/ig;
-
-    my ($quoted, $generator) = $trigger =~
-/(?:gen_id\s* \( \s* |next \s* value \s* for \s*)(")?(\w+)/ix;
-
-    if ($generator) {
-      $generator = uc $generator unless $quoted;
-
-      return $generator
-        if first {
-          $self->sql_maker->quote_char ? ($_ eq $col) : (uc($_) eq uc($col))
-        } @trig_cols;
-    }
-  }
-
-  return undef;
-}
-
-sub _svp_begin {
-  my ($self, $name) = @_;
-
-  $self->_dbh->do("SAVEPOINT $name");
-}
-
-sub _svp_release {
-  my ($self, $name) = @_;
-
-  $self->_dbh->do("RELEASE SAVEPOINT $name");
-}
-
-sub _svp_rollback {
-  my ($self, $name) = @_;
-
-  $self->_dbh->do("ROLLBACK TO SAVEPOINT $name")
-}
-
 sub _ping {
   my $self = shift;
 
@@ -152,16 +69,6 @@ sub _set_sql_dialect {
   }
 }
 
-sub _get_server_version {
-  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(@_);
-}
-
 =head2 connect_call_use_softcommit
 
 Used as:
@@ -224,55 +131,6 @@ sub connect_call_datetime_setup {
   $self->_get_dbh->{ib_time_all} = 'ISO';
 }
 
-
-package # hide from PAUSE
-  DBIx::Class::Storage::DBI::InterBase::DateTime::Format;
-
-my $timestamp_format = '%Y-%m-%d %H:%M:%S.%4N'; # %F %T
-my $date_format      = '%Y-%m-%d';
-
-my ($timestamp_parser, $date_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);
-}
-
-sub parse_date {
-  shift;
-  require DateTime::Format::Strptime;
-  $date_parser ||= DateTime::Format::Strptime->new(
-    pattern  => $date_format,
-    on_error => 'croak',
-  );
-  return $date_parser->parse_datetime(shift);
-}
-
-sub format_date {
-  shift;
-  require DateTime::Format::Strptime;
-  $date_parser ||= DateTime::Format::Strptime->new(
-    pattern  => $date_format,
-    on_error => 'croak',
-  );
-  return $date_parser->format_datetime(shift);
-}
-
 1;
 
 =head1 CAVEATS
@@ -289,12 +147,6 @@ affects performance.
 
 Alternately, use the L<ODBC|DBIx::Class::Storage::DBI::ODBC::Firebird> driver.
 
-=item *
-
-C<last_insert_id> support by default only works for Firebird versions 2 or
-greater, L<auto_nextval|DBIx::Class::ResultSource/auto_nextval> however should
-work with earlier versions.
-
 =back
 
 =head1 AUTHOR