from_clause_translate 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec03bf1ffebcc53cdcd25cae40ae52f8671813821d8c0cd78424506f72e9452
-  data.tar.gz: 5062c3aa55d691f3070d0f15a8bea5c730b769e03c12db65cd011bf7ae70ba7e
+  metadata.gz: 8dd3c42b4a4d39f887365fcd181438221a2a5d67f7582e6da06ee1349e8035e8
+  data.tar.gz: b54e431c490c120a93be7c4ac714d6f47c972cea35aac7ad38508f892f18d4dd
 SHA512:
-  metadata.gz: 2daa5fecb8a07c5ac4c2ada8199b490a8e5e4519c3cc1b5d8e88b62df6126edb69c7d918d60cd705ecabea49dedd1829e80a1e4441d53cd26319dee409c12d59
-  data.tar.gz: 86f3d4e1f41f6ac155aa8c81b3e14f48b885051c78c18d44d868b22eb79d1c88327490110424509f0bfaf4b122fac859c891e4b1ce0bd3170cb370d526230afe
+  metadata.gz: de67e993ee641c3c6e1eee55b211be68d2391097dac411aaa2240ace9068664ac7b80009754ee3f785eb0f1bf3075e3eb8cbc1f5aeb00a75fe3319d3cdc5eaa8
+  data.tar.gz: 97a3d308c290712116f608470e20d0f185ebfefcbc00e182d9eb22e7158d03bfc176c346feba1c18102ef937b336554a6b23aa776815ce5b63349450bcbd8214

data/lib/from_clause_translate/active_record_relation.rb

@@ -1,68 +1,57 @@
 require 'from_clause_translate/translated_columns_builder'
 
 module ActiveRecord::Relation::Extended
-  def to_sql
-    apply_translates unless eager_loading?
-    super
-  end
-
-  def exec_queries &block
-    apply_translates
-    super(&block)
-  end
-
-  def pluck *columns
-    if !@translated_extra_columns && @klass.const_defined?(:TRANSLATED)
-      @translated_extra_columns = columns
-    end
-    super(*columns)
-  end
-
   def arel aliases = nil
-    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
+    apply_translates
+    super aliases
   end
 
   def add_translated_columns columns
     (@values[:translated] ||= []).concat columns
   end
 
+  def add_translated_column column
+    (@values[:translated] ||= []) << column
+  end
+
   UNSCOPING_VALUES =
     ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.dup.delete(:joins)
 
-  def apply_translates arel = nil, joins = nil
-    joins ||= @values.delete :joins
-    arel ||= self.arel
+  def apply_translates
     return if @translates_applied || !@klass.const_defined?(:TRANSLATED)
 
     @translates_applied = true
+
+    @arel ||= build_arel nil
+
     columns = translated_columns_get
     return unless columns
 
+    if @values[:joins]
+      joins = @values.delete :joins
+      @arel = build_arel nil
+    end
+
     rel = unscope(*UNSCOPING_VALUES).select(columns)
+    rel.instance_variable_set(:@translates_applied, true)
     rel.instance_variable_get(:@values)[:joins] = joins if joins
     from = rel.arel.to_sql
     as = @klass.table_name
-    arel.from("(#{from}) #{as}")
+    @arel.from("(#{from}) #{as}")
   end
 
   def translated_columns_get without_projections = false
     FromClauseTranslate::TranslatedColumnsBuilder.new(
-      self, without_projections
+      self, @without_projections
     ).perform
   end
 
-  private
-
   def perform_calculation operation, column_name
-    if column_name && !@translated_extra_columns &&
-       @klass.const_defined?(:TRANSLATED)
-      @translated_extra_columns = [column_name]
-    end
-    super operation, column_name
+    return super operation, column_name if @without_projections
+    rel = spawn
+    rel.instance_variable_set(:@without_projections, true)
+    rel.add_translated_column column_name
+    rel.perform_calculation operation, column_name
   end
 end
 

data/lib/from_clause_translate/version.rb

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

metadata

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