motor-admin 0.4.33 → 0.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d3073a25a3b0261755507001390f0707e6e795b1cd015426d61e7aad6fb32b8
-  data.tar.gz: e7aec3bf0ff84b5506142ac1630dacba519b9b844bcc26db4b1bc80bcfd1c854
+  metadata.gz: b8c50645e3228b532c70c3455ed170c59c21d7e69f5a0170f13c43174fe6e0c9
+  data.tar.gz: 3a50a9787112c88af0a5f39ebc2cb23394f240f694ea8a335641456ab64669d2
 SHA512:
-  metadata.gz: 0cf73f7d1a3d96df55598370e84204fb381931702f20457bb21019129eba9b727f4d4600a77471db40eac745bf5aed69605437f8c54e4ec11d3a428719cf2888
-  data.tar.gz: 24ed3db8df9801d36f0a72cd9eea13bd1fab51e3bd88a08564e9ef32412e871e5f62e870d80d2feebd168f758d2f10fa84bcff9df20f3db2470888913cec9dc0
+  metadata.gz: 194f2226d32361a5e1a7ace3f8a49431d4a3d190714741930e8716f1482083907459769b65399235b5c4da0702adc1acc27cd1da0b44427ba97978cbdb58a872
+  data.tar.gz: 5a26102b3cd126a565ddbe479c10c30ac99e36c1675a088229b5fd3b09965e2387fad2b9fe219819764bb482496468b5e7ba4ccc59856d62114aa33a2b4b57e3

data/app/models/motor/audit.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-module Motor
-  class Audit < Audited::Audit
-    self.table_name = 'motor_audits'
+unless defined?(Motor::Audit)
+  module Motor
+    class Audit < Audited::Audit
+      self.table_name = 'motor_audits'
 
-    if Rails.version.to_f >= 7.2
-      superclass.abstract_class = true
-    end
+      if Rails.version.to_f >= 7.2
+        superclass.abstract_class = true
+      end
 
-    if Rails.version.to_f >= 7.1
-      serialize :audited_changes, coder: HashSerializer
-    else
-      serialize :audited_changes, HashSerializer
+      if Rails.version.to_f >= 7.1
+        serialize :audited_changes, coder: HashSerializer
+      else
+        serialize :audited_changes, HashSerializer
+      end
     end
   end
 end

data/lib/motor/resources/fetch_configured_model.rb

@@ -110,15 +110,27 @@ module Motor
 
         columns = Resources::CustomSqlColumnsCache.call(config[:custom_sql])
 
+        base_column = klass.connection.schema_cache.columns_hash(klass.table_name).first.last
+
         columns_hash =
           columns.each_with_object({}) do |column, acc|
             acc[column[:name]] =
-              ActiveRecord::ConnectionAdapters::Column.new(
-                column[:name],
-                nil,
-                ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: column[:column_type],
-                                                                      type: column[:column_type].to_sym)
-              )
+              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
           end
 
         klass.instance_variable_set(:@__motor_custom_sql_columns_hash, columns_hash)

data/lib/motor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.33
+  version: 0.4.34
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload