postgres_with 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbff15d0145d5eee85ae2e75eeaf6783ecd1cf8db0899ef905144feeca5026de
-  data.tar.gz: 8afc9a9de9643ee41d720d8e79a2079d5fc1eb0e744e85a7b3225ce8411396c0
+  metadata.gz: 8409fb5b221c7a249a1adbf85b061eb5891f026564428ba10ffa081281611c90
+  data.tar.gz: 41d699850f0d02e70147007d605e8b791186313e393e161012121e2a98eb26fb
 SHA512:
-  metadata.gz: f0be688754367f5514aac6868f99c73403b38900945bc553cf9cc436168c3a44739d5c28393d67ccb83cd58fb9615cb3810a77caf54c9e6695691342c762b7fe
-  data.tar.gz: fb37ba76cadb929b1fe6b4eb0bdcfb101b43c5d505f3aaa22ccdf855c49722fc0f1889543d6919b0b866b4847488b5721dceddf3dead54be126b22af5b311ca6
+  metadata.gz: e82d755b9e450e56495a3cae357aa2614c6408849924db5cc80c208c417da4505fdf6b2a429470cafc6fb10165a46c7b12b7069c0d83e0f84826b326c4354e19
+  data.tar.gz: bb72286a14385f7f4c2da6bf1f631c6167d82ec36c35b7d15f9babcd1eee4364fe9a0b6a710adc844e7f8a5308715e7eca9dc3fcc5af2aff6c76522d4a432a72

data/lib/postgres_with/active_record/querying.rb

@@ -1,11 +1,3 @@
 module ActiveRecord::Querying
   delegate :with, to: :all
-
-  def from_cte(name, expression)
-    table = Arel::Table.new(name)
-
-    cte_proxy = CTEProxy.new(name, self)
-    relation = ActiveRecord::Relation.new cte_proxy, cte_proxy.arel_table
-    relation.with name => expression
-  end
 end

data/lib/postgres_with/active_record/relation/query_methods.rb

@@ -81,24 +81,15 @@ module ActiveRecord
       with_statements = with_values.flat_map do |with_value|
         case with_value
         when String
-          with_value
+          Arel::Nodes::SqlLiteral.new(with_value)
         when Hash
-          with_value.map do |name, expression|
-            case expression
-            when String
-              select = Arel::Nodes::SqlLiteral.new "(#{expression})"
-            when ActiveRecord::Relation, Arel::SelectManager
-              select = Arel::Nodes::SqlLiteral.new "(#{expression.to_sql})"
-            end
-            if name.to_s.start_with?('_materialized_')
-              name = name.gsub('_materialized_', '')
-              Arel::Nodes::AsMaterialized.new Arel::Nodes::SqlLiteral.new("\"#{name}\""), select
-            else
-              Arel::Nodes::As.new Arel::Nodes::SqlLiteral.new("\"#{name}\""), select
-            end
-          end
+          build_arel_from_hash(with_value)
         when Arel::Nodes::As
           with_value
+        when Array
+          build_arel_from_array(with_value)
+        else
+          raise ArgumentError, "Unsupported argument type: #{with_value} #{with_value.class}"
         end
       end
       unless with_statements.empty?
@@ -112,6 +103,35 @@ module ActiveRecord
       arel
     end
 
+    def build_arel_from_hash(with_value)
+      with_value.map do |name, expression|
+        select = case expression
+                 when String
+                   Arel::Nodes::SqlLiteral.new("(#{expression})")
+                 when ActiveRecord::Relation
+                   expression.arel
+                 when Arel::SelectManager
+                   expression
+                 end
+        if name.to_s.start_with?('_materialized_')
+          name = name.gsub('_materialized_', '')
+          table = Arel::Table.new(name)
+          Arel::Nodes::AsMaterialized.new(table, select)
+        else
+          table = Arel::Table.new(name)
+          Arel::Nodes::As.new(table, select)
+        end
+      end
+    end
+
+    def build_arel_from_array(array)
+      unless array.map(&:class).uniq == [Arel::Nodes::As]
+        raise ArgumentError, "Unsupported argument type: #{array} #{array.class}"
+      end
+
+      array
+    end
+
     alias_method :build_arel_without_extensions, :build_arel
     alias_method :build_arel, :build_arel_with_extensions
   end

data/lib/postgres_with/active_record.rb

@@ -1,4 +1,3 @@
 require 'active_record'
 require 'postgres_with/active_record/relation'
-require 'postgres_with/active_record/cte_proxy'
 require 'postgres_with/active_record/querying'

data/lib/postgres_with/arel/visitors/to_sql.rb

@@ -1,6 +1,6 @@
 module Arel
   module Visitors
-    class ToSql < Arel::Visitors::Reduce
+    class ToSql < Arel::Visitors::Visitor
       def visit_Arel_Nodes_AsMaterialized o, collector
         collector = visit o.left, collector
         collector << " AS MATERIALIZED "

data/lib/postgres_with/version.rb

@@ -1,3 +1,3 @@
 module PostgresWith
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/postgres_with.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = PostgresWith::VERSION
 
-  gem.add_dependency 'activerecord', '~> 5.0'
-  gem.add_dependency 'arel', '>= 4.0'
+  gem.add_dependency 'activerecord', '>= 6.0'
 
   gem.add_development_dependency 'pg', '>= 0.13'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: postgres_with
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Derrick Neier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +51,6 @@ files:
 - Rakefile
 - lib/postgres_with.rb
 - lib/postgres_with/active_record.rb
-- lib/postgres_with/active_record/cte_proxy.rb
 - lib/postgres_with/active_record/querying.rb
 - lib/postgres_with/active_record/relation.rb
 - lib/postgres_with/active_record/relation/merger.rb

data/lib/postgres_with/active_record/cte_proxy.rb

@@ -1,35 +0,0 @@
-class CTEProxy
-  include ActiveRecord::Querying
-  include ActiveRecord::Sanitization::ClassMethods
-  include ActiveRecord::Reflection::ClassMethods
-
-  attr_accessor :reflections, :current_scope
-  attr_reader :connection, :arel_table
-
-  def initialize(name, model)
-    @name = name
-    @arel_table = Arel::Table.new(name)
-    @model = model
-    @connection = model.connection
-    @_reflections = {}
-  end
-
-  def name
-    @name
-  end
-
-  def table_name
-    name
-  end
-
-  delegate :column_names, :columns_hash, :model_name, :primary_key, :attribute_alias?,
-    :aggregate_reflections, :instantiate, :type_for_attribute, :relation_delegate_class, to: :@model
-
-  private
-
-  def reflections
-    @_reflections
-  end
-
-  alias _reflections reflections
-end