Merge 'trunk' into 'mysql_ansi'

diff --git a/lib/DBIx/Class/Storage/DBI/mysql.pm b/lib/DBIx/Class/Storage/DBI/mysql.pm
index cd4b6a0..4ea00d2 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/mysql.pm
+++ b/lib/DBIx/Class/Storage/DBI/mysql.pm
@@ -20,6 +20,12 @@ 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};
@@ -73,12 +79,15 @@ DBIx::Class::Storage::DBI::mysql - Storage::DBI class implementing MySQL specifi
 Storage::DBI autodetects the underlying MySQL database, and re-blesses the
 C<$storage> object into this class.
 
-  my $schema = MyDb::Schema->connect( $dsn, $user, $pass );
+  my $schema = MyDb::Schema->connect( $dsn, $user, $pass, { set_ansi_mode => 1 } );
 
 =head1 DESCRIPTION
 
 This class implements MySQL specific bits of L<DBIx::Class::Storage::DBI>.
 
+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<DBIx::Class/CONTRIBUTORS>

diff --git a/t/71mysql.t b/t/71mysql.t
index 78ecb61..43a9849 100644 (file)
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -164,10 +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: {
-    local $TODO = 'Fix pending in branches/mysql_ansi';
-    my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass);
+    my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass, { on_connect_call => 'set_ansi_mode' });
 
     $ansi_schema->resultset('Artist')->create ({ name => 'last created artist' });