active_record-log_deleted 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffe9549ed5ab620b57a5a098fa369263c52236749b186671c30c1afd9a1ac1e
-  data.tar.gz: 7dcefc7b5d7d93148882267ec67a7ca276856743da9a5b4b0ebd519d6730b3f2
+  metadata.gz: 9803c59ea8139a5646a2979a295568dba8c1235b6647cb2a5bafcb74c4b0f83e
+  data.tar.gz: 2b082ff16bc9743acc0ede7d40bc2996bbfce2b376a08b1ed1c4dd422b04f59f
 SHA512:
-  metadata.gz: 52ae0e41b2752475b49b64b8cd4b8c2748ce45638204a4f35faeeb70ed8be7c405999f75987683d007f929d376902afca1dae866e00d1b2de9dd492a5b7cdd55
-  data.tar.gz: 51b5e460988b8dedbb553e484cf55c3056f220e28320e8a223b9846e71c4fdbd31ab5aa0bebcb21511855d5c33d32fd80e73deea1b177d2ab6485abd6c24b874
+  metadata.gz: 2d7554dbbd905fe085ccbee112b2a5027a0b841ba9e4eacf59cf249fbfb45b80e873247b1ba0da2aa0d1138d10363b933f5e6fcd8756fc0fbaaf99cdb6ac173e
+  data.tar.gz: 9efee34f63b94c1c3f7be395026494f859edd85c9b9671c5d921d0aa41d9c8f6b1b1ab136058bea5a14917b667b850815a2a467684974e782d45b62209dc05fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_record-log_deleted (0.1.0)
+    active_record-log_deleted (0.2.0)
       activerecord (>= 5.2, < 7.0)
       pg
 

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.2.0"
   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.2.0
 platform: ruby
 authors:
 - matthew fong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake