torque-postgresql 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82df626662b3d4e0cbc9a9eb9df27405088ae7df
-  data.tar.gz: af5edbbbbfada68697ef0747e955534a553291b1
+  metadata.gz: f01743d0b17376aff113086782016f688330d7fe
+  data.tar.gz: bf8ab5b19862bef0a158d5cf17575960f6385b7e
 SHA512:
-  metadata.gz: a7efb1f2e7ef4285356576f5d4459a8f2c370315ee7d8d182c0164ad830171ecd1fe257ff61f9f526fc665bf6f291b988079c962117903171d6b85015b60f910
-  data.tar.gz: 70dc80abe0b1de951c8337ac87e38f473affe061060eff9b73be7009ad3ed208bef18f12637abc15c5150d2b7589ded0a03a1fc6772cc2f230dfaeb72b62a75f
+  metadata.gz: 9aab3f50ac0d003ffe4876aef773afe975739eceb2e4552e0789d864b2c6e52669f25ef3bcf30f9c2aed48e9628d01137763fea0fa005d97d538f2974f464ad2
+  data.tar.gz: 60a4e728532be8c9ae45448192762ac4755a8157dc299495d5087a11d80a6f8a3315400eccd11b0f2c471a928406de642dd6af2cd75164b7169c9ae1763c7362

data/lib/torque/postgresql/arel.rb

@@ -1,4 +1,3 @@
 require_relative 'arel/join_source'
 require_relative 'arel/select_manager'
 require_relative 'arel/visitors'
-require_relative 'arel/using'

data/lib/torque/postgresql/arel/select_manager.rb

@@ -3,12 +3,6 @@ module Torque
     module Arel
       module SelectManager
 
-        def using column
-          column = ::Arel::Nodes::SqlLiteral.new(column.to_s)
-          @ctx.source.right.last.right = Using.new(column)
-          self
-        end
-
         def only
           @ctx.source.only = true
         end

data/lib/torque/postgresql/arel/visitors.rb

@@ -16,13 +16,6 @@ module Torque
           super
         end
 
-        # Add USING modifier to query
-        def visit_Torque_PostgreSQL_Arel_Using(o, collector)
-          collector << 'USING ( '
-          collector << o.expr
-          collector << ' )'
-        end
-
       end
 
       ::Arel::Visitors::PostgreSQL.include Visitors

data/lib/torque/postgresql/attributes/enum.rb

@@ -9,7 +9,9 @@ module Torque
         LAZY_VALUE = 0.chr
 
         class << self
-          delegate :each, :sample, to: :values
+          include Enumerable
+
+          delegate :each, :sample, to: :members
 
           # Find or create the class that will handle the value
           def lookup(name)
@@ -40,6 +42,11 @@ module Torque
             end
           end
 
+          # Different from values, it returns the list of items already casted
+          def members
+            values.dup.map(&method(:new))
+          end
+
           # Fetch a value from the list
           # see https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/fixtures.rb#L656
           # see https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/validations/uniqueness.rb#L101

data/lib/torque/postgresql/relation.rb

@@ -14,9 +14,22 @@ module Torque
       include Inheritance
 
       SINGLE_VALUE_METHODS = [:itself_only]
-      MULTI_VALUE_METHODS = [:distinct_on, :auxiliary_statements, :cast_records]
+      MULTI_VALUE_METHODS = [:distinct_on, :auxiliary_statements, :cast_records,
+        :dynamic_selection]
       VALUE_METHODS = SINGLE_VALUE_METHODS + MULTI_VALUE_METHODS
 
+      # :nodoc:
+      def dynamic_selection_values; get_value(:dynamic_selection); end
+      # :nodoc:
+      def dynamic_selection_values=(value); set_value(:dynamic_selection, value); end
+
+      # Resolve column name when calculating models, allowing the column name to
+      # be more complex while keeping the query selection quality
+      def calculate(operation, column_name)
+        column_name = resolve_column(column_name).first if column_name.is_a?(Hash)
+        super(operation, column_name)
+      end
+
       # Resolve column definition up to second value.
       # For example, based on Post model:
       #
@@ -65,6 +78,16 @@ module Torque
 
       private
 
+        def dynamic_selection
+          @dynamic_selection ||= []
+        end
+
+        def build_arel
+          arel = super
+          arel.project(*dynamic_selection) if select_values.blank? && dynamic_selection.any?
+          arel
+        end
+
         # Compatibility method with 5.0
         unless ActiveRecord::Relation.method_defined?(:get_value)
           def get_value(name)
@@ -108,7 +131,7 @@ module Torque
     ActiveRecord::Relation::MULTI_VALUE_METHODS   += Relation::MULTI_VALUE_METHODS
     ActiveRecord::Relation::VALUE_METHODS         += Relation::VALUE_METHODS
     ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES += [:cast_records, :itself_only,
-      :distinct_on, :auxiliary_statements]
+      :distinct_on, :auxiliary_statements, :dynamic_selection]
 
     if ActiveRecord::QueryMethods.const_defined?('DEFAULT_VALUES')
       Relation::SINGLE_VALUE_METHODS.each do |value|

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -59,7 +59,7 @@ module Torque
 
             columns.flatten!
             arel.with(subqueries.flatten)
-            arel.project(*columns) if columns.any?
+            dynamic_selection.concat(columns) if columns.any?
           end
 
           # Throw an error showing that an auxiliary statement of the given

data/lib/torque/postgresql/relation/inheritance.rb

@@ -73,19 +73,19 @@ module Torque
             end
 
             columns.push(build_auto_caster_marker(arel, self.cast_records_value))
-            arel.project(*columns) if columns.any?
+            dynamic_selection.concat(columns) if columns.any?
           end
 
           # Build as many left outer join as necessary for each dependent table
           def build_inheritances_joins(arel, types)
             columns = Hash.new{ |h, k| h[k] = [] }
-            primary_key = quoted_primary_key
+            base_on_key = model.arel_table[primary_key]
             base_attributes = model.attribute_names
 
             # Iterate over each casted dependent calculating the columns
             types.each.with_index do |model, idx|
               join_table = model.arel_table.alias("\"i_#{idx}\"")
-              arel.outer_join(join_table).using(primary_key)
+              arel.outer_join(join_table).on(base_on_key.eq(join_table[primary_key]))
               (model.attribute_names - base_attributes).each do |column|
                 columns[column] << join_table
               end

data/lib/torque/postgresql/relation/merger.rb

@@ -6,6 +6,7 @@ module Torque
         def merge # :nodoc:
           super
 
+          merge_dynamic_selection
           merge_distinct_on
           merge_auxiliary_statements
           merge_inheritance
@@ -15,6 +16,11 @@ module Torque
 
         private
 
+          # Merge dynamic selection columns
+          def merge_dynamic_selection
+            relation.dynamic_selection_values.concat(other.dynamic_selection_values)
+          end
+
           # Merge distinct on columns
           def merge_distinct_on
             return if other.distinct_on_values.blank?

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,7 +190,6 @@ files:
 - lib/torque/postgresql/arel.rb
 - lib/torque/postgresql/arel/join_source.rb
 - lib/torque/postgresql/arel/select_manager.rb
-- lib/torque/postgresql/arel/using.rb
 - lib/torque/postgresql/arel/visitors.rb
 - lib/torque/postgresql/attributes.rb
 - lib/torque/postgresql/attributes/builder.rb

data/lib/torque/postgresql/arel/using.rb

@@ -1,10 +0,0 @@
-module Torque
-  module PostgreSQL
-    module Arel
-      class Using < ::Arel::Nodes::Unary
-      end
-
-      ::Arel::Nodes::Using = Using
-    end
-  end
-end