from_clause_translate 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c7bce1b62eeff62ae32f6f407fd4ca9e831b2d38203346002beeb73ebae5e9
-  data.tar.gz: a20bf26392c70a069531aecade583803f6f94fd67681ee4837b0eb82f84a46a1
+  metadata.gz: dec03bf1ffebcc53cdcd25cae40ae52f8671813821d8c0cd78424506f72e9452
+  data.tar.gz: 5062c3aa55d691f3070d0f15a8bea5c730b769e03c12db65cd011bf7ae70ba7e
 SHA512:
-  metadata.gz: bfab419b9f9d71f80225a0e5d38414a3f24feda859fa8b5084ea267730ba7c02e96dda20d44a2f09c58cc66fd3de5dfbcbe1571ecd80d0193341bacb4f7e7302
-  data.tar.gz: 940742d87690183cc6552201a61aaab55af72c46600ffc6b681fb988f9ff051911ce72e4725878395bf6c2d3f65a31b811ddc319b705ca8ed8e6358edfb68333
+  metadata.gz: 2daa5fecb8a07c5ac4c2ada8199b490a8e5e4519c3cc1b5d8e88b62df6126edb69c7d918d60cd705ecabea49dedd1829e80a1e4441d53cd26319dee409c12d59
+  data.tar.gz: 86f3d4e1f41f6ac155aa8c81b3e14f48b885051c78c18d44d868b22eb79d1c88327490110424509f0bfaf4b122fac859c891e4b1ce0bd3170cb370d526230afe

data/lib/from_clause_translate/active_record_relation.rb

@@ -19,20 +19,22 @@ module ActiveRecord::Relation::Extended
   end
 
   def arel aliases = nil
-    arel = super aliases
-    if @translated_extra_columns
-      add_translated_columns @translated_extra_columns
-      @translated_extra_columns = nil
-      apply_translates arel
-    end
-    arel
+    return super aliases unless @translated_extra_columns
+    add_translated_columns @translated_extra_columns
+    @translated_extra_columns = nil
+    joins = @values.delete :joins
+    apply_translates super(aliases), joins
   end
 
   def add_translated_columns columns
     (@values[:translated] ||= []).concat columns
   end
 
-  def apply_translates arel = nil
+  UNSCOPING_VALUES =
+    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.dup.delete(:joins)
+
+  def apply_translates arel = nil, joins = nil
+    joins ||= @values.delete :joins
     arel ||= self.arel
     return if @translates_applied || !@klass.const_defined?(:TRANSLATED)
 
@@ -40,7 +42,9 @@ module ActiveRecord::Relation::Extended
     columns = translated_columns_get
     return unless columns
 
-    from = unscoped.select(columns).arel.to_sql
+    rel = unscope(*UNSCOPING_VALUES).select(columns)
+    rel.instance_variable_get(:@values)[:joins] = joins if joins
+    from = rel.arel.to_sql
     as = @klass.table_name
     arel.from("(#{from}) #{as}")
   end

data/lib/from_clause_translate/version.rb

@@ -1,3 +1,3 @@
 module FromClauseTranslate
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Roman Kushin