From: Rafael Kitover Date: Tue, 15 Feb 2011 09:40:40 +0000 (-0500) Subject: MSSQL data type fixes for native client and EasySoft driver X-Git-Tag: 0.07007~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae38ed69ac9a6d2bd99a257b6b47e96579c6cd27;p=dbsrgits%2FDBIx-Class-Schema-Loader.git MSSQL data type fixes for native client and EasySoft driver --- diff --git a/Changes b/Changes index a175b4a..33fe89d 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ Revision history for Perl extension DBIx::Class::Schema::Loader + - fix MSSQL data types for native client and EasySoft driver + 0.07006 2011-02-01 02:18:32 - turn unloading of RelBuilder temp classes back on, now with proper check for class existance using Class::Inspector->loaded diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm index 4f9610a..8c55e72 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm @@ -190,6 +190,15 @@ AND table_name = @{[ $dbh->quote($table) ]} AND column_name = @{[ $dbh->quote($c 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') { $info->{data_type} = 'integer'; @@ -211,47 +220,22 @@ AND table_name = @{[ $dbh->quote($table) ]} AND column_name = @{[ $dbh->quote($c 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 ($info->{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 ($info->{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 ($info->{data_type} eq 'nvarchar' && $info->{size} == 0) { + $info->{data_type} = 'ntext'; + delete $info->{size}; + } + elsif ($info->{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/) {