arel_toolkit 0.4.0 → 0.4.1

data/lib/arel/sql_to_arel/result.rb

@@ -1,8 +1,25 @@
 module Arel
   module SqlToArel
     class Result < Array
-      def to_sql
-        map(&:to_sql).join('; ')
+      def to_sql(engine = Arel::Table.engine)
+        sql, _binds = to_sql_and_binds(engine)
+        sql
+      end
+
+      def to_sql_and_binds(engine = Arel::Table.engine)
+        sql_collection = []
+        binds_collection = []
+
+        each do |item|
+          sql, binds = item.to_sql_and_binds(engine)
+          sql_collection << sql
+          binds_collection.concat(binds)
+        end
+
+        [
+          sql_collection.join('; '),
+          binds_collection,
+        ]
       end
 
       def map(&block)

data/lib/arel/transformer.rb

@@ -1,4 +1,5 @@
-require_relative './transformer/add_schema_to_table'
+require_relative './transformer/prefix_schema_name'
+require_relative './transformer/replace_table_with_subquery'
 require_relative './transformer/remove_active_record_info'
 
 module Arel

data/lib/arel/transformer/prefix_schema_name.rb

@@ -0,0 +1,183 @@
+module Arel
+  module Transformer
+    class PrefixSchemaName
+      PG_CATALOG = 'pg_catalog'.freeze
+      DEFAULT_SCHEMA_PRIORITY = ['public', PG_CATALOG].freeze
+
+      attr_reader :object_mapping
+      attr_reader :schema_priority
+
+      def initialize(
+        schema_priority = DEFAULT_SCHEMA_PRIORITY,
+        override_object_mapping = {}
+      )
+        @schema_priority = schema_priority
+        @object_mapping = database_object_mapping.merge(override_object_mapping)
+      end
+
+      def call(arel, next_middleware)
+        tree = Arel.enhance(arel)
+        update_arel_tables(tree)
+        update_typecasts(tree)
+        update_functions(tree)
+
+        next_middleware.call tree
+      end
+
+      private
+
+      def update_arel_tables(tree)
+        tree.query(
+          class: Arel::Table,
+          schema_name: nil,
+          context: { range_variable: true },
+        ).each do |node|
+          schema_name = schema_name_from_object_name(node['name'].object.to_s)
+          node['schema_name'].replace(schema_name)
+        end
+      end
+
+      def update_typecasts(tree)
+        tree.query(
+          class: Arel::Nodes::TypeCast,
+          type_name: 'regclass',
+        ).each do |node|
+          update_typecast_node(node)
+        end
+      end
+
+      def update_typecast_node(node)
+        table_name = table_name_from_arel_node(node['arg'].object)
+        reference_parts = table_name.split('.')
+
+        case reference_parts.length
+        when 1
+          schema_name = schema_name_from_object_name(table_name)
+          reference_parts.unshift(schema_name)
+          node['arg']['expr'].replace(reference_parts.join('.'))
+        when 2
+          node # Do nothing
+        else
+          raise "Don't know how to handle `#{reference_parts.length}` parts in " \
+                "`#{reference_parts}` for sql `#{node.to_sql}`"
+        end
+      end
+
+      def update_functions(tree)
+        tree.query(
+          class: Arel::Enhance::QueryMethods.in_ancestors?(Arel::Nodes::Function),
+          schema_name: nil,
+        ).each do |node|
+          update_function_node(node)
+        end
+      end
+
+      def update_function_node(node)
+        object_name = if node.object.is_a?(Arel::Nodes::NamedFunction)
+                        node['name'].object.downcase
+                      else
+                        node.object.class.to_s.demodulize.underscore
+                      end
+
+        schema_name = schema_name_from_object_name(object_name)
+        node['schema_name'].replace(schema_name)
+      end
+
+      def table_name_from_arel_node(arel_node)
+        case arel_node
+        when Arel::Nodes::Quoted
+          arel_node.expr
+        else
+          raise "Unknown node `#{table_name}` for `#{node.inspect}`"
+        end
+      end
+
+      def schema_name_from_object_name(table_name)
+        table_name = unquote_string(table_name)
+        possible_schemas = object_mapping[table_name]
+
+        if possible_schemas.nil?
+          raise "Object `#{table_name}` does not exist in the object_mapping and cannot be prefixed"
+        end
+
+        schema_name = schema_priority.find do |possible_schema_name|
+          possible_schemas.include?(possible_schema_name)
+        end
+
+        if schema_name.nil?
+          raise "Could not find a schema name for table `#{table_name}`.\n" \
+                "Current schema priority is `#{schema_priority}`.\n" \
+                "Possible schemas are `#{possible_schemas}`."
+        end
+
+        # We don't need to prefix nodes with `pg_catalog`, because that's the default
+        # even if the search_path does not include `pg_catalog`.
+        return nil if schema_name == PG_CATALOG
+
+        schema_name
+      end
+
+      # https://www.rubydoc.info/github/rubyworks/facets/String:unquote
+      def unquote_string(string)
+        case string[0, 1]
+        when "'", '"', '`'
+          string[0] = ''
+        end
+
+        case string[-1, 1]
+        when "'", '"', '`'
+          string[-1] = ''
+        end
+
+        string
+      end
+
+      def database_object_mapping
+        mapping = {}
+        update_mapping mapping, database_tables
+        update_mapping mapping, database_views
+        update_mapping mapping, database_materialized_views
+        update_mapping mapping, database_functions
+
+        mapping
+      end
+
+      def update_mapping(mapping, objects)
+        objects.each do |object|
+          name = object.fetch('object_name').to_s.downcase
+          mapping[name] ||= []
+          mapping[name] << object.fetch('schema_name').to_s
+        end
+      end
+
+      def database_tables
+        connection.execute(
+          'SELECT tablename AS object_name, schemaname AS schema_name FROM pg_tables',
+        )
+      end
+
+      def database_views
+        connection.execute(
+          'SELECT viewname AS object_name, schemaname AS schema_name FROM pg_views',
+        )
+      end
+
+      def database_materialized_views
+        connection.execute(
+          'SELECT matviewname AS object_name, schemaname AS schema_name FROM pg_matviews',
+        )
+      end
+
+      def database_functions
+        connection.execute(
+          'SELECT pg_proc.proname AS object_name, pg_namespace.nspname AS schema_name ' \
+          'FROM pg_proc INNER JOIN pg_namespace ON pg_proc.pronamespace = pg_namespace.oid',
+        )
+      end
+
+      def connection
+        Arel::Table.engine.connection
+      end
+    end
+  end
+end

data/lib/arel/transformer/remove_active_record_info.rb

@@ -2,7 +2,7 @@ module Arel
   module Transformer
     class RemoveActiveRecordInfo
       class << self
-        def call(arel, _context)
+        def call(arel, next_middleware)
           tree = Arel.enhance(arel)
 
           tree.query(class: Arel::Table).each do |node|
@@ -15,7 +15,7 @@ module Arel
             )
           end
 
-          tree.object
+          next_middleware.call tree.object
         end
 
         private
@@ -30,8 +30,6 @@ module Arel
             Arel::Nodes::TypeCast.new(Arel::Nodes::Quoted.new('t'), 'bool')
           when FalseClass
             Arel::Nodes::TypeCast.new(Arel::Nodes::Quoted.new('f'), 'bool')
-          when Float
-            value
           else
             raise "Unknown value cast `#{value}` with class `#{value.class}`"
           end

data/lib/arel/transformer/replace_table_with_subquery.rb

@@ -0,0 +1,31 @@
+module Arel
+  module Transformer
+    class ReplaceTableWithSubquery
+      attr_reader :subquery_for_table
+
+      def initialize(subquery_for_table)
+        @subquery_for_table = subquery_for_table
+      end
+
+      def call(arel, next_middleware)
+        tree = Arel.enhance(arel)
+        update_arel_tables(tree)
+        next_middleware.call tree
+      end
+
+      private
+
+      def update_arel_tables(tree)
+        tree.query(
+          class: Arel::Table,
+          context: { range_variable: true },
+          schema_name: nil,
+        ).each do |node|
+          if (subquery = subquery_for_table.call(node.name.value))
+            node.replace subquery.as(node.name.value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arel_toolkit.rb

@@ -3,9 +3,14 @@ require 'postgres_ext' if Gem.loaded_specs.key?('postgres_ext')
 require 'active_record_upsert' if Gem.loaded_specs.key?('active_record_upsert')
 require 'pg_search' if Gem.loaded_specs.key?('pg_search')
 require 'rails/railtie' if Gem.loaded_specs.key?('railties')
+require 'arel'
+require 'active_record'
 
 require 'arel_toolkit/version'
-require 'arel'
+
+require 'pg'
+require 'arel_toolkit/pg_result_init'
+
 require 'arel/extensions'
 require 'arel/sql_to_arel'
 require 'arel/middleware'

data/lib/arel_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ArelToolkit
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - maarten
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: guard-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -349,19 +377,21 @@ dependencies:
 description: 'ArelToolkit contains parsing, querying, modifying, optimisations, extensions
   and more for Arel.
 
-'
+  '
 email:
 - maarten@vgijssel.nl
 executables: []
-extensions: []
+extensions:
+- ext/pg_result_init/extconf.rb
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/develop.yml"
+- ".github/workflows/master.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -374,6 +404,9 @@ files:
 - arel_toolkit.gemspec
 - bin/console
 - bin/setup
+- ext/pg_result_init/extconf.rb
+- ext/pg_result_init/pg_result_init.c
+- ext/pg_result_init/pg_result_init.h
 - gemfiles/.bundle/config
 - gemfiles/arel_gems.gemfile
 - gemfiles/arel_gems.gemfile.lock
@@ -385,9 +418,13 @@ files:
 - lib/arel/enhance/path.rb
 - lib/arel/enhance/path_node.rb
 - lib/arel/enhance/query.rb
+- lib/arel/enhance/query_methods.rb
 - lib/arel/enhance/visitor.rb
 - lib/arel/extensions.rb
 - lib/arel/extensions/absolute.rb
+- lib/arel/extensions/active_model_attribute_with_cast_value.rb
+- lib/arel/extensions/active_record_relation_query_attribute.rb
+- lib/arel/extensions/active_record_type_caster_connection.rb
 - lib/arel/extensions/active_record_type_caster_map.rb
 - lib/arel/extensions/all.rb
 - lib/arel/extensions/any.rb
@@ -395,8 +432,10 @@ files:
 - lib/arel/extensions/array_subselect.rb
 - lib/arel/extensions/assignment.rb
 - lib/arel/extensions/at_time_zone.rb
+- lib/arel/extensions/attributes_attribute.rb
 - lib/arel/extensions/between_symmetric.rb
 - lib/arel/extensions/binary.rb
+- lib/arel/extensions/bind_param.rb
 - lib/arel/extensions/bit_string.rb
 - lib/arel/extensions/bitwise_xor.rb
 - lib/arel/extensions/case.rb
@@ -425,12 +464,12 @@ files:
 - lib/arel/extensions/dot.rb
 - lib/arel/extensions/equality.rb
 - lib/arel/extensions/except_all.rb
+- lib/arel/extensions/exists.rb
 - lib/arel/extensions/exponentiation.rb
 - lib/arel/extensions/extract_from.rb
 - lib/arel/extensions/factorial.rb
 - lib/arel/extensions/false.rb
 - lib/arel/extensions/function.rb
-- lib/arel/extensions/generate_series.rb
 - lib/arel/extensions/greatest.rb
 - lib/arel/extensions/indirection.rb
 - lib/arel/extensions/infer.rb
@@ -454,6 +493,7 @@ files:
 - lib/arel/extensions/named_argument.rb
 - lib/arel/extensions/named_function.rb
 - lib/arel/extensions/natural_join.rb
+- lib/arel/extensions/node.rb
 - lib/arel/extensions/not_between.rb
 - lib/arel/extensions/not_between_symmetric.rb
 - lib/arel/extensions/not_distinct_from.rb
@@ -467,7 +507,6 @@ files:
 - lib/arel/extensions/position.rb
 - lib/arel/extensions/prepare.rb
 - lib/arel/extensions/range_function.rb
-- lib/arel/extensions/rank.rb
 - lib/arel/extensions/row.rb
 - lib/arel/extensions/select_core.rb
 - lib/arel/extensions/select_manager.rb
@@ -496,17 +535,23 @@ files:
 - lib/arel/extensions/variable_show.rb
 - lib/arel/extensions/with_ordinality.rb
 - lib/arel/middleware.rb
+- lib/arel/middleware/active_record_extension.rb
 - lib/arel/middleware/chain.rb
+- lib/arel/middleware/database_executor.rb
 - lib/arel/middleware/postgresql_adapter.rb
 - lib/arel/middleware/railtie.rb
+- lib/arel/middleware/result.rb
+- lib/arel/middleware/to_sql_executor.rb
+- lib/arel/middleware/to_sql_middleware.rb
 - lib/arel/sql_to_arel.rb
 - lib/arel/sql_to_arel/error.rb
 - lib/arel/sql_to_arel/pg_query_visitor.rb
 - lib/arel/sql_to_arel/pg_query_visitor/frame_options.rb
 - lib/arel/sql_to_arel/result.rb
 - lib/arel/transformer.rb
-- lib/arel/transformer/add_schema_to_table.rb
+- lib/arel/transformer/prefix_schema_name.rb
 - lib/arel/transformer/remove_active_record_info.rb
+- lib/arel/transformer/replace_table_with_subquery.rb
 - lib/arel_toolkit.rb
 - lib/arel_toolkit/version.rb
 homepage: https://github.com/mvgijssel/arel_toolkit