associate_jsonb 0.0.10 → 6.1.4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 847b6c8d5410dca5511a9ab2537ea3d2d9ba5c40e681ad42a63f0e752604d1ff
-  data.tar.gz: 935adff8c21a94b4d7593a236c9e56eec29c31340a897c82851b3662b0da880e
+  metadata.gz: f26470e30b277fe8ef0189ca4bef7eacf8cf7d4fa22008a879f5c1b187f9c476
+  data.tar.gz: 28ca2bd98358795e4e9d6a59e14738536e7a2696e0b4eacb11612e5bc33840a6
 SHA512:
-  metadata.gz: c614936df446af3b0bd1301037954214e973cc4522637c3578f47f775065eb9085f08b668b11bf619ba3ca7968b14c078e192579be56eee489d5bf0780097552
-  data.tar.gz: 5243289a848da4cc15d03204a6d5bc6a502d810e6f839fb2b26aabc264bea63553b040a8508cf6f6d0722d82be5ea905c9bb75caa5e9ac1038b2e9d85e535122
+  metadata.gz: 6475d5e18d9c67d1b4b13a4770640ba79031357317dd185d77b8c959b8fdf1f59b52d6ee12fe1bed2e18652ed36747ce22c33af390bd63a3dbb87249c81479d2
+  data.tar.gz: 300b6fb1c2385bab73823765ee42d27e2b0a047efcf10b58727ad5e2973672910ca07a57ae76b64ff4ab32f006bf934d6376ddd975b9380600404d6264860955

data/lib/associate_jsonb/arel_nodes/sql_casted_equality.rb

@@ -1,28 +1,6 @@
 # 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 < AssociateJsonb::ArelNodes::SqlCastedBinary

data/lib/associate_jsonb/associations/alias_tracker.rb

@@ -5,8 +5,8 @@ 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)
+      def aliased_table_for(arel_table, table_name = nil, store_tracker: nil)
+        super(arel_table, table_name).with_store_tracker(store_tracker)
       end
     end
   end

data/lib/associate_jsonb/associations/association.rb

@@ -12,28 +12,14 @@ module AssociateJsonb
         assigned_keys = record.changed_attribute_names_to_save
         assigned_keys += except_from_scope_attributes.keys.map(&:to_s)
         attributes = scope_for_create.except!(*(assigned_keys - skip_assign))
+
         if attributes.key?(reflection.foreign_store_key.to_s)
-          v = attributes.delete(reflection.foreign_store_key.to_s)
-          attributes[reflection.foreign_key.to_s] = v
+          attributes[reflection.foreign_key.to_s] = attributes.delete(reflection.foreign_store_key.to_s)
         end
+
         record.send(:_assign_attributes, attributes) if attributes.any?
         set_inverse_instance(record)
       end
-
-      private
-        def creation_attributes
-          return super if reflection.belongs_to?
-          return super unless reflection.foreign_store?
-
-          attributes = {}
-
-          jsonb_store = reflection.foreign_store_attr
-          attributes[jsonb_store] ||= {}
-          attributes[jsonb_store][reflection.foreign_store_key] =
-            owner[reflection.active_record_primary_key]
-
-          attributes
-        end
     end
   end
 end

data/lib/associate_jsonb/associations/association_scope.rb

@@ -4,17 +4,13 @@
 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
-          )
+          aliased_table = tracker.aliased_table_for(refl.klass.arel_table, store_tracker: refl.klass.store_column_attribute_tracker) do
+            refl.alias_candidate(name)
+          end
           chain << ActiveRecord::Associations::AssociationScope::ReflectionProxy.new(refl, aliased_table)
         end
         chain
@@ -25,18 +21,19 @@ module AssociateJsonb
         reflection = owner_reflection.instance_variable_get(:@reflection)
         return super unless reflection&.foreign_store?
 
+        primary_key = reflection.join_primary_key
+        foreign_key = reflection.join_foreign_key
+        store_key = reflection.foreign_store_key || primary_key
 
-        join_keys = owner_reflection.join_keys
         table = owner_reflection.aliased_table
-        key = reflection.foreign_store_key || join_keys.key
-        value = transform_value(owner[join_keys.foreign_key])
+        value = transform_value(owner[foreign_key])
 
         apply_jsonb_equality(
           scope,
           table,
           reflection.foreign_store_attr,
-          key.to_s,
-          join_keys.foreign_key,
+          store_key.to_s,
+          owner_reflection.join_foreign_key,
           value,
           reflection.active_record
         )

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

@@ -5,6 +5,29 @@ module AssociateJsonb
   module Associations
     module Builder
       module BelongsTo #:nodoc:
+        # Maybe convert to builder callbacks here in next iteration
+        # def define_callbacks(model, reflection)
+        #   super
+        #   add_after_jsonb_initialize_callbacks(model, reflection) if reflection.jsonb_store?
+        #   add_after_foreign_store_initialize_callbacks(model, reflection) if reflection.foreign_store?
+        # end
+        #
+        # def add_after_jsonb_initialize_callbacks(model, reflection)
+        #   model.after_initialize lambda {|record|
+        #     association = association(reflection.name)
+        #     p model, reflection.join_primary_key, reflection.join_foreign_key, reflection.options
+        #     p record.attributes
+        #     # record.attributes._write_attribute()
+        #   }
+        # end
+        #
+        # def add_after_foreign_store_initialize_callbacks(model, reflection)
+        #   model.after_initialize lambda {|record|
+        #     association = association(reflection.name)
+        #     # record.attributes._write_attribute()
+        #   }
+        # end
+
         def valid_options(options)
           super + %i[ store store_key ]
         end
@@ -18,7 +41,7 @@ module AssociateJsonb
         end
 
         def add_association_accessor_methods(mixin, reflection)
-          foreign_key = reflection.foreign_key.to_s
+          foreign_key = reflection.join_foreign_key.to_s
           key = (reflection.jsonb_store_key || foreign_key).to_s
           store = reflection.jsonb_store_attr
 
@@ -35,8 +58,8 @@ module AssociateJsonb
           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 }
+            primary_key = reflection.join_primary_key.to_s
+            primary_column = reflection.klass.columns_hash[primary_key]
 
             if primary_column
               foreign_type = primary_column.type

data/lib/associate_jsonb/associations/foreign_association.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module AssociateJsonb
+  module Associations
+    module ForeignAssociation # :nodoc:
+      private
+        # Sets the owner attributes on the given record
+        def set_owner_attributes(record)
+          return if options[:through]
+          return super unless reflection.foreign_store?
+
+          jsonb_store = reflection.foreign_store_attr.to_s
+          value = record._read_attribute(jsonb_store).presence || {}
+          fk_value = owner._read_attribute(reflection.join_foreign_key)
+          value[reflection.foreign_store_key] = fk_value
+
+          record._write_attribute(reflection.join_primary_key, fk_value)
+          record._write_attribute(jsonb_store, value)
+        end
+    end
+  end
+end

data/lib/associate_jsonb/associations/join_dependency.rb

@@ -6,15 +6,28 @@ 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
-            )
-          }
+        def make_constraints(parent, child, join_type)
+          foreign_table = parent.table
+          foreign_klass = parent.base_klass
+          child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker) do |reflection|
+            table, terminated = @joined_tables[reflection]
+            root = reflection == child.reflection
+
+            if table && (!root || !terminated)
+              @joined_tables[reflection] = [table, root] if root
+              next table, true
+            end
+
+            table_name = @references[reflection.name.to_sym]&.to_s
+
+            table = alias_tracker.aliased_table_for(reflection.klass.arel_table, table_name, store_tracker: reflection.klass.store_column_attribute_tracker) do
+              name = reflection.alias_candidate(parent.table_name)
+              root ? name : "#{name}_join"
+            end
+
+            @joined_tables[reflection] ||= [table, root] if join_type == Arel::Nodes::OuterJoin
+            table
+          end.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
         end
     end
   end

data/lib/associate_jsonb/associations/preloader/association.rb

@@ -18,6 +18,30 @@ module AssociateJsonb
             ).intersects_with(ids)
           )
         end
+
+        private
+          def load_records
+            return super unless reflection.foreign_store?
+            # owners can be duplicated when a relation has a collection association join
+            # #compare_by_identity makes such owners different hash keys
+            @records_by_owner = {}.compare_by_identity
+            raw_records = owner_keys.empty? ? [] : records_for(owner_keys)
+
+            @preloaded_records = raw_records.select do |record|
+              assignments = false
+
+              owners_by_key[convert_key(record[association_key_name])].each do |owner|
+                entries = (@records_by_owner[owner] ||= [])
+
+                if reflection.collection? || entries.empty?
+                  entries << record
+                  assignments = true
+                end
+              end
+
+              assignments
+            end
+          end
       end
     end
   end

data/lib/associate_jsonb/attribute_methods.rb

@@ -11,8 +11,8 @@ module AssociateJsonb
 
     private
       def attributes_with_info(attribute_names)
-        attribute_names.each_with_object({}) do |name, attrs|
-          attrs[name] = _fetch_attribute(name)
+        attribute_names.index_with do |name|
+          _fetch_attribute(name)
         end
       end
   end

data/lib/associate_jsonb/connection_adapters/schema_creation.rb

@@ -30,7 +30,7 @@ module AssociateJsonb
           end
 
           create_sql << "(#{statements.join(', ')})" if statements.present?
-          add_table_options!(create_sql, table_options(o))
+          add_table_options!(create_sql, o)
           create_sql << " AS #{to_sql(o.as)}" if o.as
           create_sql
         end

data/lib/associate_jsonb/connection_adapters/schema_statements.rb

@@ -12,38 +12,43 @@ module AssociateJsonb
         execute schema_creation.accept(AddJsonbForeignKeyFunction.new)
       end
 
-      def create_table(table_name, **options)
-        td = create_table_definition(table_name, **options)
+      def create_table(table_name, id: :primary_key, primary_key: nil, force: nil, **options)
+        td = create_table_definition(table_name, **extract_table_options!(options))
 
-        if options[:id] != false && !options[:as]
-          pk = options.fetch(:primary_key) do
-            ActiveRecord::Base.get_primary_key table_name.to_s.singularize
+        if id && !td.as
+          pk = primary_key || ActiveRecord::Base.get_primary_key(table_name.to_s.singularize)
+
+          if id.is_a?(Hash)
+            options.merge!(id.except(:type))
+            id = id.fetch(:type, :primary_key)
           end
 
           if pk.is_a?(Array)
             td.primary_keys pk
           else
-            td.primary_key pk, options.fetch(:id, :primary_key), **options.except(:comment)
+            td.primary_key pk, id, **options
           end
         end
 
         yield td if block_given?
 
-        if options[:force]
-          drop_table(table_name, **options, if_exists: true)
+        if force
+          drop_table(table_name, force: force, if_exists: true)
+        else
+          schema_cache.clear_data_source_cache!(table_name.to_s)
         end
 
         result = execute schema_creation.accept td
 
         td.indexes.each do |column_name, index_options|
-          add_index(table_name, column_name, index_options)
+          add_index(table_name, column_name, **index_options, if_not_exists: td.if_not_exists)
         end
 
         td.constraints.each do |ct|
           add_constraint(table_name, **ct)
         end
 
-        if table_comment = options[:comment].presence
+        if table_comment = td.comment.presence
           change_table_comment(table_name, table_comment)
         end
 

data/lib/associate_jsonb/reflection.rb

@@ -18,7 +18,7 @@ module AssociateJsonb
     end
 
     def jsonb_store_key
-      options[:store_key].presence || join_keys.foreign_key
+      options[:store_key].presence || join_foreign_key
     end
 
     def foreign_store?
@@ -36,7 +36,7 @@ module AssociateJsonb
     end
 
     def foreign_store_key
-      options[:foreign_store_key].presence || join_keys.key
+      options[:foreign_store_key].presence || join_primary_key
     end
 
     def join_scope(table, foreign_table, foreign_klass)
@@ -52,8 +52,8 @@ module AssociateJsonb
 
       scope_chain_items.inject(klass_scope, &:merge!)
 
-      key         = join_keys.key
-      foreign_key = join_keys.foreign_key
+      key         = join_primary_key
+      foreign_key = join_foreign_key
 
       if foreign_store?
         klass_scope.where!(

data/lib/associate_jsonb/relation/where_clause.rb

@@ -4,36 +4,14 @@
 module AssociateJsonb
   module Relation
     module WhereClause
-      def to_h(table_name = nil)
-        equalities = equalities(predicates)
-        if table_name
-          equalities = equalities.select do |node|
-            node.original_left.relation.name == table_name
-          end
-        end
-
-        equalities.map { |node|
+      def to_h(table_name = nil, equality_only: false)
+        equalities(predicates, equality_only).each_with_object({}) do |node, hash|
+          next if table_name&.!= node.original_left.relation.name
           name = node.original_left.name.to_s
           value = extract_node_value(node.right)
-          [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
+          hash[name] = value
         end
+      end
     end
   end
 end

data/lib/associate_jsonb/supported_rails_version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module AssociateJsonb
-  SUPPORTED_RAILS_VERSION = "6.0.3.2"
+  SUPPORTED_RAILS_VERSION = "6.1.4.1"
 end

data/lib/associate_jsonb/version.rb

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

data/lib/associate_jsonb/with_store_attribute.rb

@@ -99,15 +99,15 @@ module AssociateJsonb
       end
 
       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
+        store = store.to_s
+        attr = attr.to_s
         key ||= attr
         key = key.to_s
         array = attribute_opts[:array]
         attribute attr, cast_type, **attribute_opts
 
         instance_eval <<~CODE, __FILE__, __LINE__ + 1
-          add_store_column_attribute_name("#{attr}", :#{store}, "#{key}", { sql_type: sql_type, type: cast_type, opts: attribute_opts })
+          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)
@@ -120,9 +120,9 @@ module AssociateJsonb
 
         array_or_attr = ->(value) {
           is_array \
-           ? %Q(Array(#{value})) \
-           : %Q(#{value})
-         }
+            ? %Q(Array(#{value})) \
+            : %Q(#{value})
+        }
 
         on_store_change = "_write_attribute(:#{attribute}, #{array_or_attr.call %Q(#{store}["#{key}"])})"
         on_attr_change = "super(#{array_or_attr.call %Q(given)})"

data/lib/associate_jsonb.rb

@@ -36,7 +36,7 @@ module AssociateJsonb
   ##
   # Enables the use of `jsonb_nested_set` for hash updates
   #
-  # if passed a class, or a list of classes, those classes will be added todo
+  # if passed a class, or a list of classes, those classes will be added to
   # the enabled classes. if no argument is given, and the enabled class list is
   # empty, `ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb` is added
   # to the list of enabled classes
@@ -187,6 +187,10 @@ ActiveSupport.on_load :active_record do
     AssociateJsonb::Associations::Preloader::Association
   )
 
+  ActiveRecord::Associations::ForeignAssociation.prepend(
+    AssociateJsonb::Associations::ForeignAssociation
+  )
+
   %i[
     AlterTable
     ConstraintDefinition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associate_jsonb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 6.1.4.1.1
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.4.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ files:
 - lib/associate_jsonb/associations/builder/has_many.rb
 - lib/associate_jsonb/associations/builder/has_one.rb
 - lib/associate_jsonb/associations/conflicting_association.rb
+- lib/associate_jsonb/associations/foreign_association.rb
 - lib/associate_jsonb/associations/has_many_association.rb
 - lib/associate_jsonb/associations/join_dependency.rb
 - lib/associate_jsonb/associations/preloader/association.rb
@@ -190,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Store database references in PostgreSQL Jsonb columns