[Bast-commits] r7485 - in DBIx-Class/0.08/trunk: lib/DBIx/Class t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-09-02 10:42:39 +0000 (Wed, 02 Sep 2009)
New Revision: 7485

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
   DBIx-Class/0.08/trunk/t/71mysql.t
Log:
No fancy methods for the default_jointype, as we don't have proper sqlahacks inheritance and they are... well hacks

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm	2009-09-02 10:25:35 UTC (rev 7484)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm	2009-09-02 10:42:39 UTC (rev 7485)
@@ -517,7 +517,7 @@
       $join_type =~ s/^\s+ | \s+$//xg;
     }
 
-    $join_type = $self->_default_jointype if not defined $join_type;
+    $join_type = $self->{_default_jointype} if not defined $join_type;
 
     my $join_clause = sprintf ('%s JOIN ',
       $join_type ?  ' ' . uc($join_type) : ''
@@ -534,8 +534,6 @@
   return join('', @sqlf);
 }
 
-sub _default_jointype {};
-
 sub _fold_sqlbind {
   my ($self, $sqlbind) = @_;
 

Modified: DBIx-Class/0.08/trunk/t/71mysql.t
===================================================================
--- DBIx-Class/0.08/trunk/t/71mysql.t	2009-09-02 10:25:35 UTC (rev 7484)
+++ DBIx-Class/0.08/trunk/t/71mysql.t	2009-09-02 10:42:39 UTC (rev 7485)
@@ -174,8 +174,7 @@
   }, 'join does not throw (mysql 3 test)';
 
   # induce a jointype override, make sure it works even if we don't have mysql3
-  no warnings qw/redefine/;
-  local *DBIx::Class::SQLAHacks::MySQL::_default_jointype = sub {'inner'};
+  local $schema->storage->sql_maker->{_default_jointype} = 'inner';
   is_same_sql_bind (
     $rs->as_query,
     '(