join_dependency 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dda55b018b09a647fc40f1a7b59a24f1cc81c00a3c2349085848644a27001ab
-  data.tar.gz: 6ca894d3ee02c398d48089de53880843086e2de4fd44eb9b6de73a6fb666d4d9
+  metadata.gz: d8cffecfd290bbbcbdcc598997b537acd52ff9f2afd2d2c3ba1cc372465ab956
+  data.tar.gz: fa9d90a857113b7e93ea2f3ce2e6eead3f777ee50b8541b74aa29f120e304780
 SHA512:
-  metadata.gz: 5f2051ce47d99d57693d7e2f216cc22c7914b652909b6d73841db5aed81d910d179e5e3951b88a269ddbcdf59b0d5f2ce07920a652e5ef461dcbdd586074dba8
-  data.tar.gz: af28d209b1c910f639e1d1bad30c9d540d15bfbc7c625669d4b8bdde02abfeca63add4b5a2a51c2345633042586a938019b8dce88c840fe0c50af1e4ab113a21
+  metadata.gz: e90bab34d75b8a8ca8b6d444b9d4bf1dea827bcbb5d2ef7ba4ad858a5f77d8520d4f06c576eec2702e540bd5806fb1d74fbb96f40e50ec5144cb89cdd1d30d74
+  data.tar.gz: 32413e65f2adb1a64d716a822ce849ee3f02c47e7272be2f1ca22315e403a725d994dd7f862d4c2806ab9a1d6f7c11c7377cd0cef19962b3e9de3bfe3ee53f3a

data/.travis.yml

@@ -11,5 +11,6 @@ env:
     - AR=5.0.6
     - AR=5.1.5
     - AR=5.2.0.rc1
+    - AR=5.2.1
     - AR=latest
 

data/lib/join_dependency/version.rb

@@ -1,3 +1,3 @@
 module JoinDependency
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/join_dependency.rb

@@ -37,21 +37,30 @@ module JoinDependency
       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|
@@ -62,8 +71,14 @@ module JoinDependency
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: join_dependency
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord