motor-admin 0.4.38 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c943e9e5bb46c9f25141164049d7ecb775efe92fb77bbadfb436a29c926565a
-  data.tar.gz: 03d7aa82d0bad2fc1f62c1e2dcbfe8c03cefcb8bef3d79e33cbef60b1bda9bbe
+  metadata.gz: d731a6842770c8a860df2506eefb38ba5aa71775b0b1ac8f8fc237732443a9d1
+  data.tar.gz: 8ffba29d356aafbb68067f5b0e85e2081a846a375437b54ca9e7d125797aa3fa
 SHA512:
-  metadata.gz: 6499627caf2043999b21453aa0d02b69c5e9dcb823d0a58a637f88ca86bda9d4bee96aecc27b8950fe73334dff75d186f1fccca6b4d99088afa0215ceb8011d9
-  data.tar.gz: e9379126de1f5a63efde92a66b37ce939938ef74123fa3fd6d61d5f5b8c0f76fa90aa5f2b79926e82ba3d972480f4debb46584dd55064732beffe903ab1978f2
+  metadata.gz: cf9e0ea1f7ba7bd55ccf448ebf9176d48d515fb9bbddf0f9a465f02db0b6b56e839c2e89fc66f84ce5cafaa60b811cfff922d45fef555e44959822b24944bc20
+  data.tar.gz: 7404c78cb16701a090799a9f7ff0bdc3b67ced5e3e4c675db9796ce9495cce72298f6b124bc612430f2a73e3aef6a6355c14b3b6105ee5bd3d582ad664e9f481

data/app/controllers/motor/data_controller.rb

@@ -81,6 +81,7 @@ module Motor
 
     def resource_params
       if params[:data].present?
+        # Allow all attributes through; dynamic model class limits what is actually persisted
         params.require(:data).permit!
       else
         {}

data/lib/motor/active_record_utils/active_record_filter.rb

@@ -340,41 +340,53 @@ module ActiveRecord
       if relation.polymorphic?
         value = value.dup
         klass = value.delete(:as).safe_constantize
+        new_trail = relation_trail + ["#{klass.table_name}_as_#{relation.name}"]
 
-        builder = self.class.new(TableMetadata.new(
-                                   klass,
-                                   alias_tracker.aliased_table_for_relation(relation_trail + ["#{klass.table_name}_as_#{relation.name}"],
-                                                                            klass.arel_table) do
-                                     klass.arel_table.name
-                                   end,
-                                   relation
-                                 ))
-        builder.build_from_filter_hash(value, relation_trail + ["#{klass.table_name}_as_#{relation.name}"],
-                                       alias_tracker)
+        arel_table = alias_tracker.aliased_table_for_relation(new_trail, klass.arel_table) do
+          klass.arel_table.name
+        end
+
+        metadata = build_table_metadata(klass, arel_table, relation)
+        builder = self.class.new(metadata)
+        builder.build_from_filter_hash(value, new_trail, alias_tracker)
       else
-        builder = self.class.new(TableMetadata.new(
-                                   relation.klass,
-                                   alias_tracker.aliased_table_for_relation(relation_trail + [relation.name],
-                                                                            relation.klass.arel_table) do
-                                     relation.alias_candidate(table.arel_table.name || relation.klass.arel_table)
-                                   end,
-                                   relation
-                                 ))
-        builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
+        new_trail = relation_trail + [relation.name]
+
+        arel_table = alias_tracker.aliased_table_for_relation(new_trail, relation.klass.arel_table) do
+          relation.alias_candidate(table.arel_table.name || relation.klass.arel_table)
+        end
+
+        metadata = build_table_metadata(relation.klass, arel_table, relation)
+        builder = self.class.new(metadata)
+        builder.build_from_filter_hash(value, new_trail, alias_tracker)
       end
     end
 
     def expand_filter_for_join_table(relation, value, relation_trail, alias_tracker)
       relation = relation.active_record._reflections[relation.active_record._reflections[relation.name.to_s].send(:delegate_reflection).options[:through].to_s]
-      builder = self.class.new(TableMetadata.new(
-                                 relation.klass,
-                                 alias_tracker.aliased_table_for_relation(relation_trail + [relation.name],
-                                                                          relation.klass.arel_table) do
-                                   relation.alias_candidate(table.arel_table.name || relation.klass.arel_table)
-                                 end,
-                                 relation
-                               ))
-      builder.build_from_filter_hash(value, relation_trail + [relation.name], alias_tracker)
+      new_trail = relation_trail + [relation.name]
+
+      arel_table = alias_tracker.aliased_table_for_relation(new_trail, relation.klass.arel_table) do
+        relation.alias_candidate(table.arel_table.name || relation.klass.arel_table)
+      end
+
+      metadata = build_table_metadata(relation.klass, arel_table, relation)
+      builder = self.class.new(metadata)
+      builder.build_from_filter_hash(value, new_trail, alias_tracker)
+    end
+
+    private
+
+    def build_table_metadata(klass, arel_table, reflection = nil)
+      if table_metadata_supports_reflection?
+        ::ActiveRecord::TableMetadata.new(klass, arel_table, reflection)
+      else
+        ::ActiveRecord::TableMetadata.new(klass, arel_table)
+      end
+    end
+
+    def table_metadata_supports_reflection?
+      @table_metadata_supports_reflection ||= ::ActiveRecord::TableMetadata.instance_method(:initialize).arity != 2
     end
   end
 end

data/lib/motor/configs/sync_from_file.rb

@@ -23,7 +23,9 @@ module Motor
 
           next unless file_timestamp
 
-          FILE_TIMESTAMPS_STORE.fetch(file_timestamp.to_s) do
+          cache_key = file_timestamp.to_s
+
+          unless FILE_TIMESTAMPS_STORE.exist?(cache_key)
             Motor::Configs::SyncFromHash.call(
               YAML.safe_load(file.read, permitted_classes: [Time, Date])
             )

data/lib/motor/queries/run_query.rb

@@ -118,7 +118,7 @@ module Motor
         case value
         when Integer
           'integer'
-        when Float
+        when Float, BigDecimal
           'float'
         when Time
           'datetime'

data/lib/motor/resources/fetch_configured_model.rb

@@ -114,36 +114,55 @@ module Motor
 
         columns_hash =
           columns.each_with_object({}) do |column, acc|
-            acc[column[:name]] =
-              if Rails.version.to_f >= 7.2
-                base_column.class.new(
-                  column[:name],
-                  nil,
-                  base_column.sql_type_metadata.class.new(
-                  ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: column[:column_type],
-                                                                        type: column[:column_type].to_sym))
-                )
-              else
-                ActiveRecord::ConnectionAdapters::Column.new(
-                  column[:name],
-                  nil,
-                  ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: column[:column_type],
-                                                                        type: column[:column_type].to_sym)
-                )
-              end
+            acc[column[:name]] = synthesize_column(base_column, column[:name], column[:column_type])
           end
 
         klass.instance_variable_set(:@__motor_custom_sql_columns_hash, columns_hash)
 
         # rubocop:disable Naming/MemoizedInstanceVariableName
         klass.instance_eval do
+          # Expose custom_sql columns for reading/type-casting, but keep persistence
+          # behavior based only on real DB columns.
           def columns_hash
             @__motor__columns_hash ||= @__motor_custom_sql_columns_hash.merge(super)
           end
+
+          # Only real DB columns should be considered for persistence and strong params.
+          def column_names
+            connection.schema_cache.columns_hash(table_name).keys
+          end
+
+          # Same for the columns collection used by AR internals.
+          def columns
+            connection.schema_cache.columns(table_name)
+          end
         end
         # rubocop:enable Naming/MemoizedInstanceVariableName
       end
 
+      def synthesize_column(template_column, name, sql_type)
+        column = template_column.dup
+
+        generic_meta = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(
+          sql_type: sql_type,
+          type: sql_type.to_sym
+        )
+
+        adapter_meta = template_column.sql_type_metadata.class.new(generic_meta)
+
+        begin
+          cast_type = ActiveRecord::Type.lookup(sql_type.to_sym)
+        rescue StandardError
+          cast_type = ActiveRecord::Type.lookup(:string)
+        end
+
+        column.instance_variable_set(:@name, name)
+        column.instance_variable_set(:@sql_type_metadata, adapter_meta)
+        column.instance_variable_set(:@cast_type, cast_type)
+
+        column
+      end
+
       def define_column_reflections(klass, config)
         config.fetch(:columns, []).each do |column|
           reference = column[:reference]

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.4.38'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.38
+  version: 0.5.0
 platform: ruby
 authors:
 - Pete Matsyburka