X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FADO%2FMicrosoft_SQL_Server%2FCursor.pm;fp=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FADO%2FMicrosoft_SQL_Server%2FCursor.pm;h=525526bea46d79ed025f843a0944e2d80fad7ceb;hp=6253ee6a595c14a96be9ad31f6a7748401d6a341;hb=f4dc39d649672ff4452cf827ca204a1e937bc8b7;hpb=a4e4185f3c1e0af23dc3d916f706d0e92f95de45 diff --git a/lib/DBIx/Class/Storage/DBI/ADO/Microsoft_SQL_Server/Cursor.pm b/lib/DBIx/Class/Storage/DBI/ADO/Microsoft_SQL_Server/Cursor.pm index 6253ee6..525526b 100644 --- a/lib/DBIx/Class/Storage/DBI/ADO/Microsoft_SQL_Server/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/ADO/Microsoft_SQL_Server/Cursor.pm @@ -2,9 +2,12 @@ package DBIx::Class::Storage::DBI::ADO::Microsoft_SQL_Server::Cursor; use strict; use warnings; + use base 'DBIx::Class::Storage::DBI::Cursor'; use mro 'c3'; + use DBIx::Class::Storage::DBI::ADO::CursorUtils qw/_normalize_guids _strip_trailing_binary_nulls/; +use DBIx::Class::ResultSource::FromSpec::Util 'fromspec_columns_info'; use namespace::clean; =head1 NAME @@ -42,7 +45,7 @@ sub next { my @row = $self->next::method(@_); - $self->{_colinfos} ||= $self->storage->_resolve_column_info($self->args->[0]); + $self->{_colinfos} ||= fromspec_columns_info($self->args->[0]); _normalize_guids( $self->args->[1], @@ -66,7 +69,7 @@ sub all { my @rows = $self->next::method(@_); - $self->{_colinfos} ||= $self->storage->_resolve_column_info($self->args->[0]); + $self->{_colinfos} ||= fromspec_columns_info($self->args->[0]); for (@rows) { _normalize_guids(