pg_inheritance 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78df89fa727c1c8148e62de7f68cd62551c194b8d8052e1ffbfbce7c55a2c0d8
-  data.tar.gz: 6da79709df0ea92f719a3728ef71c0f164d54928e17f31cf80eea762caed1bb7
+  metadata.gz: 78bb787b636e2a7b0342c0a36e3fbca1ae71044d5c05c379700488887d7f7499
+  data.tar.gz: e215f62437672a866713dee32bf2bca85122ab0967e7fe5bd9916fd4137cf839
 SHA512:
-  metadata.gz: f0d417385e9a064b20f4019674963a333a570e1dd5f9376ec8a8e3bad881d14687cb0ac87a6462f27b842d6eb4468660896390c7dc420b18295cb3e18d47def6
-  data.tar.gz: c7b9757f36549c722977cbd8cd967f1d8ca2249374db1e1ac5e41e1f584671f8af9b1991fcc452b964f7e6fa274801f162d78415cbdb350e8c446831c9dd13cd
+  metadata.gz: eb4dbac1ff3b0f545e2b64756c0d2073b13c53709395d21df84f786f93bc745fac7aafbd83ed8fe7987053b28824adc88f33c040935d002b720694e8d4eaf507
+  data.tar.gz: 8fa062de839c825c5bca5ed1c13dad4cee543ee4d02315af21c8d121e21585a223d626ebd1a57d6dff7f0119095ed7c060816fffdfa8e9fe2bb1764f8294767d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_inheritance (0.1.0)
+    pg_inheritance (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -3,6 +3,10 @@
 
 # UNDER DEVELOPMENT
 
+## Supports
+
+Tested on ActiveRecord `5.x`, `6.x`.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -39,7 +43,7 @@ After migrations members has available both columns.
 
 ### Drop inheritance
 
-In your migration call drop_inheritance method. This has no options.
+In your migration call drop_inheritance method.
 
 ```ruby
 class DropMemberUsersInheritance < ActiveRecord::Migration
@@ -49,4 +53,8 @@ class DropMemberUsersInheritance < ActiveRecord::Migration
 end
 ```
 
-If inheritance exists this will be undeclared, but columns at inherited table will still be available. Otherwise will be raised an exception.
+#### Options
+
+* with_columns - if `true` then inherited columns will be dropped.
+
+If inheritance has not exists it raises an exception.

data/lib/pg_inheritance/active_record/inheritable.rb

@@ -5,16 +5,28 @@ module PGInheritance
     module Inheritable
       include PGInheritance::ActiveRecord::Parentable
 
-      def drop_inheritance(table_name, parent_name)
+      TIMESTAMP_COLUMNS = %w[created_at updated_at].freeze
+
+      def drop_inheritance(table_name, parent_name, **options)
         unless inherited?(table_name, parent_name)
           raise PGInheritance::TableNotInheritedError, "#{table_name} not inherited from #{parent_name}"
         end
 
-        execute(drop_inheritance_query(table_name, parent_name))
+        execute(drop_inheritance_query(table_name, parent_name)).tap do
+          drop_inherited_columns(table_name, parent_name) if options[:with_columns]
+        end
       end
 
       private
 
+      def drop_inherited_columns(table_name, parent_name)
+        cols_for_drop = columns_for_drop(table_name, parent_name)
+
+        return if cols_for_drop.empty?
+
+        execute(drop_columns_query(table_name, cols_for_drop))
+      end
+
       def inherited?(table_name, parent_name)
         parent_table(table_name) == parent_name.to_s
       end
@@ -22,6 +34,25 @@ module PGInheritance
       def drop_inheritance_query(table_name, parent_name)
         "ALTER TABLE #{table_name} NO INHERIT #{parent_name};"
       end
+
+      def drop_columns_query(table_name, columns)
+        sql = "ALTER TABLE #{table_name}"
+
+        columns_query = columns.map { |column| "DROP COLUMN IF EXISTS #{column}" }.join(', ')
+
+        sql + " #{columns_query};"
+      end
+
+      def columns_for_drop(table_name, parent_name)
+        child_cols = columns(table_name).map(&:name)
+        parent_cols = columns(parent_name).map(&:name)
+
+        (child_cols & parent_cols).tap do |cols|
+          TIMESTAMP_COLUMNS.each { |col| cols.delete(col) }
+
+          cols.delete(primary_key(table_name))
+        end
+      end
     end
   end
 end

data/lib/pg_inheritance/version.rb

@@ -1,3 +1,3 @@
 module PGInheritance
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Roman Kakorin