from_clause_translate 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ac9ca27dca45dbc09d3d608dac3a1340049c9546aa7220b9c5b9534e07cf81
-  data.tar.gz: 5950ea8aa2866a6ce0797e4e18f3f6238fb5eec5ffe5dae3070180252054ac1e
+  metadata.gz: 89031b3fa713ad97c38aab959420f0c67544ceae17455030e176025c1f13d87e
+  data.tar.gz: c647f38f0dbd253869f34b0aa15469b93ac4b6e833c20cc46a6d1f37dd4d4508
 SHA512:
-  metadata.gz: 54cf51b5ab64cbcfd29f3f3332f6602807507241bf66cc4a4929ec5c58e2dac87429a0c2ae7bb2e93ccb5b6579965a6f29347a8b14715e2d766b0e8dac547dae
-  data.tar.gz: 6cc386cb20b3d1275b97d68aec59d4da6c21568eb09cd69cc27126b588e5b9e06542347335f24447cfb491953c819c255201784214dbf01310b38052b62e4629
+  metadata.gz: 5c47f449400389d4057665063c21befc1a9520d0a329c4efafd975ca939848fc5aaaa0ad3f0b6e1586f3e5d309288bfad721052b76c6f71d8ad6dd3b565d90b8
+  data.tar.gz: d38569db183c16dc2b6847096b365304f61a37c28a1de3c74d7034e4bcff600e3318bc13a1cf88bed39b8fda70a7ac6b8e769d3660f9f933b3cb26c62b5ee0ad

data/lib/from_clause_translate/active_record_relation.rb

@@ -35,9 +35,8 @@ module ActiveRecord::Relation::Extended
     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}")
+    replace_plurals_in_projections
+    @arel.from("(#{rel.arel.to_sql}) #{@klass.table_name}")
   end
 
   def translated_columns_build
@@ -51,9 +50,19 @@ module ActiveRecord::Relation::Extended
 
     rel = spawn
     rel.instance_variable_set(:@without_projections, true)
-    rel.add_translated_column column_name
+    rel.add_translated_column column_name if column_name
     rel.perform_calculation operation, column_name
   end
+
+  def replace_plurals_in_projections
+    @arel.projections.each do |column|
+      next unless column.is_a? String
+
+      name = column[0] == '"' ? column[1...-1] : column
+      plural = @klass::TRANSLATED_PLURALS[name.to_sym]
+      column.replace plural if plural
+    end
+  end
 end
 
 class ActiveRecord::Relation

data/lib/from_clause_translate/class_methods.rb

@@ -23,7 +23,7 @@ module ClassMethods
       self::TRANSLATED[plural] = true
       column = plural.to_s.singularize.to_sym
       selection = I18n.available_locales.map do |locale|
-        "#{column}_#{locale}"
+        "#{quoted_table_name}.\"#{column}_#{locale}\""
       end.join ','
       self::TRANSLATED_PLURALS[plural] = selection
       I18n.available_locales.each do |locale|

data/lib/from_clause_translate/translated_columns_builder.rb

@@ -50,17 +50,12 @@ class FromClauseTranslate::TranslatedColumnsBuilder
 
   def arel_projection_translation column
     column = column.name if column.is_a? Arel::Attributes::Attribute
-    column = column.to_s
+    column = column.to_s unless column.is_a? String
 
     name = column.first == '"' ? column[1...-1] : column
     return if @skip_translated.include? name
 
-    selection = translated_selection name
-    return column unless selection
-
-    plural = @klass::TRANSLATED_PLURALS[name.to_sym]
-    column.replace plural if plural
-    selection
+    translated_selection(name) || column
   end
 
   def add_translated_columns_from_cores
@@ -87,7 +82,7 @@ class FromClauseTranslate::TranslatedColumnsBuilder
 
         name = child.left.name
         selection = translated_selection name
-        @columns << selection if selection
+        @columns << (selection || name)
       end
     end
   end

data/lib/from_clause_translate/version.rb

@@ -1,3 +1,3 @@
 module FromClauseTranslate
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Roman Kushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails