From: Peter Rabbitson Date: Sat, 4 Jul 2009 09:45:24 +0000 (+0000) Subject: Backout mysql changes for further polishing X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8de9298cd21c79c16337af2ee1adf61f906b803e;p=dbsrgits%2FDBIx-Class-Historic.git Backout mysql changes for further polishing --- diff --git a/Changes b/Changes index fe80b31..62a95b2 100644 --- a/Changes +++ b/Changes @@ -10,8 +10,6 @@ Revision history for DBIx::Class POD of Storage::DBI) - Automatic datetime handling environment/session setup for Oracle via connect_call_datetime_setup() - - MySQL can now be turned into a sane database by adding - { on_connect_call => 'set_ansi_mode' } to the connect() call - count/all on related left-joined empty resultsets now correctly returns 0/() - Fixed regression when both page and offset are specified on diff --git a/lib/DBIx/Class/Storage/DBI/mysql.pm b/lib/DBIx/Class/Storage/DBI/mysql.pm index 2e4a69d..d6f0488 100644 --- a/lib/DBIx/Class/Storage/DBI/mysql.pm +++ b/lib/DBIx/Class/Storage/DBI/mysql.pm @@ -20,12 +20,6 @@ sub with_deferred_fk_checks { $self->_do_query('SET FOREIGN_KEY_CHECKS = 1'); } -sub connect_call_set_ansi_mode { - my $self = shift; - $self->_do_query(q|SET SQL_MODE = 'ANSI,TRADITIONAL'|); - $self->_do_query(q|SET SQL_AUTO_IS_NULL = 0|); -} - sub _dbh_last_insert_id { my ($self, $dbh, $source, $col) = @_; $dbh->{mysql_insertid}; @@ -85,9 +79,6 @@ C<$storage> object into this class. This class implements MySQL specific bits of L. -It also provides a one-stop macro that sets session variables such that -MySQL behaves more predictably as far as the SQL standard is concerned. - =head1 AUTHORS See L diff --git a/t/71mysql.t b/t/71mysql.t index 836c846..78ecb61 100644 --- a/t/71mysql.t +++ b/t/71mysql.t @@ -164,12 +164,12 @@ lives_ok { $cd->set_producers ([ $producer ]) } 'set_relationship doesnt die'; ## ## Only way is to do a SET SQL_AUTO_IS_NULL = 0; on connect ## But I'm not sure if we should do this or not (Ash, 2008/06/03) -# -# There is now a built-in function to do this, test that everything works -# with it (ribasushi, 2009/07/03) NULLINSEARCH: { - my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass, { on_connect_call => 'set_ansi_mode' }); + local $TODO = 'Fix pending in branches/mysql_ansi'; + my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass); + + $ansi_schema->resultset('Artist')->create ({ name => 'last created artist' }); ok my $artist1_rs = $ansi_schema->resultset('Artist')->search({artistid=>6666}) => 'Created an artist resultset of 6666';