torque-postgresql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8300758ebf9ca8fe37a55561168b82ac794d2668
-  data.tar.gz: c84621b0e59fe409bf130bce2a08863355f6bbdc
+  metadata.gz: 014c4d68ffa9d1de4f02d8f047353181a77c9b1f
+  data.tar.gz: acf4391b79a96c8a62aa69e0f6040f76ae43f8fa
 SHA512:
-  metadata.gz: 083ad94ce20f01f59b2b7380e1bc615eb715f36c9f638a635dd43708ad5ca07d55247eece6676470f00079e4f0410ec2847884e9bf3915a3f11390c8c2588f8c
-  data.tar.gz: 0da07cbc82ce422e8ef8d703ac9fb0818e160bb4cdabac782fb9a77f9d0cace067bb58f6e9d8881cdad73ed7e6649cfadedd5a90cae8f5ba955ffefb540228ad
+  metadata.gz: b98efaf4fb140e2d14bcae43cdbcbbbd2439bf70e770e4001a2ba547000bc6e3f15bca4b7ceab4daa845e581c983026f318ac6befa0517ff39c6f90a9e12bcfb
+  data.tar.gz: 0a5fa71f9f8809fb405eae0ea15fc5943f7eb0b627301002157b6b5dac886e1443d5f4e793f69799411d4271db9c6f0d52f6df5baf71aa049b6d33526d9d2a6a

data/lib/torque/postgresql.rb

@@ -18,3 +18,8 @@ require 'torque/postgresql/base'
 require 'torque/postgresql/migration'
 require 'torque/postgresql/relation'
 require 'torque/postgresql/schema_dumper'
+
+gdep = Gem::Dependency.new('arel', '~> 9.0.0')
+unless gdep.matching_specs.sort_by(&:version).last
+  require 'torque/postgresql/arel/visitors'
+end

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

@@ -0,0 +1,14 @@
+module Torque
+  module PostgreSQL
+    module Arel
+      module Visitors
+        def visit_Arel_SelectManager o, collector
+          collector << '('
+          visit(o.ast, collector) << ')'
+        end
+      end
+
+      ::Arel::Visitors::ToSql.prepend Visitors
+    end
+  end
+end

data/lib/torque/postgresql/auxiliary_statement.rb

@@ -60,7 +60,7 @@ module Torque
 
         # Get the arel version of the statement table
         def table
-          @table ||= Arel::Table.new(table_name)
+          @table ||= ::Arel::Table.new(table_name)
         end
 
         # Get the name of the table of the configurated statement
@@ -80,9 +80,11 @@ module Torque
 
         # Project a column on a given table, or use the column table
         def project(column, arel_table = nil)
-          if column.to_s.include?('.')
+          if column.respond_to?(:as)
+            return column
+          elsif column.to_s.include?('.')
             table_name, column = column.to_s.split('.')
-            arel_table = Arel::Table.new(table_name)
+            arel_table = ::Arel::Table.new(table_name)
           end
 
           arel_table ||= table
@@ -102,45 +104,8 @@ module Torque
 
           # Setup the class
           def setup!
-            # attributes key:
-            # Provides a map of attributes to be exposed to the main query.
-            #
-            # For instace, if the statement query has an 'id' column that you
-            # want it to be accessed on the main query as 'item_id',
-            # you can use:
-            #   attributes id: :item_id
-            #
-            # If its statement has more tables, and you want to expose those
-            # fields, then:
-            #   attributes 'table.name': :item_name
-            #
-            # join_type key:
-            # Changes the type of the join and set the constraints
-            #
-            # The left side of the hash is the source table column, the right
-            # side is the statement table column, now it's only accepting '='
-            # constraints
-            #   join id: :user_id
-            #   join id: :'user.id'
-            #   join 'post.id': :'user.last_post_id'
-            #
-            # It's possible to change the default type of join
-            #   join :left, id: :user_id
-            #
-            # join key:
-            # Changes the type of the join
-            #
-            # query key:
-            # Save the query command to be performand
-            #
-            # requires key:
-            # Indicates dependencies with another statements
-            #
-            # polymorphic key:
-            # Indicates a polymorphic relationship, with will affect the way the
-            # auto join works, by giving a polymorphic connection
             settings = Settings.new(self)
-            @config.call(settings)
+            settings.instance_exec(settings, &@config)
 
             @join_type = settings.join_type || :inner
             @requires = Array[settings.requires].flatten.compact
@@ -232,24 +197,28 @@ module Torque
 
       # Build the statement on the given arel and return the WITH statement
       def build_arel(arel, base)
-        list = []
-
-        # Process dependencies
-        if requires.present?
-          requires.each do |dependent|
-            next if base.auxiliary_statements.key?(dependent)
-
-            instance = AuxiliaryStatement.instantiate(dependent, base)
-            base.auxiliary_statements[dependent] = instance
-            list << instance.build_arel(arel, base)
-          end
-        end
-
         # Build the join for this statement
         arel.join(table, arel_join).on(*join_columns)
 
         # Return the subquery for this statement
-        list << Arel::Nodes::As.new(table, mount_query)
+        ::Arel::Nodes::As.new(table, mount_query)
+      end
+
+      # Get the bound attributes from statement qeury
+      def bound_attributes
+        return [] unless relation_query?(self.class.query)
+        self.class.query.send(:bound_attributes)
+      end
+
+      # Ensure that all the dependencies are loaded in the base relation
+      def ensure_dependencies!(base)
+        requires.each do |dependent|
+          next if base.auxiliary_statements.key?(dependent)
+
+          instance = AuxiliaryStatement.instantiate(dependent, base)
+          instance.ensure_dependencies!(base)
+          base.auxiliary_statements[dependent] = instance
+        end
       end
 
       private
@@ -257,10 +226,10 @@ module Torque
         # Get the class of the join on arel
         def arel_join
           case @join_type
-          when :inner then Arel::Nodes::InnerJoin
-          when :left then Arel::Nodes::OuterJoin
-          when :right then Arel::Nodes::RightOuterJoin
-          when :full then Arel::Nodes::FullOuterJoin
+          when :inner then ::Arel::Nodes::InnerJoin
+          when :left  then ::Arel::Nodes::OuterJoin
+          when :right then ::Arel::Nodes::RightOuterJoin
+          when :full  then ::Arel::Nodes::FullOuterJoin
           else
             raise ArgumentError, <<-MSG.strip
               The '#{@join_type}' is not implemented as a join type.
@@ -272,7 +241,7 @@ module Torque
         def mount_query
           klass = self.class
           query = klass.query
-          uses = @uses.map(&klass.parent.connection.method(:quote))
+          uses = @uses
 
           # Call a proc to get the query
           if query.respond_to?(:call)
@@ -282,9 +251,10 @@ module Torque
 
           # Prepare the query depending on its type
           if query.is_a?(String)
-            Arel::Nodes::SqlLiteral.new("(#{query})" % uses)
+            uses.map!(&klass.parent.connection.method(:quote))
+            ::Arel::Nodes::SqlLiteral.new("(#{query})" % uses)
           elsif relation_query?(query)
-            query.select(*select_columns).send(:build_arel)
+            query.select(*select_columns).arel
           else
             raise ArgumentError, <<-MSG.strip
               Only String and ActiveRecord::Base objects are accepted as query objects,

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

@@ -21,8 +21,20 @@ module Torque
           @query_table
         end
 
+        # Grant an easy access to arel table columns
+        def col(name)
+          query_table[name.to_s]
+        end
+
+        alias column col
+
+        # Grant an easy access to arel sql literal
+        def sql(string)
+          ::Arel::Nodes::SqlLiteral.new(string)
+        end
+
         # There are two ways of setting the query:
-        # - A simple relation based on a modle
+        # - A simple relation based on a Model
         # - A string or a proc that requires the table name as first argument
         def query(value = nil, command = nil)
           return @query if value.nil?
@@ -39,7 +51,7 @@ module Torque
           MSG
 
           @query = command
-          @query_table = Arel::Table.new(value)
+          @query_table = ::Arel::Table.new(value)
         end
 
       end

data/lib/torque/postgresql/base.rb

@@ -14,6 +14,44 @@ module Torque
         protected
 
           # Creates a new auxiliary statement (CTE) under the base class
+          # attributes key:
+          # Provides a map of attributes to be exposed to the main query.
+          #
+          # For instace, if the statement query has an 'id' column that you
+          # want it to be accessed on the main query as 'item_id',
+          # you can use:
+          #   attributes id: :item_id, 'MAX(id)' => :max_id,
+          #     col(:id).minimum => :min_id
+          #
+          # If its statement has more tables, and you want to expose those
+          # fields, then:
+          #   attributes 'table.name': :item_name
+          #
+          # join_type key:
+          # Changes the type of the join and set the constraints
+          #
+          # The left side of the hash is the source table column, the right
+          # side is the statement table column, now it's only accepting '='
+          # constraints
+          #   join id: :user_id
+          #   join id: :'user.id'
+          #   join 'post.id': :'user.last_post_id'
+          #
+          # It's possible to change the default type of join
+          #   join :left, id: :user_id
+          #
+          # join key:
+          # Changes the type of the join
+          #
+          # query key:
+          # Save the query command to be performand
+          #
+          # requires key:
+          # Indicates dependencies with another statements
+          #
+          # polymorphic key:
+          # Indicates a polymorphic relationship, with will affect the way the
+          # auto join works, by giving a polymorphic connection
           def auxiliary_statement(table, &block)
             klass = AuxiliaryStatement.lookup(table, self)
             auxiliary_statements_list[table.to_sym] = klass

data/lib/torque/postgresql/relation.rb

@@ -26,7 +26,7 @@ module Torque
         list.map do |item|
           case item
           when String
-            Arel::Nodes::SqlLiteral.new(klass.send(:sanitize_sql, item.to_s))
+            ::Arel::Nodes::SqlLiteral.new(klass.send(:sanitize_sql, item.to_s))
           when Symbol
             base ? base.arel_attribute(item) : klass.arel_attribute(item)
           when Array

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

@@ -15,12 +15,22 @@ module Torque
           options = args.extract_options!
           self.auxiliary_statements ||= {}
           args.each do |table|
-            self.auxiliary_statements[table] = instantiate(table, self, options)
+            instance = instantiate(table, self, options)
+            instance.ensure_dependencies!(self)
+            self.auxiliary_statements[table] = instance
           end
 
           self
         end
 
+        # Get all auxiliary statements bound attributes and the base bound
+        # attributes as well
+        def bound_attributes
+          return super unless self.auxiliary_statements.present?
+          bindings = self.auxiliary_statements.values.map(&:bound_attributes)
+          (bindings + super).flatten
+        end
+
         private
           delegate :instantiate, to: PostgreSQL::AuxiliaryStatement
 
@@ -37,7 +47,7 @@ module Torque
 
               arel.with(subqueries.flatten)
               if select_values.empty? && columns.any?
-                columns.unshift table[Arel.sql('*')]
+                columns.unshift table[::Arel.star]
                 arel.projections = columns
               end
             end

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Torque
   module PostgreSQL
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - lib/torque/postgresql/adapter/schema_definitions.rb
 - lib/torque/postgresql/adapter/schema_dumper.rb
 - lib/torque/postgresql/adapter/schema_statements.rb
+- lib/torque/postgresql/arel/visitors.rb
 - lib/torque/postgresql/attributes.rb
 - lib/torque/postgresql/attributes/builder.rb
 - lib/torque/postgresql/attributes/builder/enum.rb
@@ -230,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources