From: Peter Rabbitson <ribasushi@cpan.org>
Date: Wed, 2 Sep 2009 10:42:39 +0000 (+0000)
Subject: No fancy methods for the default_jointype, as we don't have proper sqlahacks inherita... 
X-Git-Tag: v0.08111~29
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=de5f71ef956cfad4e7339022a63480068b68d16c;p=dbsrgits%2FDBIx-Class.git

No fancy methods for the default_jointype, as we don't have proper sqlahacks inheritance and they are... well hacks
---

diff --git a/lib/DBIx/Class/SQLAHacks.pm b/lib/DBIx/Class/SQLAHacks.pm
index 3a0d1f6..93c1009 100644
--- a/lib/DBIx/Class/SQLAHacks.pm
+++ b/lib/DBIx/Class/SQLAHacks.pm
@@ -517,7 +517,7 @@ sub _recurse_from {
       $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 @@ sub _recurse_from {
   return join('', @sqlf);
 }
 
-sub _default_jointype {};
-
 sub _fold_sqlbind {
   my ($self, $sqlbind) = @_;
 
diff --git a/t/71mysql.t b/t/71mysql.t
index c58c142..c9e03af 100644
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -174,8 +174,7 @@ lives_ok { $cd->set_producers ([ $producer ]) } 'set_relationship doesnt die';
   }, '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,
     '(