From: Rafael Kitover Date: Wed, 20 Apr 2011 14:54:58 +0000 (-0400) Subject: move Firebird ODBC driver ->type_info override into driver X-Git-Tag: 0.07011~126 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=23024b3ffa5040853f6772b80590f26343dfece7;p=dbsrgits%2FDBIx-Class-Schema-Loader.git move Firebird ODBC driver ->type_info override into driver --- diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm index 031e074..f2eb64d 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -390,12 +390,7 @@ sub _columns_info_for { my $type_num = $colinfo->{data_type}; my $type_name; if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) { - my $type_info = do { - # for buggy Firebird ODBC driver - local $dbh->{LongReadLen} = 100_000; - local $dbh->{LongTruncOk} = 1; - $dbh->type_info($type_num); - }; + my $type_info = $self->_dbh_type_info($type_num); $type_name = $type_info->{TYPE_NAME} if $type_info; $colinfo->{data_type} = lc $type_name if $type_name; } @@ -404,6 +399,15 @@ sub _columns_info_for { return \%result; } +# Need to override this for the buggy Firebird ODBC driver. +sub _dbh_type_info { + my ($self, $type_num) = @_; + + my $dbh = $self->schema->storage->dbh; + + return $dbh->type_info($type_num); +} + # do not use this, override _columns_info_for instead sub _extra_column_info {} diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm index 6e8ec77..ccabbaa 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm @@ -22,6 +22,21 @@ Proxy for L when using L See L for usage information. +=cut + +# Some (current) versions of the ODBC driver have a bug where ->type_info breaks +# with "data truncated". This "fixes" it, but some type names are truncated. +sub _dbh_type_info { + my ($self, $type_num) = @_; + + my $dbh = $self->schema->storage->dbh; + + local $dbh->{LongReadLen} = 100_000; + local $dbh->{LongTruncOk} = 1; + + return $dbh->type_info($type_num); +} + =head1 SEE ALSO L,