From: Rafael Kitover Date: Tue, 14 Jul 2009 13:09:47 +0000 (+0000) Subject: substantially reduced ping count, dynamic cursors support for mssql through odbc X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef131d82b1a6cad5ef079a341912b0c6d8b7b990;p=dbsrgits%2FDBIx-Class-Historic.git substantially reduced ping count, dynamic cursors support for mssql through odbc --- diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm index bf2d76e..0600bf2 100644 --- a/lib/DBIx/Class/Schema.pm +++ b/lib/DBIx/Class/Schema.pm @@ -42,7 +42,7 @@ DBIx::Class::Schema - composable schemas $dsn, $user, $password, - { AutoCommit => 0 }, + { AutoCommit => 1 }, ); my $schema2 = Library::Schema->connect($coderef_returning_dbh); diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index a017ff3..e6e4953 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -437,12 +437,21 @@ sub connect_info { } } - %attrs = () if (ref $args[0] eq 'CODE'); # _connect() never looks past $args[0] in this case + if (ref $args[0] eq 'CODE') { + # _connect() never looks past $args[0] in this case + %attrs = () + } else { + %attrs = (%{ $self->_dbi_connect_attributes }, %attrs); + } $self->_dbi_connect_info([@args, keys %attrs ? \%attrs : ()]); $self->_connect_info; } +sub _dbi_connect_attributes { + return { AutoCommit => 1 }; +} + =head2 on_connect_do This method is deprecated in favour of setting via L. @@ -621,7 +630,7 @@ database is not in C mode. sub disconnect { my ($self) = @_; - if( $self->connected ) { + if( $self->_dbh ) { my @actions; push @actions, ( $self->on_disconnect_call || () ); @@ -724,10 +733,24 @@ sub dbh { return $self->_dbh; } +sub _get_dbh { + my $self = shift; + + if (not $self->_dbh) { + $self->_populate_dbh; + } + return $self->_dbh; +} + sub _sql_maker_args { my ($self) = @_; - return ( bindtype=>'columns', array_datatypes => 1, limit_dialect => $self->dbh, %{$self->_sql_maker_opts} ); + return ( + bindtype=>'columns', + array_datatypes => 1, + limit_dialect => $self->_get_dbh, + %{$self->_sql_maker_opts} + ); } sub sql_maker { @@ -744,6 +767,7 @@ sub _rebless {} sub _populate_dbh { my ($self) = @_; + my @info = @{$self->_dbi_connect_info || []}; $self->_dbh($self->_connect(@info)); @@ -756,6 +780,11 @@ sub _populate_dbh { # there is no transaction in progress by definition $self->{transaction_depth} = $self->_dbh_autocommit ? 0 : 1; + $self->_run_connection_actions unless $self->{_in_determine_driver}; +} + +sub _run_connection_actions { + my $self = shift; my @actions; push @actions, ( $self->on_connect_call || () ); @@ -769,6 +798,8 @@ sub _determine_driver { if (ref $self eq 'DBIx::Class::Storage::DBI') { my $driver; + my $started_unconnected = 0; + local $self->{_in_determine_driver} = 1; if ($self->_dbh) { # we are connected $driver = $self->_dbh->{Driver}{Name}; @@ -776,6 +807,7 @@ sub _determine_driver { # try to use dsn to not require being connected, the driver may still # force a connection in _rebless to determine version ($driver) = $self->_dbi_connect_info->[0] =~ /dbi:([^:]+):/i; + $started_unconnected = 1; } my $storage_class = "DBIx::Class::Storage::DBI::${driver}"; @@ -784,6 +816,8 @@ sub _determine_driver { bless $self, $storage_class; $self->_rebless(); } + + $self->_run_connection_actions if $started_unconnected; } } @@ -983,14 +1017,13 @@ sub _svp_generate_name { sub txn_begin { my $self = shift; - $self->ensure_connected(); if($self->{transaction_depth} == 0) { $self->debugobj->txn_begin() if $self->debug; # this isn't ->_dbh-> because # we should reconnect on begin_work # for AutoCommit users - $self->dbh->begin_work; + $self->dbh_do(sub { $_[1]->begin_work }); } elsif ($self->auto_savepoint) { $self->svp_begin; } @@ -1146,18 +1179,23 @@ sub _execute { sub insert { my ($self, $source, $to_insert) = @_; + $self->_determine_driver; + my $ident = $source->from; my $bind_attributes = $self->source_bind_attributes($source); my $updated_cols = {}; - $self->ensure_connected; foreach my $col ( $source->columns ) { if ( !defined $to_insert->{$col} ) { my $col_info = $source->column_info($col); if ( $col_info->{auto_nextval} ) { - $updated_cols->{$col} = $to_insert->{$col} = $self->_sequence_fetch( 'nextval', $col_info->{sequence} || $self->_dbh_get_autoinc_seq($self->dbh, $source) ); + $updated_cols->{$col} = $to_insert->{$col} = $self->_sequence_fetch( + 'nextval', + $col_info->{sequence} || + $self->_dbh_get_autoinc_seq($self->_get_dbh, $source) + ); } } } @@ -1178,6 +1216,8 @@ sub insert_bulk { @colvalues{@$cols} = (0..$#$cols); my ($sql, @bind) = $self->sql_maker->insert($table, \%colvalues); + $self->_determine_driver; + $self->_query_start( $sql, @bind ); my $sth = $self->sth($sql); @@ -1237,6 +1277,7 @@ sub insert_bulk { sub update { my $self = shift @_; my $source = shift @_; + $self->_determine_driver; my $bind_attributes = $self->source_bind_attributes($source); return $self->_execute('update' => [], $source, $bind_attributes, @_); @@ -1246,7 +1287,7 @@ sub update { sub delete { my $self = shift @_; my $source = shift @_; - + $self->_determine_driver; my $bind_attrs = $self->source_bind_attributes($source); return $self->_execute('delete' => [], $source, $bind_attrs, @_); @@ -1888,7 +1929,7 @@ Returns the database driver name. =cut -sub sqlt_type { shift->dbh->{Driver}->{Name} } +sub sqlt_type { shift->_get_dbh->{Driver}->{Name} } =head2 bind_attribute_by_data_type @@ -2135,7 +2176,7 @@ See L for a list of values for C<$sqlt_args>. sub deployment_statements { my ($self, $schema, $type, $version, $dir, $sqltargs) = @_; # Need to be connected to get the correct sqlt_type - $self->ensure_connected() unless $type; + $self->_get_dbh() unless $type; $type ||= $self->sqlt_type; $version ||= $schema->schema_version || '1.x'; $dir ||= './'; @@ -2180,7 +2221,7 @@ sub deploy { return if $line =~ /^\s+$/; # skip whitespace only $self->_query_start($line); eval { - $self->dbh->do($line); # shouldn't be using ->dbh ? + $self->_get_dbh->do($line); }; if ($@) { carp qq{$@ (running "${line}")}; @@ -2209,7 +2250,7 @@ Returns the datetime parser class sub datetime_parser { my $self = shift; return $self->{datetime_parser} ||= do { - $self->ensure_connected; + $self->_get_dbh; $self->build_datetime_parser(@_); }; } diff --git a/lib/DBIx/Class/Storage/DBI/ODBC.pm b/lib/DBIx/Class/Storage/DBI/ODBC.pm index 6f905af..d9b810a 100644 --- a/lib/DBIx/Class/Storage/DBI/ODBC.pm +++ b/lib/DBIx/Class/Storage/DBI/ODBC.pm @@ -8,7 +8,8 @@ use mro 'c3'; sub _rebless { my ($self) = @_; - my $dbtype = eval { $self->dbh->get_info(17) }; + my $dbtype = eval { $self->_get_dbh->get_info(17) }; + unless ( $@ ) { # Translate the backend name into a perl identifier $dbtype =~ s/\W/_/gi; diff --git a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm index 2fde285..6cc5fc4 100644 --- a/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm +++ b/lib/DBIx/Class/Storage/DBI/ODBC/Microsoft_SQL_Server.pm @@ -4,9 +4,98 @@ use warnings; use base qw/DBIx::Class::Storage::DBI::MSSQL/; use mro 'c3'; - +use Carp::Clan qw/^DBIx::Class/; use List::Util(); +__PACKAGE__->mk_group_accessors(simple => qw/ + _scope_identity _using_dynamic_cursors +/); + +=head1 NAME + +DBIx::Class::Storage::DBI::ODBC::Microsoft_SQL_Server - Support specific +to Microsoft SQL Server over ODBC + +=head1 DESCRIPTION + +This class implements support specific to Microsoft SQL Server over ODBC, +including auto-increment primary keys and SQL::Abstract::Limit dialect. It +is loaded automatically by by DBIx::Class::Storage::DBI::ODBC when it +detects a MSSQL back-end. + +=head1 IMPLEMENTATION NOTES + +Microsoft SQL Server supports three methods of retrieving the C +value for inserted row: C, C<@@IDENTITY>, and C. +C is used here because it is the safest. However, it must +be called is the same execute statement, not just the same connection. + +So, this implementation appends a C is used instead. + +=head1 MULTIPLE ACTIVE STATEMENTS + +The following options are alternative ways to enable concurrent executing +statement support. Each has its own advantages and drawbacks. + +=head2 connect_call_use_dynamic_cursors + +Use as: + + on_connect_call => 'use_dynamic_cursors' + +in your L as one way to enable multiple +concurrent statements. + +Will add C<< odbc_cursortype => 2 >> to your DBI connection attributes. See +L for more information. + +This will not work with CODE ref connect_info's and will do nothing if you set +C yourself. + +B this will break C, and C