lib/join_dependency.rb in join_dependency-0.1.2 vs lib/join_dependency.rb in join_dependency-0.1.3

@@ -35,35 +35,50 @@
       association_joins         = buckets[:association_join]
       stashed_association_joins = buckets[:stashed_join]
       join_nodes                = buckets[:join_node].uniq
       string_joins              = buckets[:string_join].map(&:strip).uniq
 
+      joins = string_joins.map do |join|
+        table.create_string_join(Are.sql(join)) unless join.blank?
+      end.compact
+
       join_list =
-        if at_least?(5, 2)
-          join_nodes + relation.send(:convert_join_strings_to_ast, string_joins)
-        elsif at_least?(5)
-          join_nodes + relation.send(:convert_join_strings_to_ast, relation.table, string_joins)
+        if at_least?(5)
+          join_nodes + joins
         else
           relation.send(:custom_join_ast, relation.table.from(relation.table), string_joins)
         end
 
-      if at_least?(5, 2)
+      if exactly?(5, 2, 0)
         alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
         join_dependency = ::ActiveRecord::Associations::JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
         join_nodes.each do |join|
           join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
         end
+      elsif at_least?(5, 2, 1)
+        alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
+        join_dependency = ::ActiveRecord::Associations::JoinDependency.new(relation.klass, relation.table, association_joins)
+        join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+        join_nodes.each do |join|
+          join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
+        end
       else
         join_dependency = ::ActiveRecord::Associations::JoinDependency.new(relation.klass, association_joins, join_list)
         join_nodes.each do |join|
           join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
         end
       end
 
       join_dependency
     end
 
-    def at_least?(major, minor = 0)
-      ActiveRecord::VERSION::MAJOR >= major && ActiveRecord::VERSION::MINOR >= minor
+    def exactly?(major, minor = 0, tiny = 0)
+      ActiveRecord::VERSION::MAJOR == major && ActiveRecord::VERSION::MINOR == minor && ActiveRecord::VERSION::TINY == tiny
+    end
+
+    def at_least?(major, minor = 0, tiny = 0)
+      ActiveRecord::VERSION::MAJOR > major ||
+      (ActiveRecord::VERSION::MAJOR == major && ActiveRecord::VERSION::MINOR >= minor) ||
+      (ActiveRecord::VERSION::MAJOR == major && ActiveRecord::VERSION::MINOR == minor && ActiveRecord::VERSION::TINY == tiny)
     end
   end
 end