active_scaffold 3.6.15 → 3.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc7c6f7e057512476a4f93c0505622a34a97c81b6cbd75c5bb1b014a928ad65
-  data.tar.gz: c9e2bf9f2240b380b1ebd3f52007db921b88a3035aee3327fec779d74c43f0c6
+  metadata.gz: f3e15dbddabba45c8d0c75e9cd91a00b805c2f8d9f229e8c4fc1a9bfa08136dd
+  data.tar.gz: 8be97ebe3447c4f77b55e69ee6e6d501c62f342ab49379303a9071c664590a5c
 SHA512:
-  metadata.gz: 30377a392938156d9ce545bf18fe0cafebabd935fcd913d4ad28836f53a25cbde41bb7849542f08d6acebdcab9d0e39c8efbddc2d0fe10bf4a40c8af4cedf15e
-  data.tar.gz: 19602b41999bf34152f9a968c78aa36529794ca7d5ae17db43c55ae288f34b5ed5409923cd1e62ec7a8f5d97f781dd60cce8307c90291136303c3890e0c543e4
+  metadata.gz: c351ddf8bbd11a8a2540a6f589197f68a9a520eaba6f446b2f53934dc1c100df14ebe99894d40a97f489a132002645c80db8aa4122bbf09e952f3f6f367a84ea
+  data.tar.gz: 35b42d0d6f2d8ffae123b046ede6b5761dfe9910f4922c3dbdf985899c30fbf36fc6696d774d486c888fae774a1c7e390a761fe4f97f8c804b3df1d9b57b95c2

data/CHANGELOG.rdoc

@@ -1,3 +1,22 @@
+= 3.6.19
+- Improve create action in has_many through singular association, supporting more cases
+
+= 3.6.18
+- Add references only for column.search_joins which are in column.includes, and do search_joins for the rest, search_joins default to includes, so won't change behaviour on most cases, but allows to preload some associations without joining in the query
+- Don't define default search_joins, as it may return includes, so search_joins will default to includes unless is defined, and the previous change won't change the behaviour if user doesn't define search_joins
+- Fix update_columns on through association
+
+= 3.6.17
+- Don't add includes or left joins for constrained columns, as they are ignored on sorting clause
+- Fix deprecation on cache counts with rails 5, and fix the queries for rails >= 5.1
+- Fix new for tableless models on rails 5.0
+
+= 3.6.16
+- Fix query on paper_trail action
+- Fix one? on tableless relation
+- Fix exists? on tableless relation
+- Fix getting conditions from association in the tableless relation
+
 = 3.6.15
 - Prevent firing 2 change events on jquery datetime pickers
 - Fix setting data options on columns for date and datetime pickers
@@ -62,7 +81,7 @@
 = 3.6.1
 - Display group cols vertically when subform layout is vertical
 - Fix html attributes for input datetime on field search, when jquery ui is not used
-- Fix constraint columns for nested list on through assocaitions
+- Fix constraint columns for nested list on through associations
 - Support rails 6.1
 
 = 3.6.0

data/lib/active_scaffold/actions/common_search.rb

@@ -31,6 +31,22 @@ module ActiveScaffold::Actions
         params_hash params[:search]
       end
 
+      def set_outer_joins_for_search(columns)
+        references = []
+        outer_joins = []
+        columns.each do |column|
+          next unless column.search_joins.present?
+          if column.includes.present? && list_columns.include?(column)
+            references << (column.search_joins & column.includes)
+            outer_joins << (column.search_joins - column.includes)
+          else
+            outer_joins << column.search_joins
+          end
+        end
+        active_scaffold_references.concat references.flatten.uniq.compact
+        active_scaffold_outer_joins.concat outer_joins.flatten.uniq.compact
+      end
+
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
           if params[:search].present?

data/lib/active_scaffold/actions/core.rb

@@ -100,8 +100,7 @@ module ActiveScaffold::Actions
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       create_association_with_parent record, true if nested?
-      value = column_value_from_param_value(record, column, value)
-      record.send "#{column.name}=", value
+      update_column_from_params(record, column, value, true)
       record.id = params[:id]
       record
     end

data/lib/active_scaffold/actions/field_search.rb

@@ -161,10 +161,14 @@ module ActiveScaffold::Actions
           search_condition = self.class.condition_for_column(column, value, text_search)
           next if search_condition.blank?
 
-          joins_for_search_on_column(column, count_includes)
           active_scaffold_conditions << search_condition
           filtered_columns << column
         end
+        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
+          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
+        else
+          set_outer_joins_for_search filtered_columns
+        end
         if filtered_columns.present? || grouped_search?
           @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
@@ -172,14 +176,6 @@ module ActiveScaffold::Actions
         active_scaffold_config.list.user.page = nil
       end
 
-      def joins_for_search_on_column(column, count_includes)
-        if count_includes.nil? && column.includes.present? && list_columns.include?(column) && !grouped_search?
-          active_scaffold_references << column.includes
-        elsif column.search_joins.present?
-          active_scaffold_outer_joins << column.search_joins
-        end
-      end
-
       def field_search_ignore?
         active_scaffold_config.list.always_show_search && active_scaffold_config.list.search_partial == 'field_search'
       end

data/lib/active_scaffold/actions/list.rb

@@ -83,6 +83,7 @@ module ActiveScaffold::Actions
 
     def set_includes_for_sorting(columns, sorting)
       sorting.each_column do |col|
+        next if sorting.constraint_columns.include? col.name
         next unless col.includes.present? && !columns.include?(col)
         if active_scaffold_config.model.connection.needs_order_expressions_in_select?
           active_scaffold_references << col.includes
@@ -176,7 +177,7 @@ module ActiveScaffold::Actions
       query = active_scaffold_config.model.where(active_scaffold_config.primary_key => records.map(&:id))
                                     .joins(column.name).group(active_scaffold_config.primary_key)
                                     .select("#{klass.quoted_table_name}.#{klass.quoted_primary_key}")
-      query = query.uniq if column.association.scope && klass.instance_exec(&column.association.scope).values[:distinct]
+      query = query.distinct if column.association.scope && klass.instance_exec(&column.association.scope).values[:distinct]
       query
     end
 

data/lib/active_scaffold/actions/nested.rb

@@ -122,16 +122,21 @@ module ActiveScaffold::Actions
       # has_many is done by beginning_of_chain and rails if direct association, not in through associations
       return false if nested.has_many? && !nested.association.through?
       return false if check_match && !nested.match_model?(active_scaffold_config.model)
-      nested.child_association && nested_parent_record
+      (nested.child_association || nested.create_through_singular?) && nested_parent_record
     end
 
     def create_association_with_parent(record, check_match = false)
       return unless create_association_with_parent?(check_match)
-      if nested.child_association.singular?
+      if nested.child_association&.singular?
         record.send("#{nested.child_association.name}=", nested_parent_record)
-      elsif nested.association.through_singular? && nested.child_association.through_singular?
-        through = nested_parent_record.send(nested.association.through_reflection.name)
-        record.send("#{nested.child_association.through_reflection.name}=", through)
+      elsif nested.create_through_singular?
+        through = nested_parent_record.send(nested.association.through_reflection.name) ||
+          nested_parent_record.send("build_#{nested.association.through_reflection.name}")
+        if nested.source_reflection.reverse_association.collection?
+          record.send(nested.source_reflection.reverse) << through
+        else
+          record.send("#{nested.source_reflection.reverse}=", through)
+        end
       else
         record.send(nested.child_association.name) << nested_parent_record
       end

data/lib/active_scaffold/actions/search.rb

@@ -26,12 +26,7 @@ module ActiveScaffold::Actions
           @filtered = search_conditions.present?
           active_scaffold_conditions.concat search_conditions if @filtered
 
-          references, outer_joins = columns.partition do |column|
-            column.includes.present? && list_columns.include?(column)
-          end
-          active_scaffold_references.concat references.map(&:includes).flatten.uniq.compact
-          active_scaffold_outer_joins.concat outer_joins.map(&:search_joins).flatten.uniq.compact
-
+          set_outer_joins_for_search columns
           active_scaffold_config.list.user.page = nil
         else
           super

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -10,7 +10,7 @@ module ActiveScaffold::Actions
     end
 
     def deleted
-      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
+      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model.name)
       if nested? && nested.child_association&.belongs_to? && PaperTrail::Version.respond_to?(:where_object)
         query = query.where_object(nested.child_association.foreign_key => nested.parent_id)
       end

data/lib/active_scaffold/data_structures/column.rb

@@ -353,7 +353,6 @@ module ActiveScaffold::DataStructures
       if delegated_association
         self.includes = includes ? [delegated_association.name => includes] : [delegated_association.name]
       end
-      self.search_joins = includes.clone if includes
 
       # default all the configurable variables
       self.css_class = ''

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -94,12 +94,20 @@ module ActiveScaffold::DataStructures
       return false unless through_association?
       return true if association.through_reflection.options[:through] # create not possible, too many levels
       return true if association.source_reflection.options[:through] # create not possible, too many levels
-      return false if association.through_singular? # create allowed, AS has code for this
+      return false if create_through_singular? # create allowed, AS has code for this
 
       # create allowed only if through reflection in record to be created is included in create columns
       !child_association || !columns.include?(child_association.through_reflection.name)
     end
 
+    def create_through_singular?
+      association.through_singular? && source_reflection.reverse
+    end
+
+    def source_reflection
+      @source_reflection ||= ActiveScaffold::DataStructures::Association::ActiveRecord.new(association.source_reflection)
+    end
+
     def through_association?
       association.through?
     end

data/lib/active_scaffold/tableless.rb

@@ -76,6 +76,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       super.tap do |scope|
         if klass < ActiveScaffold::Tableless
           class << scope; include RelationExtension; end
+          assoc_conditions = scope.proxy_association&.send(:association_scope)&.conditions
+          if assoc_conditions&.present?
+            scope.conditions.concat(assoc_conditions.map { |c| c.is_a?(Hash) ? c[klass.table_name] || c : c })
+          end
         end
       end
     end
@@ -112,8 +116,6 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
   end
 
   module RelationExtension
-    attr_reader :conditions
-
     def initialize(klass, *)
       super
       @conditions ||= []
@@ -124,6 +126,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       super
     end
 
+    def conditions
+      @conditions ||= []
+    end
+
     def where(opts, *rest)
       if opts.present?
         opts = opts.with_indifferent_access if opts.is_a? Hash
@@ -131,6 +137,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       end
       self
     end
+    alias where! where
 
     def merge(rel)
       super.tap do |merged|
@@ -140,14 +147,13 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
 
     def except(*skips)
       super.tap do |new_relation|
-        new_relation.conditions = conditions unless skips.include? :where
+        unless new_relation.is_a?(RelationExtension)
+          class << new_relation; include RelationExtension; end
+        end
+        new_relation.conditions.concat conditions unless skips.include? :where
       end
     end
 
-    def to_a
-      @klass.find_all(self)
-    end
-
     def find_one(id)
       @klass.find_one(id, self) || raise(ActiveRecord::RecordNotFound)
     end
@@ -161,7 +167,15 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     end
 
     def exists?
-      limit(1).to_a.present?
+      size.positive?
+    end
+
+    private
+
+    def exec_queries
+      @records = @klass.find_all(self)
+      @loaded = true
+      @records
     end
   end
 
@@ -203,15 +217,15 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       end
     end
   end
-
-  def self.columns_hash
-    if self < ActiveScaffold::Tableless
-      @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
-    else
-      super
-    end
-  end
   if Rails.version < '5.0' # 4.2.x
+    def self.columns_hash
+      if self < ActiveScaffold::Tableless
+        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
+      else
+        super
+      end
+    end
+
     def self.initialize_find_by_cache
       self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) } # rubocop:disable Rails/DynamicFindBy
     end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 15
+    PATCH = 19
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/misc/tableless_test.rb

@@ -27,8 +27,9 @@ class TablelessTest < MiniTest::Test
     assert Person.new.files.empty?
     @person = Person.new
     @person.save(validate: false)
-    assert @person.files.empty?
-    assert_equal [], @person.files.to_a
+    assert !@person.files.empty?
+    assert @person.files.all.exists?
+    assert_equal @person.id, @person.files.first.person_id
   end
 
   def test_tableless_assoc_with_dependent

data/test/mock_app/app/models/file_model.rb

@@ -6,6 +6,18 @@ class FileModel < ActiveScaffold::Tableless
   belongs_to :person
 
   def self.find_all(relation)
+    relation.conditions&.each&.with_index do |condition, i|
+      person_id =
+        case condition
+        when Hash
+          condition[:person_id]
+        when Arel::Nodes::Equality
+          if condition.left.name.to_sym == :person_id
+            relation.bind_values[i].present? ? relation.bind_values[i][1] : condition.right.first
+          end
+        end
+      return [new(person_id: person_id)] if person_id
+    end
     []
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.15
+  version: 3.6.19
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails