better_record 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aaabec32e93503cc3280479fb33a4b4e56ec33887ce430592730c6a42f61389
-  data.tar.gz: a02c353a6fa6a392c15cb8bed0710d5a49ee79c617db866e69c46974d4b23074
+  metadata.gz: f29175178880d4a7a9cf33d526c4413306e20fbdc3475ff3e29c5d8aaa6e9402
+  data.tar.gz: 88684f5a4f39fb50bcd3ddac3bd6578bdd9a2ff2f0b3f7910dec6ec22160ba47
 SHA512:
-  metadata.gz: 96baad4e4a3813d71771bec10b5432f6bdb0bdea299c77a137ceae5cebe2ddb1ac64f1535e0cd8a3a756841b3ce57700d2e88a0cb9fe1de8c27bd31f7dbff3ef
-  data.tar.gz: a173fe808cacd7ccc6ee502a8cc8e05a156bf40001071e867a668948a976891177fd49ff47a24edd302d4221443106400451c1cc22e8d6a8a2659710ba048631
+  metadata.gz: 3f4cca4564a0009bd7c952b4f34f24afeb5aea6e94ac2501776685834f5fd71b1c369f60e15900330d44e9fa0a98b2b34a841cd5421f60bceec86311c5770666
+  data.tar.gz: 8e00305d1efc5f7f795e57e0961165b6fcc7b69834367854b78a81c67c13d4162554fe6461809d9e035a06cf2a1147a2e3910d9e9d0d9c42b52545013a589b89

data/app/models/better_record/base.rb

@@ -24,13 +24,23 @@ module BetterRecord
 
     # == Class Methods ========================================================
     def self.set_audit_methods!
-      m = __send__ BetterRecord.audit_relation_name, 'SETTING_INHERITANCE'
+      begin
+        connection.execute(%Q(SELECT 1 FROM #{BetterRecord::LoggedAction.table_name}_#{self.table_name} LIMIT 1))
+
+        self.const_set(:LoggedAction, Class.new(ApplicationRecord))
+        self.const_get(:LoggedAction).table_name = "#{BetterRecord::LoggedAction.table_name}_#{self.table_name}"
+      rescue ActiveRecord::StatementInvalid
+        self.const_set(:LoggedAction, BetterRecord::LoggedAction)
+      end
+
       self.has_many self.audit_relation_name,
-        class_name: m.to_s,
+        class_name: "#{self.to_s}::LoggedAction",
         primary_type: :table_name,
         foreign_key: :row_id,
         foreign_type: :table_name,
         as: self.audit_relation_name
+
+      self
     end
 
     def self.gender_enum(col)
@@ -75,23 +85,14 @@ module BetterRecord
 
       class << self
         define_method BetterRecord.audit_relation_name do |*args, &block|
-          @logger_model ||=
+          lm =
             begin
-              connection.execute(%Q(SELECT 1 FROM #{BetterRecord::LoggedAction.table_name}_#{self.table_name} LIMIT 1))
-
-              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
-                self.table_name = "#{BetterRecord::LoggedAction.table_name}_#{self.to_s.deconstantize.constantize.table_name}"
-                self
-              end
-            rescue ActiveRecord::StatementInvalid
-              class self.to_s.constantize::LoggedAction < BetterRecord::LoggedAction
-                self
-              end
+              self.const_get(:LoggedAction)
+            rescue NameError
+              BetterRecord::LoggedAction
             end
 
-          return @logger_model if args.present? && args.first == 'SETTING_INHERITANCE'
-
-          base_q = @logger_model.where(table_name: self.table_name)
+          base_q = lm.where(table_name: self.table_name)
           base_q = base_q.where(*args) if args.present?
 
           if block

data/db/migrate/20190209033946_update_better_record_audit_functions.rb

@@ -77,27 +77,29 @@ class UpdateBetterRecordAuditFunctions < ActiveRecord::Migration[5.2]
     puts "\n\nTo insert old audits back into logged_actions run:\n\n"
 
     puts <<-RUBY
-      class BetterRecord::OldLoggedAction < BetterRecord::LoggedAction
+      class BetterRecord::OldLoggedAction < BetterRecord::Base
         self.table_name = "#{BetterRecord.db_audit_schema}.old_logged_actions"
       end
 
+      table_list = {}
+
       while BetterRecord::OldLoggedAction.count > 0
         p BetterRecord::OldLoggedAction.count
-        BetterRecord::OldLoggedAction.order(:event_id).limit(100).each do |r|
-          klass = nil
-          begin
-            BetterRecord::LoggedAction.connection.execute(%Q(SELECT 1 FROM #{BetterRecord.db_audit_schema}.logged_actions_#\{r.table_name}))
+        BetterRecord::OldLoggedAction.order(:event_id).limit(1500).each do |r|
+          unless table_list[r.table_name]
+            begin
+              BetterRecord::LoggedAction.connection.execute(%Q(SELECT 1 FROM #{BetterRecord.db_audit_schema}.logged_actions_#\{r.table_name}))
 
-            klass = Class.new(BetterRecord::LoggedAction)
-            klass.table_name = "#{BetterRecord.db_audit_schema}.logged_actions_#\{r.table_name}"
-            BetterRecord.const_set(:NewLoggedAction, klass)
-            BetterRecord::NewLoggedAction
-          rescue ActiveRecord::StatementInvalid
-            BetterRecord.const_set(:NewLoggedAction, nil)
-            klass = BetterRecord::LoggedAction
+              table_list[r.table_name] = Class.new(BetterRecord::Base)
+              table_list[r.table_name].table_name = "#{BetterRecord.db_audit_schema}.logged_actions_#\{r.table_name}"
+            rescue ActiveRecord::StatementInvalid
+              table_list[r.table_name] = BetterRecord::LoggedAction
+            end
           end
-          klass.create!(r.attributes)
-          p klass.count
+
+          BetterRecord.const_set(:NewLoggedAction, table_list[r.table_name])
+          BetterRecord::NewLoggedAction.new(r.attributes).save!(validate: false)
+          p BetterRecord::NewLoggedAction.count
           r.delete
         end
       end

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Sampson Crowley