Handle table aliases in history joins

ifad · Dec 3, 2012 · 39ab32a · 39ab32a
1 parent 5c8fb71
commit 39ab32a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/chrono_model/time_machine.rb b/lib/chrono_model/time_machine.rb
@@ -346,10 +346,12 @@ module QueryMethods
       def build_arel
         super.tap do |arel|
 
-          # Extract joined tables and add temporal WITH if appropriate
-          arel.join_sources.map {|j| j.to_sql =~ /JOIN "(\w+)" ON/ && $1}.compact.each do |table|
+          # Extract joined tables and add emporal WITH if appropriate
+          arel.join_sources.map {|j|
+            j.to_sql =~ /JOIN "([\w-]+)"(?:\s+"([\w-]+)")? ON/ && [$1, $2]
+          }.compact.each do |table, alias_|
             next unless (model = TimeMachine.chrono_models[table])
-            with(table, model.history.at(@temporal))
+            with(alias_ || table, model.history.at(@temporal))
           end if @temporal
 
         end