[Bast-commits] r7175 - in DBIx-Class/0.08/branches/mysql_ansi: . lib/DBIx/Class/Storage/DBI t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-08-03 09:51:15 +0000 (Mon, 03 Aug 2009)
New Revision: 7175

Modified:
   DBIx-Class/0.08/branches/mysql_ansi/Changes
   DBIx-Class/0.08/branches/mysql_ansi/lib/DBIx/Class/Storage/DBI/mysql.pm
   DBIx-Class/0.08/branches/mysql_ansi/t/71mysql.t
Log:
Wrap up set_strict_mode for mysql

Modified: DBIx-Class/0.08/branches/mysql_ansi/Changes
===================================================================
--- DBIx-Class/0.08/branches/mysql_ansi/Changes	2009-08-03 09:33:02 UTC (rev 7174)
+++ DBIx-Class/0.08/branches/mysql_ansi/Changes	2009-08-03 09:51:15 UTC (rev 7175)
@@ -6,11 +6,14 @@
           'force_pool' attribute.  Lots of documentation updates, including a
           new Introduction.pod file. Fixed the way we detect transaction to 
           make this more reliable and forward looking. Fixed some trouble with
-          the way Moose Types are used.  
+          the way Moose Types are used.
+        - Added new MySQL specific on_connect_call macro 'set_strict_mode'
+          (also known as make_mysql_not_suck_as_much)
         - Added call to Pod::Inherit in Makefile.PL -
           currently at author-time only, so we need to add the produced
           .pod files to the MANIFEST
 
+
 0.08108 2009-07-05 23:15:00 (UTC)
         - Fixed the has_many prefetch with limit/group deficiency -
           it is now possible to select "top 5 commenters" while

Modified: DBIx-Class/0.08/branches/mysql_ansi/lib/DBIx/Class/Storage/DBI/mysql.pm
===================================================================
--- DBIx-Class/0.08/branches/mysql_ansi/lib/DBIx/Class/Storage/DBI/mysql.pm	2009-08-03 09:33:02 UTC (rev 7174)
+++ DBIx-Class/0.08/branches/mysql_ansi/lib/DBIx/Class/Storage/DBI/mysql.pm	2009-08-03 09:51:15 UTC (rev 7175)
@@ -20,9 +20,11 @@
   $self->_do_query('SET FOREIGN_KEY_CHECKS = 1');
 }
 
-sub connect_call_set_ansi_mode {
+sub connect_call_set_strict_mode {
   my $self = shift;
-  $self->_do_query(q|SET SQL_MODE = 'ANSI,TRADITIONAL'|);
+
+  # the @@sql_mode puts back what was previously set on the session handle
+  $self->_do_query(q|SET SQL_MODE = CONCAT('ANSI,TRADITIONAL,ONLY_FULL_GROUP_BY,', @@sql_mode)|);
   $self->_do_query(q|SET SQL_AUTO_IS_NULL = 0|);
 }
 
@@ -79,14 +81,15 @@
 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, { set_ansi_mode => 1 } );
+  my $schema = MyDb::Schema->connect( $dsn, $user, $pass, { set_strict_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.
+It also provides a one-stop on-connect macro C<set_strict_mode> which sets
+session variables such that MySQL behaves more predictably as far as the
+SQL standard is concerned.
 
 =head1 AUTHORS
 

Modified: DBIx-Class/0.08/branches/mysql_ansi/t/71mysql.t
===================================================================
--- DBIx-Class/0.08/branches/mysql_ansi/t/71mysql.t	2009-08-03 09:33:02 UTC (rev 7174)
+++ DBIx-Class/0.08/branches/mysql_ansi/t/71mysql.t	2009-08-03 09:51:15 UTC (rev 7175)
@@ -169,7 +169,7 @@
 # with it (ribasushi, 2009/07/03)
 
 NULLINSEARCH: {
-    my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass, { on_connect_call => 'set_ansi_mode' });
+    my $ansi_schema = DBICTest::Schema->connect ($dsn, $user, $pass, { on_connect_call => 'set_strict_mode' });
 
     $ansi_schema->resultset('Artist')->create ({ name => 'last created artist' });