X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FODBC%2FMicrosoft_SQL_Server.pm;h=1b5fba2c31d43367ef8a413fc4616bec0509f201;hb=3edfebff056f798162945fcacb06486fa3ee99ef;hp=33b53e30415bd91de67bd57cfe2e9d615cb0e996;hpb=1db83fb9ce3e15d68e2384720ed06af6de5edbac;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm index 33b53e3..1b5fba2 100644 --- a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm @@ -2,11 +2,14 @@ package DBIx::Class::Storage::DBI::ODBC::Microsoft_SQL_Server; use strict; use warnings; -use base qw/DBIx::Class::Storage::DBI::MSSQL/; +use base qw/ + DBIx::Class::Storage::DBI::ODBC + DBIx::Class::Storage::DBI::MSSQL +/; use mro 'c3'; use Scalar::Util 'reftype'; use Try::Tiny; -use Carp::Clan qw/^DBIx::Class/; +use DBIx::Class::Carp; use namespace::clean; __PACKAGE__->mk_group_accessors(simple => qw/ @@ -124,9 +127,10 @@ sub connect_call_use_mars { } if ($dsn !~ /MARS_Connection=/) { - if ($self->using_freetds) { - $self->throw_exception('FreeTDS does not support MARS at the time of ' - .'writing.'); + if ($self->_using_freetds) { + my $v = $self->_using_freetds_version; + $self->throw_exception("FreeTDS 0.91 or later required for MARS support, you have $v") + if $v < 0.91; } if (exists $self->_server_info->{normalized_dbms_version} && @@ -174,27 +178,32 @@ C, and C