X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FMSSQL.pm;h=bdac624173b4d966e418a022f915a430ea6f60b7;hb=afcd3c328a72efb747e248e0e3df8afc751ae3a1;hp=a2cc9166975aaaa9fbb83053f02221e8de575165;hpb=6b1d4f76b756e4b4119153a1f1e8a7bd59ad4e87;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
index a2cc916..bdac624 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
@@ -3,10 +3,12 @@ package DBIx::Class::Schema::Loader::DBI::MSSQL;
 use strict;
 use warnings;
 use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
+use mro 'c3';
 use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use Try::Tiny;
+use namespace::clean;
 
-our $VERSION = '0.07001';
+our $VERSION = '0.07007';
 
 =head1 NAME
 
@@ -174,87 +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};
         }
 
 # 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} eq 'datetimeoffset') {
-            $info->{size} = {
-                26 => 0,
-                28 => 1,
-                29 => 2,
-                30 => 3,
-                31 => 4,
-                32 => 5,
-                33 => 6,
-                34 => 7,
-            }->{$info->{size}};
+        elsif ($data_type =~ /^(?:datetime(?:2|offset)|time)\z/) {
+            $info->{size} = $datetime_precision;
 
             delete $info->{size} if $info->{size} == 7;
         }
-        elsif ($info->{data_type} eq 'datetime2') {
-            $info->{size} = {
-                19 => 0,
-                21 => 1,
-                22 => 2,
-                23 => 3,
-                24 => 4,
-                25 => 5,
-                26 => 6,
-                27 => 7,
-            }->{$info->{size}};
-
-            delete $info->{size} if $info->{size} == 7;
+        elsif ($data_type eq 'varchar'   && $info->{size} == 0) {
+            $info->{data_type} = 'text';
+            delete $info->{size};
         }
-        elsif ($info->{data_type} eq 'time') {
-            $info->{size} = {
-                 8 => 0,
-                10 => 1,
-                11 => 2,
-                12 => 3,
-                13 => 4,
-                14 => 5,
-                15 => 6,
-                16 => 7,
-            }->{$info->{size}};
-
-            delete $info->{size} if $info->{size} == 7;
+        elsif ($data_type eq 'nvarchar'  && $info->{size} == 0) {
+            $info->{data_type} = 'ntext';
+            delete $info->{size};
+        }
+        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};
         }