active_record-log_deleted 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffe9549ed5ab620b57a5a098fa369263c52236749b186671c30c1afd9a1ac1e
-  data.tar.gz: 7dcefc7b5d7d93148882267ec67a7ca276856743da9a5b4b0ebd519d6730b3f2
+  metadata.gz: 4d3963d533092074a82f0c722825e1c662a6f2a67d3e75b62aca7b4533788497
+  data.tar.gz: 9c34203c31d671687ad0c960540f7df3717324d8b77eb8fb9dbcfba2284df2fe
 SHA512:
-  metadata.gz: 52ae0e41b2752475b49b64b8cd4b8c2748ce45638204a4f35faeeb70ed8be7c405999f75987683d007f929d376902afca1dae866e00d1b2de9dd492a5b7cdd55
-  data.tar.gz: 51b5e460988b8dedbb553e484cf55c3056f220e28320e8a223b9846e71c4fdbd31ab5aa0bebcb21511855d5c33d32fd80e73deea1b177d2ab6485abd6c24b874
+  metadata.gz: c61548f52359bd927ed2e7321b245f17a350a2720c9a586b00743cad3acf6a812a95d8dc2f20a5732d8967f772ca1d3ce62325a479ca4dfa79b295e628def8b1
+  data.tar.gz: fed8b70ab8963a72a648f8e80f08e52b4d06458caf2699c2e65904de72bea9f38af090ac72b12d246d9d2c25d4d6841df257b2572cb4b3504d18c5b133d01676

data/Gemfile.lock

@@ -1,98 +1,99 @@
 PATH
   remote: .
   specs:
-    active_record-log_deleted (0.1.0)
-      activerecord (>= 5.2, < 7.0)
+    active_record-log_deleted (0.3.0)
+      activerecord (>= 5.2, < 8.0)
       pg
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (7.0.0)
+      actionview (= 7.0.0)
+      activesupport (= 7.0.0)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (7.0.0)
+      activesupport (= 7.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activesupport (7.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     builder (3.2.4)
-    combustion (1.3.0)
+    combustion (1.3.5)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.3)
-    erubi (1.9.0)
-    i18n (1.8.3)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.5.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     pg (1.2.3)
-    rack (2.2.2)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (4.0.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
-    rspec-support (3.9.3)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.3)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -105,4 +106,4 @@ DEPENDENCIES
   rspec-rails
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/README.md

@@ -30,6 +30,7 @@ ActiveRecord::LogDeleted.configure do |config|
   config.deleted_rows_table_name = :deleted_rows
   config.log_deleted_row_function_name = :log_deleted_row
   config.log_deleted_row_trigger_name = :log_deleted_row_trigger
+  config.support_uuids = true
 end
 ```
 

data/active_record-log_deleted.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "combustion"
   spec.add_development_dependency "rspec-rails"
 
-  spec.add_runtime_dependency "activerecord", ">= 5.2", "< 7.0"
+  spec.add_runtime_dependency "activerecord", ">= 5.2", "< 8.0"
   spec.add_runtime_dependency "pg"
 end

data/lib/active_record/log_deleted/configuration.rb

@@ -1,12 +1,18 @@
 module ActiveRecord
   module LogDeleted
     class Configuration
-      attr_reader :deleted_rows_table_name, :log_deleted_row_function_name, :log_deleted_row_trigger_name
+      attr_reader(
+        :deleted_rows_table_name,
+        :log_deleted_row_function_name,
+        :log_deleted_row_trigger_name,
+        :support_uuids
+      )
 
       def initialize
         @deleted_rows_table_name = :deleted_rows
         @log_deleted_row_function_name = :log_deleted_row
         @log_deleted_row_trigger_name = :log_deleted_row_trigger
+        @support_uuids = true
       end
 
       def deleted_rows_table_name=(name)
@@ -21,6 +27,10 @@ module ActiveRecord
         @log_deleted_row_trigger_name = sanitize(name)
       end
 
+      def support_uuids=(value)
+        @support_uuids = value
+      end
+
       private
 
       def sanitize(value)

data/lib/active_record/log_deleted/postgresql_adapter.rb

@@ -4,10 +4,11 @@ module ActiveRecord
   module LogDeleted
     module PostgreSQLAdapter
       def create_deleted_rows_table
+        old_primary_key_type = configuration.support_uuids ? :string : :bigint
         create_table deleted_rows_table_name do |t|
           t.datetime :created_at, comment: 'The datetime at which the record was created.'
           t.text :old_row_json, comment: 'JSON with the entire row that was hard deleted.'
-          t.string :primary_key, comment: 'The primary key of the row which was hard deleted.'
+          t.send old_primary_key_type, :primary_key, comment: 'The primary key of the row which was hard deleted.'
           t.string :table_name, limit: 255, comment: 'The table name from which the row was hard deleted.'
         end
       end
@@ -22,7 +23,7 @@ module ActiveRecord
             BEGIN
               INSERT INTO
                 deleted_rows(table_name, primary_key, old_row_json, created_at)
-                  VALUES (TG_TABLE_NAME, OLD.id::varchar, ROW_TO_JSON(OLD), now());
+                  VALUES (TG_TABLE_NAME, #{old_primary_key('OLD')}, ROW_TO_JSON(OLD), now());
               RETURN OLD;
             END;
           $$ LANGUAGE plpgsql;
@@ -30,7 +31,9 @@ module ActiveRecord
       end
 
       def drop_log_deleted_row_function
-        execute "DROP FUNCTION #{log_deleted_row_function_name};"
+        execute <<~SQL
+          DROP FUNCTION IF EXISTS #{log_deleted_row_function_name}();
+        SQL
       end
 
       def create_deleted_row_trigger(table_name)
@@ -47,6 +50,12 @@ module ActiveRecord
 
       private
 
+      def old_primary_key(table)
+        value = "#{table}.id"
+        value += '::varchar' if configuration.support_uuids
+        value
+      end
+
       def log_deleted_row_trigger_name
         configuration.log_deleted_row_trigger_name
       end

data/lib/active_record/log_deleted/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module LogDeleted
-    VERSION = "0.1.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/active_record/log_deleted.rb

@@ -18,7 +18,7 @@ module ActiveRecord
     end
 
     def self.configure
-      yield(@configuration)
+      yield(configuration)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-log_deleted
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - matthew fong
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ metadata:
   homepage_uri: https://github.com/hoverinc/active_record-log_deleted
   source_code_uri: https://github.com/hoverinc/active_record-log_deleted
   changelog_uri: https://github.com/hoverinc/active_record-log_deleted/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: ActiveRecord migration methods for logging deleted records
 test_files: []