from_clause_translate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd3c42b4a4d39f887365fcd181438221a2a5d67f7582e6da06ee1349e8035e8
-  data.tar.gz: b54e431c490c120a93be7c4ac714d6f47c972cea35aac7ad38508f892f18d4dd
+  metadata.gz: 6047a9893a48d5c6dd9de7a79a54626a24ff68ee3dc45839de7af7c726408e55
+  data.tar.gz: f18f6a36db802341261bd87ea818c1e87cf2baa237ecc8c42f67ee5c95af3302
 SHA512:
-  metadata.gz: de67e993ee641c3c6e1eee55b211be68d2391097dac411aaa2240ace9068664ac7b80009754ee3f785eb0f1bf3075e3eb8cbc1f5aeb00a75fe3319d3cdc5eaa8
-  data.tar.gz: 97a3d308c290712116f608470e20d0f185ebfefcbc00e182d9eb22e7158d03bfc176c346feba1c18102ef937b336554a6b23aa776815ce5b63349450bcbd8214
+  metadata.gz: 73ceb06c2144d06142da1b537a2e7762174801488685e53ba900bfa27b78395cedf6c509ec6d151b82b96097d85e476a20ff66fd22021df55b9d0cd7942bd759
+  data.tar.gz: 7ca67fdbdb2362ce6375ebe762aaa490abdf9e5c1762ef524ba8d02d6c7260afac19dedb1c9cd200427203a9acd86e8e5bd0c2e1a3f24ef276a8c927d7b68d33

data/lib/from_clause_translate/active_record_relation.rb

@@ -24,7 +24,7 @@ module ActiveRecord::Relation::Extended
 
     @arel ||= build_arel nil
 
-    columns = translated_columns_get
+    columns = translated_columns_build
     return unless columns
 
     if @values[:joins]
@@ -40,14 +40,15 @@ module ActiveRecord::Relation::Extended
     @arel.from("(#{from}) #{as}")
   end
 
-  def translated_columns_get without_projections = false
+  def translated_columns_build
     FromClauseTranslate::TranslatedColumnsBuilder.new(
-      self, @without_projections
+      self, @klass, @without_projections
     ).perform
   end
 
   def perform_calculation 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

data/lib/from_clause_translate/translated_columns_builder.rb

@@ -1,7 +1,7 @@
 class FromClauseTranslate::TranslatedColumnsBuilder
-  def initialize relation, without_projections
+  def initialize relation, klass, without_projections
     @relation = relation
-    @klass = relation.instance_variable_get :@klass
+    @klass = klass
     @arel = relation.arel
     @without_projections = without_projections
     @columns = []
@@ -9,10 +9,11 @@ class FromClauseTranslate::TranslatedColumnsBuilder
   end
 
   def perform
+    @skip_translated = []
     add_translated_columns_from_values
     add_translated_columns_from_projections
     add_translated_columns_from_cores
-    add_translated_colunms_from_orders
+    add_translated_columns_from_orders
 
     @columns if @has_translated
   end
@@ -23,10 +24,11 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     translated = @relation.instance_variable_get(:@values)[:translated]
     return unless translated
 
+    @has_translated = true
     translated.each do |column|
       if column.is_a? Hash
-        @has_translated = true
         column.each do |key, value|
+          @skip_translated << key.to_s
           @columns << "#{value} AS #{key}"
         end
       elsif (selection = translated_selection(column))
@@ -51,6 +53,8 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     column = column.to_s
 
     name = column.first == '"' ? column[1...-1] : column
+    return if @skip_translated.include? name
+
     selection = translated_selection name
     return column unless selection
 
@@ -88,7 +92,7 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     end
   end
 
-  def add_translated_colunms_from_orders
+  def add_translated_columns_from_orders
     @arel.ast.orders.each do |name|
       name = name.respond_to?(:expr) ? name.expr.name : name.to_sym
       selection = translated_selection name

data/lib/from_clause_translate/version.rb

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

metadata

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