X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2Fmysql.pm;h=fcf9fbfce80ba6a5821112bf43867327470b378c;hb=e46df41a7023dc31ac5eba4bc81c050d7964d3be;hp=ecdc29a924b5eef15b6a6f3466458a5cac94bb8a;hpb=b8391c875ed35fd7c5c20aed6dcae724d9366a56;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Storage/DBI/mysql.pm b/lib/DBIx/Class/Storage/DBI/mysql.pm index ecdc29a..fcf9fbf 100644 --- a/lib/DBIx/Class/Storage/DBI/mysql.pm +++ b/lib/DBIx/Class/Storage/DBI/mysql.pm @@ -9,7 +9,9 @@ use base qw/ /; use mro 'c3'; -__PACKAGE__->sql_maker_class('DBIx::Class::SQLAHacks::MySQL'); +__PACKAGE__->sql_maker_class('DBIx::Class::SQLMaker::MySQL'); +__PACKAGE__->sql_limit_dialect ('LimitXY'); +__PACKAGE__->sql_quote_char ('`'); sub with_deferred_fk_checks { my ($self, $sub) = @_; @@ -32,6 +34,24 @@ sub _dbh_last_insert_id { $dbh->{mysql_insertid}; } +# here may seem like an odd place to override, but this is the first +# method called after we are connected *and* the driver is determined +# ($self is reblessed). See code flow in ::Storage::DBI::_populate_dbh +sub _run_connection_actions { + my $self = shift; + + # default mysql_auto_reconnect to off unless explicitly set + if ( + $self->_dbh->{mysql_auto_reconnect} + and + ! exists $self->_dbic_connect_attributes->{mysql_auto_reconnect} + ) { + $self->_dbh->{mysql_auto_reconnect} = 0; + } + + $self->next::method(@_); +} + # we need to figure out what mysql version we're running sub sql_maker { my $self = shift; @@ -40,7 +60,7 @@ sub sql_maker { my $maker = $self->next::method (@_); # mysql 3 does not understand a bare JOIN - my $mysql_ver = $self->_get_dbh->get_info(18); + my $mysql_ver = $self->_dbh_get_info(18); $maker->{_default_jointype} = 'INNER' if $mysql_ver =~ /^3/; } @@ -51,6 +71,23 @@ sub sqlt_type { return 'MySQL'; } +sub deployment_statements { + my $self = shift; + my ($schema, $type, $version, $dir, $sqltargs, @rest) = @_; + + $sqltargs ||= {}; + + if ( + ! exists $sqltargs->{producer_args}{mysql_version} + and + my $dver = $self->_server_info->{normalized_dbms_version} + ) { + $sqltargs->{producer_args}{mysql_version} = $dver; + } + + $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest); +} + sub _svp_begin { my ($self, $name) = @_;