arel_toolkit 0.3.0 → 0.4.0

data/lib/arel/sql_to_arel/pg_query_visitor/frame_options.rb

@@ -56,7 +56,7 @@ module Arel
             'FRAMEOPTION_START_VALUE_PRECEDING' => 0x00400,
             'FRAMEOPTION_END_VALUE_PRECEDING' => 0x00800,
             'FRAMEOPTION_START_VALUE_FOLLOWING' => 0x01000,
-            'FRAMEOPTION_END_VALUE_FOLLOWING' => 0x02000
+            'FRAMEOPTION_END_VALUE_FOLLOWING' => 0x02000,
           }.freeze
 
           def biggest_detractable_number(number, candidates)

data/lib/arel/sql_to_arel/result.rb

@@ -5,10 +5,6 @@ module Arel
         map(&:to_sql).join('; ')
       end
 
-      def to_formatted_sql
-        map(&:to_formatted_sql).join('; ')
-      end
-
       def map(&block)
         Result.new super
       end

data/lib/arel/transformer.rb

@@ -0,0 +1,7 @@
+require_relative './transformer/add_schema_to_table'
+require_relative './transformer/remove_active_record_info'
+
+module Arel
+  module Transformer
+  end
+end

data/lib/arel/transformer/add_schema_to_table.rb

@@ -0,0 +1,26 @@
+module Arel
+  module Transformer
+    class AddSchemaToTable
+      attr_reader :schema_name
+
+      def initialize(schema_name)
+        @schema_name = schema_name
+      end
+
+      # https://github.com/mvgijssel/arel_toolkit/issues/110
+      def call(arel, _context)
+        tree = Arel.enhance(arel)
+
+        tree.query(
+          class: Arel::Table,
+          schema_name: nil,
+          context: { range_variable: true },
+        ).each do |node|
+          node['schema_name'].replace(schema_name)
+        end
+
+        tree.object
+      end
+    end
+  end
+end

data/lib/arel/transformer/remove_active_record_info.rb

@@ -0,0 +1,42 @@
+module Arel
+  module Transformer
+    class RemoveActiveRecordInfo
+      class << self
+        def call(arel, _context)
+          tree = Arel.enhance(arel)
+
+          tree.query(class: Arel::Table).each do |node|
+            node['type_caster'].remove
+          end
+
+          tree.query(class: Arel::Nodes::BindParam).each do |node|
+            node.replace(
+              cast_for_database(node.object.value.value_for_database),
+            )
+          end
+
+          tree.object
+        end
+
+        private
+
+        def cast_for_database(value)
+          case value
+          when String
+            Arel::Nodes.build_quoted(value)
+          when Integer
+            value
+          when TrueClass
+            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
+        end
+      end
+    end
+  end
+end

data/lib/arel_toolkit.rb

@@ -1,9 +1,16 @@
+# Make sure the gems are loaded before ArelToolkit
+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_toolkit/version'
 require 'arel'
 require 'arel/extensions'
 require 'arel/sql_to_arel'
 require 'arel/middleware'
-require 'arel/sql_formatter'
+require 'arel/enhance'
+require 'arel/transformer'
 
 module ArelToolkit
 end

data/lib/arel_toolkit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - maarten
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: approvals
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.24
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.24
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +210,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: 0.71.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +362,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -331,8 +374,21 @@ files:
 - arel_toolkit.gemspec
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/arel_gems.gemfile
+- gemfiles/arel_gems.gemfile.lock
+- gemfiles/default.gemfile
+- gemfiles/default.gemfile.lock
+- lib/arel/enhance.rb
+- lib/arel/enhance/context_enhancer/arel_table.rb
+- lib/arel/enhance/node.rb
+- lib/arel/enhance/path.rb
+- lib/arel/enhance/path_node.rb
+- lib/arel/enhance/query.rb
+- lib/arel/enhance/visitor.rb
 - lib/arel/extensions.rb
 - lib/arel/extensions/absolute.rb
+- lib/arel/extensions/active_record_type_caster_map.rb
 - lib/arel/extensions/all.rb
 - lib/arel/extensions/any.rb
 - lib/arel/extensions/array.rb
@@ -340,8 +396,10 @@ files:
 - lib/arel/extensions/assignment.rb
 - lib/arel/extensions/at_time_zone.rb
 - lib/arel/extensions/between_symmetric.rb
+- lib/arel/extensions/binary.rb
 - lib/arel/extensions/bit_string.rb
 - lib/arel/extensions/bitwise_xor.rb
+- lib/arel/extensions/case.rb
 - lib/arel/extensions/coalesce.rb
 - lib/arel/extensions/conflict.rb
 - lib/arel/extensions/contained_by.rb
@@ -354,27 +412,33 @@ files:
 - lib/arel/extensions/current_date.rb
 - lib/arel/extensions/current_of_expression.rb
 - lib/arel/extensions/current_role.rb
+- lib/arel/extensions/current_row.rb
 - lib/arel/extensions/current_schema.rb
 - lib/arel/extensions/current_time.rb
 - lib/arel/extensions/current_timestamp.rb
 - lib/arel/extensions/current_user.rb
+- lib/arel/extensions/dealocate.rb
 - lib/arel/extensions/default_values.rb
 - lib/arel/extensions/delete_manager.rb
 - lib/arel/extensions/delete_statement.rb
 - lib/arel/extensions/distinct_from.rb
+- lib/arel/extensions/dot.rb
 - lib/arel/extensions/equality.rb
 - lib/arel/extensions/except_all.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
+- lib/arel/extensions/infix_operation.rb
 - lib/arel/extensions/insert_manager.rb
 - lib/arel/extensions/insert_statement.rb
 - lib/arel/extensions/intersect_all.rb
+- lib/arel/extensions/into.rb
 - lib/arel/extensions/json_get_field.rb
 - lib/arel/extensions/json_get_object.rb
 - lib/arel/extensions/json_path_get_field.rb
@@ -401,9 +465,11 @@ files:
 - lib/arel/extensions/overlaps.rb
 - lib/arel/extensions/overlay.rb
 - 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
 - lib/arel/extensions/select_statement.rb
 - lib/arel/extensions/session_user.rb
@@ -413,14 +479,19 @@ files:
 - lib/arel/extensions/substring.rb
 - lib/arel/extensions/table.rb
 - lib/arel/extensions/time_with_precision.rb
+- lib/arel/extensions/to_sql.rb
 - lib/arel/extensions/transaction.rb
+- lib/arel/extensions/tree_manager.rb
 - lib/arel/extensions/trim.rb
+- lib/arel/extensions/true.rb
 - lib/arel/extensions/type_cast.rb
-- lib/arel/extensions/unbound_column_reference.rb
+- lib/arel/extensions/unary.rb
+- lib/arel/extensions/unary_operation.rb
 - lib/arel/extensions/unknown.rb
 - lib/arel/extensions/update_manager.rb
 - lib/arel/extensions/update_statement.rb
 - lib/arel/extensions/user.rb
+- lib/arel/extensions/values_list.rb
 - lib/arel/extensions/variable_set.rb
 - lib/arel/extensions/variable_show.rb
 - lib/arel/extensions/with_ordinality.rb
@@ -428,12 +499,14 @@ files:
 - lib/arel/middleware/chain.rb
 - lib/arel/middleware/postgresql_adapter.rb
 - lib/arel/middleware/railtie.rb
-- lib/arel/sql_formatter.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/remove_active_record_info.rb
 - lib/arel_toolkit.rb
 - lib/arel_toolkit/version.rb
 homepage: https://github.com/mvgijssel/arel_toolkit

data/lib/arel/extensions/unbound_column_reference.rb

@@ -1,5 +0,0 @@
-module Arel
-  module Nodes
-    class UnboundColumnReference < ::Arel::Nodes::SqlLiteral; end
-  end
-end

data/lib/arel/sql_formatter.rb

@@ -1,59 +0,0 @@
-module Arel
-  module Nodes
-    class Node
-      def to_formatted_sql(engine = Table.engine)
-        collector = Arel::Collectors::SQLString.new
-        Arel::SqlFormatter.new(engine.connection).accept self, collector
-        collector.value
-      end
-    end
-  end
-
-  class TreeManager
-    def to_formatted_sql(engine = Table.engine)
-      collector = Arel::Collectors::SQLString.new
-      Arel::SqlFormatter.new(engine.connection).accept @ast, collector
-      collector.value
-    end
-  end
-
-  class SqlFormatter < Arel::Visitors::PostgreSQL
-    def accept(object, collector)
-      super object, collector
-      collector << "\n"
-    end
-
-    private
-
-    # rubocop:disable Naming/MethodName
-    # rubocop:disable Naming/UncommunicativeMethodParamName
-    # rubocop:disable Metrics/AbcSize
-    def visit_Arel_Nodes_SelectCore(o, collector)
-      collector << "SELECT\n"
-
-      collector = maybe_visit o.top, collector
-
-      collector = maybe_visit o.set_quantifier, collector
-
-      collect_nodes_for(o.projections, collector, SPACE, ",\n")
-
-      if o.source && !o.source.empty?
-        collector << ' FROM '
-        collector = visit o.source, collector
-      end
-
-      collect_nodes_for o.wheres, collector, WHERE, AND
-      collect_nodes_for o.groups, collector, GROUP_BY
-      unless o.havings.empty?
-        collector << ' HAVING '
-        inject_join o.havings, collector, AND
-      end
-      collect_nodes_for o.windows, collector, WINDOW
-
-      collector
-    end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Naming/MethodName
-    # rubocop:enable Naming/UncommunicativeMethodParamName
-  end
-end