motor-admin 0.4.32 → 0.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d575b62467d856f7458dbd4780874c4fedbf16f73a21c7e1311cfed705d4f5
-  data.tar.gz: c186b45675f5596f58e1ac5741861945f91c5a32bb3d3b3ccf348fe18295ec6d
+  metadata.gz: b8c50645e3228b532c70c3455ed170c59c21d7e69f5a0170f13c43174fe6e0c9
+  data.tar.gz: 3a50a9787112c88af0a5f39ebc2cb23394f240f694ea8a335641456ab64669d2
 SHA512:
-  metadata.gz: 911204a500ef90741cb9e055850a54a5326fef55e2f5e2785c8818ef90f706604c6f798fc34a7a175da1ddd7324eee50cb35f2a13b69b575371b1b34a5469682
-  data.tar.gz: 81baa7e705ee2e4e65aacc1a5ea53f49df337188a2378beb411c0bff7ca7e43fb40e130d82dce3ccd50e85d76e116abd8eda932f6eaee1f531a6f8f653c3f291
+  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/queries/postgresql_exec_query.rb

@@ -6,21 +6,30 @@ module Motor
       module_function
 
       def call(conn, statement)
-        conn.send(:execute_and_clear, *statement) do |result|
-          types = {}
-          fields = result.fields
-
-          fields.each_with_index do |fname, i|
-            ftype = result.ftype i
-            fmod  = result.fmod i
-            types[fname] = conn.send(:get_oid_type, ftype, fmod, fname)
+        if Rails.version.to_f >= 8.0
+          result = conn.send(:internal_execute, *statement)
+          process_result(conn, result)
+        else
+          conn.send(:execute_and_clear, *statement) do |result|
+            process_result(conn, result)
           end
+        end
+      end
 
-          if conn.respond_to?(:build_result, true)
-            conn.send(:build_result, columns: fields, rows: result.values, column_types: types)
-          else
-            ActiveRecord::Result.new(fields, result.values, types)
-          end
+      def process_result(conn, result)
+        types = {}
+        fields = result.fields
+
+        fields.each_with_index do |fname, i|
+          ftype = result.ftype i
+          fmod  = result.fmod i
+          types[fname] = conn.send(:get_oid_type, ftype, fmod, fname)
+        end
+
+        if conn.respond_to?(:build_result, true)
+          conn.send(:build_result, columns: fields, rows: result.values, column_types: types)
+        else
+          ActiveRecord::Result.new(fields, result.values, types)
         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.32'
+  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.32
+  version: 0.4.34
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload