associate_jsonb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb874f973a7bd4611949cd39c064ce2de1a06bf2a7cd68fc526ef7c41f0c3e4
-  data.tar.gz: d7c7f3b56c0c247c5f73610e537f6a39a435cade4e67ce93cf29f6a856301968
+  metadata.gz: 5cb22feba951a6241ccada849b6d17ae06a4a84c797a49ae139844917d50474c
+  data.tar.gz: 910b39ddc0f89d8525439d9d4e74244a62bbf3f4d07cb333306879312588dfda
 SHA512:
-  metadata.gz: f70971458fa4e3833058cf3904a070374ced50507a033b3bc619bdbb0f8a0623f9fd61da4ae967c11d71853874296ddf5801f152cf0ec9f18be614cc27d1c961
-  data.tar.gz: 2f737173b83cc355772c6d66f760b5bc56faead1fbdc63d4d0cb2d63d37a8a1c24eed79e8a69b5dd7e1f3088b2bd3374b8b30316688e06a72b38f76621b208aa
+  metadata.gz: 5382c87315fbbbc8bc52ebb5efb605e60373c7f24e9d681a008f5d5c53dc26649df89f7233ca1b3b6962fdd16a891c9072e55577a3c40e655faa54f3ec0dc375
+  data.tar.gz: 3570c685cde53a273f70f5d434d1daacbc32b260b0b0500a3e6ef801b18a50fdd007a1970ede0d692a5eee89a87eba46b73ced15019514cfafece65b01c588a8

data/lib/associate_jsonb.rb

@@ -27,7 +27,27 @@ ActiveSupport.on_load :active_record do
   ActiveRecord::Base.include AssociateJsonb::Associations
 
   Arel::Nodes.include AssociateJsonb::ArelNodes
-  Arel::Nodes::Binary.include AssociateJsonb::ArelNodeExtensions::Binary
+
+  Arel::Nodes::Binary.prepend(
+    AssociateJsonb::ArelExtensions::Nodes::Binary
+  )
+
+  Arel::Nodes::TableAlias.prepend(
+    AssociateJsonb::ArelExtensions::Nodes::TableAlias
+  )
+
+  Arel::Table.prepend(
+    AssociateJsonb::ArelExtensions::Table
+  )
+
+  Arel::Visitors::Visitor.singleton_class.prepend(
+    AssociateJsonb::ArelExtensions::Visitors::Visitor
+  )
+
+
+  ActiveRecord::Associations::AliasTracker.prepend(
+    AssociateJsonb::Associations::AliasTracker
+  )
 
   ActiveRecord::Associations::Builder::BelongsTo.extend(
     AssociateJsonb::Associations::Builder::BelongsTo

data/lib/associate_jsonb/arel_extensions/nodes/binary.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelExtensions
+    module Nodes
+      module Binary
+        def original_left
+          left
+        end
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_extensions/nodes/table_alias.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelExtensions
+    module Nodes
+      module TableAlias
+        attr_reader :store_tracker
+
+        def initialize(*args, store_columns: nil)
+          @store_columns = store_columns
+          super(*args)
+        end
+
+        def with_store_tracker(tracker)
+          @store_tracker = tracker
+          self
+        end
+
+        def [](name)
+          return super unless store_col = store_tracker&.get(name)
+
+          attr = ::Arel::Nodes::Jsonb::DashArrow.
+            new(self, self[store_col[:store]], store_col[:key])
+
+          if cast_as = (store_col[:cast] && store_col[:cast][:sql_type])
+            attr = ::Arel::Nodes::NamedFunction.new(
+              "CAST",
+              [ attr.as(cast_as) ]
+            )
+          end
+
+          Arel::Nodes::Jsonb::Attribute.new(self, name, attr)
+        end
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_extensions/table.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelExtensions
+    module Table
+      attr_reader :store_tracker
+
+      def initialize(*args, store_tracker: nil, **opts)
+        @store_tracker = store_tracker
+        super(*args, **opts)
+      end
+
+      def alias(...)
+        super(...).with_store_tracker(store_tracker)
+      end
+
+      def with_store_tracker(tracker)
+        @store_tracker = tracker
+        self
+      end
+
+      def [](name)
+        return super unless store_col = store_tracker&.get(name)
+
+        attr = ::Arel::Nodes::Jsonb::DashArrow.
+          new(self, self[store_col[:store]], store_col[:key])
+
+        if cast_as = (store_col[:cast] && store_col[:cast][:sql_type])
+          attr = ::Arel::Nodes::NamedFunction.new(
+            "CAST",
+            [ attr.as(cast_as) ]
+          )
+        end
+
+        Arel::Nodes::Jsonb::Attribute.new(self, name, attr)
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_extensions/visitors/visitor.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelExtensions
+    module Visitors
+      module Visitor
+        def dispatch_cache
+          @dispatch_cache ||= Hash.new do |hash, klass|
+            hash[klass] =
+              "visit_#{(klass.name || '').
+                sub("AssociateJsonb::ArelNodes::SqlCasted", "Arel::Nodes::").
+                gsub('::', '_')}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_nodes/jsonb/attribute.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelNodes
+    module Jsonb
+      class Attribute
+        attr_reader :relation, :name, :delegated
+
+        def initialize(relation, name, delegated)
+          @relation = relation,
+          @name = name
+          @delegated = delegated
+        end
+
+        def lower
+          relation.lower self
+        end
+
+        def type_cast_for_database(value)
+          relation.type_cast_for_database(name, value)
+        end
+
+        def able_to_type_cast?
+          relation.able_to_type_cast?
+        end
+
+        def respond_to_missing?(mthd, include_private = false)
+          delegated.respond_to?(mthd, include_private)
+        end
+
+        def method_missing(mthd, *args, **opts, &block)
+          delegated.public_send(mthd, *args, **opts, &block)
+        end
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_nodes/sql_casted_binary.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module ArelNodes
+    class SqlCastedBinary < ::Arel::Nodes::Binary
+      attr_reader :original_left
+      def initialize(left, cast_as, right)
+        @original_left = left
+        super(
+          ::Arel::Nodes::NamedFunction.new(
+            "CAST",
+            [ left.as(cast_as) ]
+          ),
+          right
+        )
+      end
+    end
+  end
+end

data/lib/associate_jsonb/arel_nodes/sql_casted_equality.rb

@@ -1,20 +1,34 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
+# module AssociateJsonb
+#   module ArelNodes
+#     class SqlCastedEquality < ::Arel::Nodes::Equality
+#       attr_reader :original_left
+#       def initialize(left, cast_as, right)
+#         @original_left = left
+#         super(
+#           ::Arel::Nodes::NamedFunction.new(
+#             "CAST",
+#             [ left.as(cast_as) ]
+#           ),
+#           right
+#         )
+#       end
+#     end
+#   end
+# end
+
+
+# encoding: utf-8
+# frozen_string_literal: true
+
 module AssociateJsonb
   module ArelNodes
-    class SqlCastedEquality < ::Arel::Nodes::Equality
-      attr_reader :original_left
-      def initialize(left, cast_as, right)
-        @original_left = left
-        super(
-          ::Arel::Nodes::NamedFunction.new(
-            "CAST",
-            [ left.as(cast_as) ]
-          ),
-          right
-        )
-      end
+    class SqlCastedEquality < AssociateJsonb::ArelNodes::SqlCastedBinary
+      def operator; :== end
+      alias :operand1 :left
+      alias :operand2 :right
     end
   end
 end

data/lib/associate_jsonb/associations/alias_tracker.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/string/conversions"
+
+module AssociateJsonb
+  module Associations
+    module AliasTracker # :nodoc:
+      def aliased_table_for(table_name, aliased_name, type_caster, store_tracker = nil)
+        super(table_name, aliased_name, type_caster).with_store_tracker(store_tracker)
+      end
+    end
+  end
+end

data/lib/associate_jsonb/associations/association_scope.rb

@@ -4,6 +4,22 @@
 module AssociateJsonb
   module Associations
     module AssociationScope #:nodoc:
+
+      def get_chain(reflection, association, tracker)
+        name = reflection.name
+        chain = [ActiveRecord::Reflection::RuntimeReflection.new(reflection, association)]
+        reflection.chain.drop(1).each do |refl|
+          aliased_table = tracker.aliased_table_for(
+            refl.table_name,
+            refl.alias_candidate(name),
+            refl.klass.type_caster,
+            refl.klass.store_column_attribute_tracker
+          )
+          chain << ActiveRecord::Associations::AssociationScope::ReflectionProxy.new(refl, aliased_table)
+        end
+        chain
+      end
+
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def last_chain_scope(scope, owner_reflection, owner)
         reflection = owner_reflection.instance_variable_get(:@reflection)
@@ -42,23 +58,6 @@ module AssociateJsonb
           node_klass = Arel::Nodes::Jsonb::DashDoubleArrow
         end
 
-        # scope.where!(
-        #   Arel::Nodes::HashableNamedFunction.new(
-        #     "CAST",
-        #     [
-        #       node_klass.
-        #         new(table, table[jsonb_column], store_key).
-        #         as(sql_type)
-        #     ]
-        #   ).eq(
-        #     Arel::Nodes::BindParam.new(
-        #       ActiveRecord::Relation::QueryAttribute.new(
-        #         store_key, value, type
-        #       )
-        #     )
-        #   )
-        # )
-
         scope.where!(
           Arel::Nodes::SqlCastedEquality.new(
             node_klass.new(table, table[jsonb_column], store_key),
@@ -70,30 +69,6 @@ module AssociateJsonb
             )
           )
         )
-
-        # scope.where!(
-        #   Arel::Nodes::Jsonb::DashDoubleArrow.
-        #     new(table, table[jsonb_column], store_key).
-        #     eq(
-        #       Arel::Nodes::BindParam.new(
-        #         ActiveRecord::Relation::QueryAttribute.new(
-        #           store_key, value, ActiveModel::Type::String.new
-        #         )
-        #       )
-        #     )
-        # )
-
-        # scope.where!(
-        #   node_klass.new(
-        #     table, table[jsonb_column], store_key
-        #   ).eq(
-        #     Arel::Nodes::BindParam.new(
-        #       ActiveRecord::Relation::QueryAttribute.new(
-        #         store_key, value, type
-        #       )
-        #     )
-        #   )
-        # )
       end
     end
   end

data/lib/associate_jsonb/associations/builder/belongs_to.rb

@@ -33,6 +33,7 @@ module AssociateJsonb
 
           opts = {}
           foreign_type = :integer
+          sql_type = "numeric"
           begin
             primary_key = reflection.active_record_primary_key.to_s
             primary_column = reflection.klass.columns.find {|col| col.name == primary_key }
@@ -40,6 +41,7 @@ module AssociateJsonb
             if primary_column
               foreign_type = primary_column.type
               sql_data = primary_column.sql_type_metadata.as_json
+              sql_type = sql_data["sql_type"]
               %i[ limit precision scale ].each do |k|
                 opts[k] = sql_data[k.to_s] if sql_data[k.to_s]
               end
@@ -50,7 +52,7 @@ module AssociateJsonb
           end
 
           mixin.instance_eval <<-CODE, __FILE__, __LINE__ + 1
-            store_column_attribute(:#{store}, :#{foreign_key}, :#{foreign_type}, key: "#{key}", **opts)
+            store_column_attribute(:#{store}, :#{foreign_key}, foreign_type, sql_type: sql_type, key: "#{key}", **opts)
           CODE
         end
       end

data/lib/associate_jsonb/associations/join_dependency.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/string/conversions"
+
+module AssociateJsonb
+  module Associations
+    module JoinDependency # :nodoc:
+      private
+        def table_aliases_for(parent, node)
+          node.reflection.chain.map { |reflection|
+            alias_tracker.aliased_table_for(
+              reflection.table_name,
+              table_alias_for(reflection, parent, reflection != node.reflection),
+              reflection.klass.type_caster,
+              reflection.klass.store_column_attribute_tracker
+            )
+          }
+        end
+    end
+  end
+end

data/lib/associate_jsonb/relation/where_clause.rb

@@ -15,6 +15,22 @@ module AssociateJsonb
           [name, value]
         }.to_h
       end
+
+      private
+        def equalities(predicates)
+          equalities = []
+
+          predicates.each do |node|
+            case node
+            when Arel::Nodes::Equality, Arel::Nodes::SqlCastedEquality
+              equalities << node
+            when Arel::Nodes::And
+              equalities.concat equalities(node.children)
+            end
+          end
+
+          equalities
+        end
     end
   end
 end

data/lib/associate_jsonb/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module AssociateJsonb
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/associate_jsonb/with_store_attribute.rb

@@ -12,14 +12,25 @@ module AssociateJsonb
         @names_list ||= {}
       end
 
-      def add_name(name, store, key)
-        @names_list ||= {}
-        @names_list[name.to_s.freeze] = { store: store, key: key }
+      def add_name(name, store, key, cast)
+        names_list[name.to_s.freeze] = { store: store, key: key, cast: cast }
       end
 
       def has_name?(name)
         names_list.key? name.to_s
       end
+
+      def get(name)
+        names_list[name.to_s]
+      end
+
+      def store_for(name)
+        (get(name) || {})[:store]
+      end
+
+      def key_for(name)
+        (get(name) || {})[:key]
+      end
     end
 
     included do
@@ -37,6 +48,10 @@ module AssociateJsonb
         super
       end
 
+      def arel_table
+        super.with_store_tracker(store_column_attribute_tracker)
+      end
+
       def initialize_store_column_attribute_tracker
         @store_column_attribute_tracker = const_set(:StoreColumnAttributeTracker, StoreColumnAttributeTracker.new)
         private_constant :StoreColumnAttributeTracker
@@ -56,9 +71,9 @@ module AssociateJsonb
         end
       end
 
-      def add_store_column_attribute_name(name, store, key)
+      def add_store_column_attribute_name(name, store, key, cast_opts)
         store_column_attribute_tracker.synchronize do
-          store_column_attribute_tracker.add_name(name, store, key)
+          store_column_attribute_tracker.add_name(name, store, key, cast_opts)
         end
       end
 
@@ -83,16 +98,16 @@ module AssociateJsonb
         store_column_attribute :data, *args, **opts
       end
 
-      def store_column_attribute(store, attr, *opts, key: nil, **attribute_opts)
+      def store_column_attribute(store, attr, cast_type = ActiveRecord::Type::Value.new, sql_type: nil, key: nil, **attribute_opts)
         store = store.to_sym
         attr = attr.to_sym
         key ||= attr
         key = key.to_s
         array = attribute_opts[:array]
-        attribute attr, *opts, **attribute_opts
+        attribute attr, cast_type, **attribute_opts
 
         instance_eval <<-CODE, __FILE__, __LINE__ + 1
-          add_store_column_attribute_name("#{attr}", :#{store}, "#{key}")
+          add_store_column_attribute_name("#{attr}", :#{store}, "#{key}", { sql_type: sql_type, type: cast_type, opts: attribute_opts })
         CODE
 
         include WithStoreAttribute::InstanceMethodsOnActivation.new(self, store, attr, key, array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associate_jsonb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,15 +122,21 @@ files:
 - README.md
 - Rakefile
 - lib/associate_jsonb.rb
-- lib/associate_jsonb/arel_node_extensions/binary.rb
+- lib/associate_jsonb/arel_extensions/nodes/binary.rb
+- lib/associate_jsonb/arel_extensions/nodes/table_alias.rb
+- lib/associate_jsonb/arel_extensions/table.rb
+- lib/associate_jsonb/arel_extensions/visitors/visitor.rb
 - lib/associate_jsonb/arel_nodes/jsonb/at_arrow.rb
+- lib/associate_jsonb/arel_nodes/jsonb/attribute.rb
 - lib/associate_jsonb/arel_nodes/jsonb/bindable_operator.rb
 - lib/associate_jsonb/arel_nodes/jsonb/dash_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/dash_double_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/double_pipe.rb
 - lib/associate_jsonb/arel_nodes/jsonb/hash_arrow.rb
 - lib/associate_jsonb/arel_nodes/jsonb/operator.rb
+- lib/associate_jsonb/arel_nodes/sql_casted_binary.rb
 - lib/associate_jsonb/arel_nodes/sql_casted_equality.rb
+- lib/associate_jsonb/associations/alias_tracker.rb
 - lib/associate_jsonb/associations/association.rb
 - lib/associate_jsonb/associations/association_scope.rb
 - lib/associate_jsonb/associations/belongs_to_association.rb
@@ -139,6 +145,7 @@ files:
 - lib/associate_jsonb/associations/builder/has_one.rb
 - lib/associate_jsonb/associations/conflicting_association.rb
 - lib/associate_jsonb/associations/has_many_association.rb
+- lib/associate_jsonb/associations/join_dependency.rb
 - lib/associate_jsonb/associations/preloader/association.rb
 - lib/associate_jsonb/connection_adapters.rb
 - lib/associate_jsonb/connection_adapters/reference_definition.rb

data/lib/associate_jsonb/arel_node_extensions/binary.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module AssociateJsonb
-  module ArelNodeExtensions
-    module Binary
-      def original_left
-        left
-      end
-    end
-  end
-end