From: Rafael Kitover Date: Fri, 18 Feb 2011 09:05:33 +0000 (-0500) Subject: support MSSQL over DBD::ADO X-Git-Tag: 0.07008~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=afcd3c328a72efb747e248e0e3df8afc751ae3a1;hp=3b17d9885e593f0705e1e16360b816778d71ec95;p=dbsrgits%2FDBIx-Class-Schema-Loader.git support MSSQL over DBD::ADO --- diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm index 76e741b..47418b1 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI.pm @@ -133,6 +133,7 @@ sub _filter_tables { LOOP: for my $table (@tables) { try { + local $^W = 0; # for ADO my $sth = $self->_sth_for($table, undef, \'1 = 0'); $sth->execute; } @@ -388,7 +389,7 @@ sub _columns_info_for { my $colinfo = $result{$col}; my $type_num = $colinfo->{data_type}; my $type_name; - if (defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) { + if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) { my $type_info = $dbh->type_info($type_num); $type_name = $type_info->{TYPE_NAME} if $type_info; $colinfo->{data_type} = lc $type_name if $type_name; diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm index 1982b9c..bdac624 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm @@ -3,8 +3,10 @@ package DBIx::Class::Schema::Loader::DBI::MSSQL; use strict; use warnings; use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common'; -use Carp::Clan qw/^DBIx::Class/; use mro 'c3'; +use Carp::Clan qw/^DBIx::Class/; +use Try::Tiny; +use namespace::clean; our $VERSION = '0.07007'; @@ -174,71 +176,79 @@ sub _columns_info_for { my $result = $self->next::method(@_); + my $dbh = $self->schema->storage->dbh; + while (my ($col, $info) = each %$result) { - my $dbh = $self->schema->storage->dbh; +# get type info + my $sth = $dbh->prepare(qq{ +SELECT character_maximum_length, data_type, datetime_precision +FROM INFORMATION_SCHEMA.COLUMNS +WHERE table_name = @{[ $dbh->quote($table) ]} AND column_name = @{[ $dbh->quote($col) ]} + }); + $sth->execute; + my ($char_max_length, $data_type, $datetime_precision) = $sth->fetchrow_array; + + $info->{data_type} = $data_type; + + if (defined $char_max_length) { + $info->{size} = $char_max_length; + $info->{size} = 0 if $char_max_length < 0; + } # find identities - my $sth = $dbh->prepare(qq{ + $sth = $dbh->prepare(qq{ SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE columnproperty(object_id(@{[ $dbh->quote($table) ]}, 'U'), @{[ $dbh->quote($col) ]}, 'IsIdentity') = 1 AND table_name = @{[ $dbh->quote($table) ]} AND column_name = @{[ $dbh->quote($col) ]} }); - if (eval { $sth->execute; $sth->fetchrow_array }) { + if (try { $sth->execute; $sth->fetchrow_array }) { $info->{is_auto_increment} = 1; $info->{data_type} =~ s/\s*identity//i; delete $info->{size}; } -# get datetime precision - $sth = $dbh->prepare(qq{ -SELECT datetime_precision -FROM INFORMATION_SCHEMA.COLUMNS -WHERE table_name = @{[ $dbh->quote($table) ]} AND column_name = @{[ $dbh->quote($col) ]} - }); - $sth->execute; - my ($datetime_precision) = $sth->fetchrow_array; - # fix types - if ($info->{data_type} eq 'int') { + if ($data_type eq 'int') { $info->{data_type} = 'integer'; } - elsif ($info->{data_type} eq 'timestamp') { + elsif ($data_type eq 'timestamp') { $info->{inflate_datetime} = 0; } - elsif ($info->{data_type} =~ /^(?:numeric|decimal)\z/) { + elsif ($data_type =~ /^(?:numeric|decimal)\z/) { if (ref($info->{size}) && $info->{size}[0] == 18 && $info->{size}[1] == 0) { delete $info->{size}; } } - elsif ($info->{data_type} eq 'float') { + elsif ($data_type eq 'float') { $info->{data_type} = 'double precision'; + delete $info->{size}; } - elsif ($info->{data_type} =~ /^(?:small)?datetime\z/) { + elsif ($data_type =~ /^(?:small)?datetime\z/) { # fixup for DBD::Sybase if ($info->{default_value} && $info->{default_value} eq '3') { delete $info->{default_value}; } } - elsif ($info->{data_type} =~ /^(?:datetime(?:2|offset)|time)\z/) { + elsif ($data_type =~ /^(?:datetime(?:2|offset)|time)\z/) { $info->{size} = $datetime_precision; delete $info->{size} if $info->{size} == 7; } - elsif ($info->{data_type} eq 'varchar' && $info->{size} == 0) { + elsif ($data_type eq 'varchar' && $info->{size} == 0) { $info->{data_type} = 'text'; delete $info->{size}; } - elsif ($info->{data_type} eq 'nvarchar' && $info->{size} == 0) { + elsif ($data_type eq 'nvarchar' && $info->{size} == 0) { $info->{data_type} = 'ntext'; delete $info->{size}; } - elsif ($info->{data_type} eq 'varbinary' && $info->{size} == 0) { + elsif ($data_type eq 'varbinary' && $info->{size} == 0) { $info->{data_type} = 'image'; delete $info->{size}; } - if ($info->{data_type} !~ /^(?:n?char|n?varchar|binary|varbinary|numeric|decimal|float|datetime(?:2|offset)|time)\z/) { + if ($data_type !~ /^(?:n?char|n?varchar|binary|varbinary|numeric|decimal|float|datetime(?:2|offset)|time)\z/) { delete $info->{size}; } diff --git a/t/10_07mssql_common.t b/t/10_07mssql_common.t index 4ce93a7..316da7f 100644 --- a/t/10_07mssql_common.t +++ b/t/10_07mssql_common.t @@ -13,7 +13,7 @@ BEGIN { } my ($dsns, $common_version); -for (qw/MSSQL MSSQL_ODBC/) { +for (qw/MSSQL MSSQL_ODBC MSSQL_ADO/) { next unless $ENV{"DBICTEST_${_}_DSN"}; $dsns->{$_}{dsn} = $ENV{"DBICTEST_${_}_DSN"}; @@ -103,7 +103,9 @@ my $tester = dbixcsl_common_tests->new( float => { data_type => 'double precision' }, 'double precision' => { data_type => 'double precision' }, + 'numeric(6)' => { data_type => 'numeric', size => [6,0] }, 'numeric(6,3)' => { data_type => 'numeric', size => [6,3] }, + 'decimal(6)' => { data_type => 'decimal', size => [6,0] }, 'decimal(6,3)' => { data_type => 'decimal', size => [6,3] }, 'dec(6,3)' => { data_type => 'decimal', size => [6,3] }, numeric => { data_type => 'numeric' },