X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FMSSQL.pm;h=46f582887ed7a708b67545c10870f4866e9d8925;hb=0e773352a;hp=515ff9b53172c6ad558e8014f74ce087a9d9a1c4;hpb=68bb0d2ec053f895b3f110957a7cacd0f8934cba;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/MSSQL.pm b/lib/DBIx/Class/Storage/DBI/MSSQL.pm index 515ff9b..46f5828 100644 --- a/lib/DBIx/Class/Storage/DBI/MSSQL.pm +++ b/lib/DBIx/Class/Storage/DBI/MSSQL.pm @@ -5,65 +5,50 @@ use warnings; use base qw/DBIx::Class::Storage::DBI::UniqueIdentifier/; use mro 'c3'; - -use List::Util(); +use Try::Tiny; +use List::Util 'first'; +use namespace::clean; __PACKAGE__->mk_group_accessors(simple => qw/ - _identity _identity_method + _identity _identity_method _pre_insert_sql _post_insert_sql /); -__PACKAGE__->sql_maker_class('DBIx::Class::SQLAHacks::MSSQL'); +__PACKAGE__->sql_maker_class('DBIx::Class::SQLMaker::MSSQL'); -sub _set_identity_insert { - my ($self, $table) = @_; +__PACKAGE__->sql_quote_char([qw/[ ]/]); - my $sql = sprintf ( - 'SET IDENTITY_INSERT %s ON', - $self->sql_maker->_quote ($table), - ); +__PACKAGE__->datetime_parser_type ( + 'DBIx::Class::Storage::DBI::MSSQL::DateTime::Format' +); - my $dbh = $self->_get_dbh; - eval { $dbh->do ($sql) }; - if ($@) { - $self->throw_exception (sprintf "Error executing '%s': %s", - $sql, - $dbh->errstr, - ); - } -} -sub _unset_identity_insert { +__PACKAGE__->new_guid('NEWID()'); + +sub _set_identity_insert { my ($self, $table) = @_; - my $sql = sprintf ( - 'SET IDENTITY_INSERT %s OFF', - $self->sql_maker->_quote ($table), - ); + my $stmt = 'SET IDENTITY_INSERT %s %s'; + $table = $self->sql_maker->_quote($table); - my $dbh = $self->_get_dbh; - $dbh->do ($sql); + $self->_pre_insert_sql (sprintf $stmt, $table, 'ON'); + $self->_post_insert_sql(sprintf $stmt, $table, 'OFF'); } sub insert_bulk { my $self = shift; my ($source, $cols, $data) = @_; - my $is_identity_insert = (List::Util::first - { $source->column_info ($_)->{is_auto_increment} } - (@{$cols}) - ) - ? 1 - : 0; + my $is_identity_insert = + (first { $_->{is_auto_increment} } values %{ $source->columns_info($cols) } ) + ? 1 + : 0 + ; if ($is_identity_insert) { $self->_set_identity_insert ($source->name); } $self->next::method(@_); - - if ($is_identity_insert) { - $self->_unset_identity_insert ($source->name); - } } sub insert { @@ -72,9 +57,8 @@ sub insert { my $supplied_col_info = $self->_resolve_column_info($source, [keys %$to_insert] ); - my $is_identity_insert = (List::Util::first { $_->{is_auto_increment} } (values %$supplied_col_info) ) - ? 1 - : 0; + my $is_identity_insert = + (first { $_->{is_auto_increment} } values %$supplied_col_info) ? 1 : 0; if ($is_identity_insert) { $self->_set_identity_insert ($source->name); @@ -82,26 +66,26 @@ sub insert { my $updated_cols = $self->next::method(@_); - if ($is_identity_insert) { - $self->_unset_identity_insert ($source->name); - } - return $updated_cols; } sub _prep_for_execute { my $self = shift; - my ($op, $extra_bind, $ident, $args) = @_; + my ($op, $ident, $args) = @_; # cast MONEY values properly if ($op eq 'insert' || $op eq 'update') { my $fields = $args->[0]; + my $colinfo = $ident->columns_info([keys %$fields]); + for my $col (keys %$fields) { # $ident is a result source object with INSERT/UPDATE ops - if ($ident->column_info ($col)->{data_type} - && - $ident->column_info ($col)->{data_type} =~ /^money\z/i) { + if ( + $colinfo->{$col}{data_type} + && + $colinfo->{$col}{data_type} =~ /^money\z/i + ) { my $val = $fields->{$col}; $fields->{$col} = \['CAST(? AS MONEY)', [ $col => $val ]]; } @@ -111,8 +95,15 @@ sub _prep_for_execute { my ($sql, $bind) = $self->next::method (@_); if ($op eq 'insert') { - $sql .= ';SELECT SCOPE_IDENTITY()'; - + if (my $prepend = $self->_pre_insert_sql) { + $sql = "${prepend}\n${sql}"; + $self->_pre_insert_sql(undef); + } + if (my $append = $self->_post_insert_sql) { + $sql = "${sql}\n${append}"; + $self->_post_insert_sql(undef); + } + $sql .= "\nSELECT SCOPE_IDENTITY()"; } return ($sql, $bind); @@ -122,13 +113,13 @@ sub _execute { my $self = shift; my ($op) = @_; - my ($rv, $sth, @bind) = $self->dbh_do($self->can('_dbh_execute'), @_); + my ($rv, $sth, @bind) = $self->next::method(@_); if ($op eq 'insert') { # this should bring back the result of SELECT SCOPE_IDENTITY() we tacked # on in _prep_for_execute above - my ($identity) = eval { $sth->fetchrow_array }; + my ($identity) = try { $sth->fetchrow_array }; # SCOPE_IDENTITY failed, but we can do something else if ( (! $identity) && $self->_identity_method) { @@ -148,7 +139,7 @@ sub last_insert_id { shift->_identity } # # MSSQL is retarded wrt ordered subselects. One needs to add a TOP -# to *all* subqueries, but one also can't use TOP 100 PERCENT +# to *all* subqueries, but one also *can't* use TOP 100 PERCENT # http://sqladvice.com/forums/permalink/18496/22931/ShowThread.aspx#22931 # sub _select_args_to_query { @@ -161,12 +152,12 @@ sub _select_args_to_query { if ( $sql !~ /^ \s* SELECT \s+ TOP \s+ \d+ \s+ /xi && - scalar $self->_parse_order_by ($attrs->{order_by}) + scalar $self->_extract_order_criteria ($attrs->{order_by}) ) { $self->throw_exception( 'An ordered subselect encountered - this is not safe! Please see "Ordered Subselects" in DBIx::Class::Storage::DBI::MSSQL ') unless $attrs->{unsafe_subselect_ok}; - my $max = 2 ** 32; + my $max = $self->sql_maker->__max_int; $sql =~ s/^ \s* SELECT \s/SELECT TOP $max /xi; } @@ -194,42 +185,28 @@ sub _svp_rollback { $self->_get_dbh->do("ROLLBACK TRANSACTION $name"); } -sub datetime_parser_type { - 'DBIx::Class::Storage::DBI::MSSQL::DateTime::Format' -} - sub sqlt_type { 'SQLServer' } -sub sql_maker { +sub sql_limit_dialect { my $self = shift; - unless ($self->_sql_maker) { - unless ($self->{_sql_maker_opts}{limit_dialect}) { - my $have_rno = 0; + my $supports_rno = 0; - if (exists $self->_server_info->{normalized_dbms_version}) { - $have_rno = 1 if $self->_server_info->{normalized_dbms_version} >= 9; - } - else { - # User is connecting via DBD::Sybase and has no permission to run - # stored procedures like xp_msver, or version detection failed for some - # other reason. - # So, we use a query to check if RNO is implemented. - $have_rno = 1 if (eval { local $@; ($self->_get_dbh - ->selectrow_array('SELECT row_number() OVER (ORDER BY rand())') - )[0] }); - } - - $self->{_sql_maker_opts} = { - limit_dialect => ($have_rno ? 'RowNumberOver' : 'Top'), - %{$self->{_sql_maker_opts}||{}} - }; - } - - my $maker = $self->next::method (@_); + if (exists $self->_server_info->{normalized_dbms_version}) { + $supports_rno = 1 if $self->_server_info->{normalized_dbms_version} >= 9; + } + else { + # User is connecting via DBD::Sybase and has no permission to run + # stored procedures like xp_msver, or version detection failed for some + # other reason. + # So, we use a query to check if RNO is implemented. + try { + $self->_get_dbh->selectrow_array('SELECT row_number() OVER (ORDER BY rand())'); + $supports_rno = 1; + }; } - return $self->_sql_maker; + return $supports_rno ? 'RowNumberOver' : 'Top'; } sub _ping { @@ -240,17 +217,18 @@ sub _ping { local $dbh->{RaiseError} = 1; local $dbh->{PrintError} = 0; - eval { + return try { $dbh->do('select 1'); + 1; + } catch { + 0; }; - - return $@ ? 0 : 1; } package # hide from PAUSE DBIx::Class::Storage::DBI::MSSQL::DateTime::Format; -my $datetime_format = '%Y-%m-%d %H:%M:%S.%3N'; # %F %T +my $datetime_format = '%Y-%m-%d %H:%M:%S.%3N'; # %F %T my $smalldatetime_format = '%Y-%m-%d %H:%M:%S'; my ($datetime_parser, $smalldatetime_parser);