pg_inheritance 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3454653b6ac4bb6e19903d97a2b11152633aa1144bb0cd20057d78a4a159d450
-  data.tar.gz: cb3b501bc727184aa24a9e6ad709393ce9176064e1b54c9b10067f1a5a63b174
+  metadata.gz: 78df89fa727c1c8148e62de7f68cd62551c194b8d8052e1ffbfbce7c55a2c0d8
+  data.tar.gz: 6da79709df0ea92f719a3728ef71c0f164d54928e17f31cf80eea762caed1bb7
 SHA512:
-  metadata.gz: a0949d2e040c91860a5af00bae171f5882b07ef217dce52b4d33533340368abee6eacbe0075e28d665e630d7cab4786c7c75b5b5d19b5043e1eeab240cc65fff
-  data.tar.gz: bf92d2c81ad011834e44fd14a04ce1334d2fade2205d3f2b31d714fdb87a0ad81df4772bbbf059ee2ed17bd71456537507313345d7bd6b929c46658f7ac720ca
+  metadata.gz: f0d417385e9a064b20f4019674963a333a570e1dd5f9376ec8a8e3bad881d14687cb0ac87a6462f27b842d6eb4468660896390c7dc420b18295cb3e18d47def6
+  data.tar.gz: c7b9757f36549c722977cbd8cd967f1d8ca2249374db1e1ac5e41e1f584671f8af9b1991fcc452b964f7e6fa274801f162d78415cbdb350e8c446831c9dd13cd

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+*.gem

data/README.md

@@ -1,10 +1,21 @@
 # PG Inheritance
-[![Build Status](https://travis-ci.com/sigmen/pg_inheritance.svg?branch=master)](https://travis-ci.com/sigmen/pg_inheritance)
+[![Gem Version](https://badge.fury.io/rb/pg_inheritance.svg)](https://badge.fury.io/rb/pg_inheritance) [![Build Status](https://travis-ci.com/sigmen/pg_inheritance.svg?branch=master)](https://travis-ci.com/sigmen/pg_inheritance)
 
 # UNDER DEVELOPMENT
 
-### Supported ORM
-* ActiveRecord 6.0+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'pg_inheritance'
+
+And then execute:
+
+    $ bundle install
+
+Or install with:
+
+    $ gem install pg_inheritance
 
 ### Migrations
 
@@ -17,7 +28,7 @@ class CreateMembers < ActiveRecord::Migration
       t.string :name
     end
 
-    create_table :members, inherited_from: :users do |t|
+    create_table :members, inherits: :users do |t|
       t.string :logo_url
     end
   end

data/lib/pg_inheritance/active_record/inheritable.rb

@@ -1,6 +1,10 @@
+require 'pg_inheritance/active_record/parentable'
+
 module PGInheritance
   module ActiveRecord
     module Inheritable
+      include PGInheritance::ActiveRecord::Parentable
+
       def drop_inheritance(table_name, parent_name)
         unless inherited?(table_name, parent_name)
           raise PGInheritance::TableNotInheritedError, "#{table_name} not inherited from #{parent_name}"
@@ -12,26 +16,12 @@ module PGInheritance
       private
 
       def inherited?(table_name, parent_name)
-        table_parents(table_name).any? { |x| x['relname'] == parent_name.to_s }
-      end
-
-      def table_parents(table_name)
-        execute(select_parents_query(table_name))
+        parent_table(table_name) == parent_name.to_s
       end
 
       def drop_inheritance_query(table_name, parent_name)
         "ALTER TABLE #{table_name} NO INHERIT #{parent_name};"
       end
-
-      def select_parents_query(table_name)
-        <<-SQL
-          SELECT pg_namespace.nspname, pg_class.relname
-          FROM pg_catalog.pg_inherits
-            INNER JOIN pg_catalog.pg_class ON (pg_inherits.inhparent = pg_class.oid)
-            INNER JOIN pg_catalog.pg_namespace ON (pg_class.relnamespace = pg_namespace.oid)
-          WHERE inhrelid = '#{table_name}'::regclass
-        SQL
-      end
     end
   end
 end

data/lib/pg_inheritance/active_record/parentable.rb

@@ -0,0 +1,26 @@
+module PGInheritance
+  module ActiveRecord
+    module Parentable
+      def parent_table(table_name)
+        result = execute(select_parents_query(table_name))
+
+        return unless result.any?
+
+        result.first['relname']
+      end
+
+      private
+
+      def select_parents_query(table_name)
+        <<-SQL
+          SELECT pg_namespace.nspname, pg_class.relname
+          FROM pg_catalog.pg_inherits
+          INNER JOIN pg_catalog.pg_class ON (pg_inherits.inhparent = pg_class.oid)
+          INNER JOIN pg_catalog.pg_namespace ON (pg_class.relnamespace = pg_namespace.oid)
+          WHERE inhrelid = '#{table_name}'::regclass
+          LIMIT 1
+        SQL
+      end
+    end
+  end
+end

data/lib/pg_inheritance/active_record/schema_dumper.rb

@@ -0,0 +1,72 @@
+module PGInheritance
+  module ActiveRecord
+    module SchemaDumper
+      def table(child_table, stream)
+        return if dumped_tables.include?(child_table)
+
+        new_stream = StringIO.new
+
+        super(child_table, new_stream)
+
+        string = new_stream.string
+        parent_table = @connection.parent_table(child_table)
+
+        if parent_table
+          string = handle_parent(parent_table, child_table, stream, string)
+        end
+
+        dumped_tables << child_table
+
+        stream.tap { |s| s.write(string) }
+      end
+
+      private
+
+      def dumped_tables
+        @dumped_tables ||= []
+      end
+
+      def handle_parent(parent_table, child_table, stream, string)
+        table(parent_table, stream)
+
+        string = inject_inherits_for_create_table(string, child_table, parent_table)
+        string = remove_parent_table_columns(string, @connection.columns(parent_table))
+
+        parent_indexes = @connection.indexes(parent_table).map { |index| [index.name, index] }.to_h
+        child_indexes = @connection.indexes(child_table).map { |index| [index.name, index] }.to_h
+
+        intersected_index_names = parent_indexes.keys & child_indexes.keys
+
+        remove_parent_table_indexes(string, parent_indexes.slice(*intersected_index_names))
+      end
+
+      def inject_inherits_for_create_table(string, table, parent_table)
+        tbl_start = "create_table #{remove_prefix_and_suffix(table).inspect}"
+        tbl_end = ' do |t|'
+        tbl_inherit = ", inherits: '#{parent_table}'"
+
+        string.gsub!(/#{Regexp.escape(tbl_start)}.*#{Regexp.escape(tbl_end)}/, tbl_start + tbl_inherit + tbl_end)
+      end
+
+      def remove_parent_table_columns(string, columns)
+        columns.each do |col|
+          string.gsub!(/\s+t\.\w+\s+("|')#{col.name}("|').*/, '')
+        end
+
+        string
+      end
+
+      def remove_parent_table_indexes(string, indexes)
+        indexes.each do |index|
+          string.gsub!(/\s+t\.index.*("|')#{index.name}("|').*/, '')
+        end
+
+        string
+      end
+
+      def remove_prefix_and_suffix(table)
+        table.gsub(/^(#{::ActiveRecord::Base.table_name_prefix})(.+)(#{::ActiveRecord::Base.table_name_suffix})$/, '\\2')
+      end
+    end
+  end
+end

data/lib/pg_inheritance/active_record/schema_statements.rb

@@ -5,10 +5,12 @@ module PGInheritance
     module SchemaStatements
       include PGInheritance::ActiveRecord::Inheritable
 
+      INDEX_OPTIONS = %i[unique using where orders name].freeze
+
       def create_table(table_name, options = {})
-        inherited_table = options.delete(:inherited_from)
+        parent_table = options.delete(:inherits)
 
-        prepare_options(inherited_table, options)
+        prepare_options(parent_table, options)
 
         table_name = prepare_table_name(table_name, options)
 
@@ -23,7 +25,7 @@ module PGInheritance
       end
 
       def remove_pk_option(options)
-        return unless options[:inherited_from]
+        return unless options[:inherits]
 
         options[:id] = false
         options.delete(:primary_key)

data/lib/pg_inheritance/railtie.rb

@@ -1,4 +1,5 @@
 require 'pg_inheritance/active_record/schema_statements'
+require 'pg_inheritance/active_record/schema_dumper'
 
 module PGInheritance
   class Railtie < Rails::Railtie
@@ -7,6 +8,8 @@ module PGInheritance
         adapter_klass = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
 
         adapter_klass.prepend(PGInheritance::ActiveRecord::SchemaStatements)
+
+        ::ActiveRecord::SchemaDumper.prepend(PGInheritance::ActiveRecord::SchemaDumper)
       end
     end
   end

data/lib/pg_inheritance/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_inheritance
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roman Kakorin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,8 @@ files:
 - bin/setup
 - lib/pg_inheritance.rb
 - lib/pg_inheritance/active_record/inheritable.rb
+- lib/pg_inheritance/active_record/parentable.rb
+- lib/pg_inheritance/active_record/schema_dumper.rb
 - lib/pg_inheritance/active_record/schema_statements.rb
 - lib/pg_inheritance/railtie.rb
 - lib/pg_inheritance/version.rb