From: Matt S Trout <mst@shadowcat.co.uk>
Date: Wed, 9 Oct 2013 15:15:44 +0000 (+0000)
Subject: clear renderer objects before dicking around with them as well as after
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3e8c3d507908770b4682dcfb4cd2645a5d436e88;p=dbsrgits%2FDBIx-Class.git

clear renderer objects before dicking around with them as well as after
---

diff --git a/lib/DBIx/Class/Storage/DBIHacks.pm b/lib/DBIx/Class/Storage/DBIHacks.pm
index f72c866..0edba97 100644
--- a/lib/DBIx/Class/Storage/DBIHacks.pm
+++ b/lib/DBIx/Class/Storage/DBIHacks.pm
@@ -473,6 +473,10 @@ sub _resolve_aliastypes_from_select_args {
     $sql_maker->{name_sep} = '';
   }
 
+  # local is not enough - need to ensure the inner objects get rebuilt
+  $sql_maker->clear_renderer;
+  $sql_maker->clear_converter;
+
   my ($lquote, $rquote, $sep) = map { quotemeta $_ } ($sql_maker->_quote_chars, $sql_maker->name_sep);
 
   # generate sql chunks
@@ -508,7 +512,6 @@ sub _resolve_aliastypes_from_select_args {
   };
 
   # local is not enough - need to ensure the inner objects get rebuilt
-  # with the original quoting setup (or lack thereof)
   $sql_maker->clear_renderer;
   $sql_maker->clear_converter;