active_record-mti 0.4.0.pre.1 → 0.4.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e639bd5df85ba2ea0f83ed1b43b4429dd1a40ee627e2a43e17d329ce64c85486
-  data.tar.gz: 7c2103fc368f13f065a2004accfe8f0b83808446c12cc074c30b5bc588bb8f81
+  metadata.gz: 7c8aad5e387fec209700a57d5366938eaa5149b5436d10b3c6a859f75b7c7716
+  data.tar.gz: b060126c06310a40843a64652eb11ff821ac4aaadce5a48f203cc801146f905a
 SHA512:
-  metadata.gz: b19553d393bf02d1292215d8d36bacdddb8d1f5901e8e0e184a4a3cb0e9b488c8d6f73fe9c827ad306742b60c206f6f55cd87641d455b7937eaaf0a1496905ed
-  data.tar.gz: ab4c52d72f15bef11c1ed261546bd43175a6f7a084e5b29f31c8cdf0bd3d0dd1de2ad8f2e67b5653baff6b8a783b7ce1d290a3400ec192d3623fd7256658d037
+  metadata.gz: d055ffae44af8954bd1eeb9ddc60f7611b9dd2596e44bc96096858a68731eb42030269db6e3e5b3f1a5ead71acbbf6ec1a17500c7ae7410225febeb7af285d96
+  data.tar.gz: '04865157eb1a894b3867a3c2b536838a56f600779178b799e2fb034dfd60e3476a5cf8e5a9d6aa6c8723f02a8a48feaf2b489c59375d946257b589ac301fb6ef'

data/README.md

@@ -73,19 +73,6 @@ Conventionally—to indicate the nature of inheritance—`ActiveRecord::MTI` exp
 
 Note, `ActiveRecord::MTI` will fall back on the unnested `table_name` if it's unable to find the nested form, and short of that, it will use the superclass's `table_name`.
 
-### Configuration
-`ActiveRecord::MTI` can be configured using a configure block.
-
-```ruby
-# config/initializers/active_record_mti.rb
-
-ActiveRecord::MTI.configure do |config|
-  config.table_name_nesting = true
-  config.nesting_seperator = '/'
-  config.singular_parent = true
-end
-```
-
 ### Migrations
 
 In your migrations define a table to inherit from another table:

data/lib/active_record/mti.rb

@@ -2,7 +2,6 @@ require 'active_record/mti/version'
 require 'active_record/mti/railtie' if defined?(Rails::Railtie)
 
 require 'registry'
-require 'active_record/mti/config'
 require 'active_record/mti/table'
 require 'core_ext/thread'
 

data/lib/active_record/mti/connection_adapters/postgresql/schema_statements.rb

@@ -18,37 +18,43 @@ module ActiveRecord
           # we manually add it.  Lastly we also create indexes on the child table to match those
           # on the parent table since indexes are also not inherited.
           def create_table(table_name, options = {})
-            if options[:inherits]
+            if (inherited_table = options.delete(:inherits))
               options[:id] = false
               options.delete(:primary_key)
-            end
-
-            if (inherited_table = options.delete(:inherits))
-              # options[:options] = options[:options].sub("INHERITS", "() INHERITS") if td.columns.empty?
               options[:options] = [%(INHERITS ("#{inherited_table}")), options[:options]].compact.join
             end
 
-            results = super(table_name, options)
+            super(table_name, options) do |td|
+              yield(td) if block_given?
 
-            if inherited_table
-              inherited_table_primary_key = primary_key(inherited_table)
-              execute %(ALTER TABLE "#{table_name}" ADD PRIMARY KEY ("#{inherited_table_primary_key}"))
+              fix_inherits_statement(td) if inherited_table
+            end.tap do |result|
+              inherit_indexes(table_name, inherited_table) if inherited_table
+            end
+          end
 
-              indexes(inherited_table).each do |index|
-                attributes = index_attributes(index)
+          def fix_inherits_statement(td)
+            if td.columns.empty? && ActiveRecord.version >= Gem::Version.new('5.0')
+              td.options.gsub!('INHERITS', '() INHERITS')
+            end
+          end
+
+          def inherit_indexes(table_name, inherited_table)
+            inherited_table_primary_key = primary_key(inherited_table)
+            execute %(ALTER TABLE "#{table_name}" ADD PRIMARY KEY ("#{inherited_table_primary_key}"))
 
-                # Why rails insists on being inconsistant with itself is beyond me.
-                attributes[:order] = attributes.delete(:orders)
+            indexes(inherited_table).each do |index|
+              attributes = index_attributes(index)
 
-                if (index_name = build_index_name(attributes.delete(:name), inherited_table, table_name))
-                  attributes[:name] = index_name
-                end
+              # Why rails insists on being inconsistant with itself is beyond me.
+              attributes[:order] = attributes.delete(:orders)
 
-                add_index table_name, index.columns, attributes
+              if (index_name = build_index_name(attributes.delete(:name), inherited_table, table_name))
+                attributes[:name] = index_name
               end
-            end
 
-            results
+              add_index table_name, index.columns, attributes
+            end
           end
 
           def index_attributes(index)

data/lib/active_record/mti/relation.rb

@@ -4,37 +4,6 @@ module ActiveRecord
   module MTI
     module Relation
 
-      # Consider using a join to avoid complicated selects?
-      # Maybe each "mti" belongs_to :mti_table foreign_key: :tableoid?
-      # SELECT p.relname, c.name, c.altitude
-      # FROM cities c, pg_class p
-      # WHERE c.altitude > 500 AND c.tableoid = p.oid;
-
-
-      # TODO: Introduce natural joins
-      # https://dba.stackexchange.com/questions/94050/query-parent-table-and-get-child-tables-columns
-      # EXPLAIN ANALYSE SELECT * FROM ONLY listeners NATURAL FULL JOIN "listeners/bridge";
-
-      # EXPLAIN ANALYSE SELECT * FROM "listeners/bridge";
-
-      # EXPLAIN ANALYSE SELECT * FROM listeners;
-
-      # EXPLAIN ANALYSE SELECT * FROM ONLY listeners
-      #   NATURAL FULL JOIN "listeners/bridge"
-      #   NATURAL FULL JOIN "listeners/integration"
-      #   NATURAL FULL JOIN "listeners/nest_thermostat"
-      #   NATURAL FULL JOIN "listeners/sensor"
-      #   NATURAL FULL JOIN "listeners/system"
-      #   NATURAL FULL JOIN "listeners/system_users"
-      #   NATURAL FULL JOIN "listeners/user";
-
-      # table_name = mti_table.name
-      # scope :naturally, -> {
-      #   descendants.inject(only) { |ar|
-      #     ar.join
-      #   }
-      # }
-
       def build_arel(*)
         super.tap do |ar|
           build_mti(ar)
@@ -58,8 +27,8 @@ module ActiveRecord
         case projection
         when Arel::Attributes::Attribute
           projection.relation.name == klass.table_name && projection.name.to_s == 'tableoid'
-        # when Arel::Nodes::As
-        #   tableoid_projection?(projection.left)
+        when Arel::Nodes::As
+          tableoid_projection?(projection.left)
         when Arel::Nodes::SqlLiteral
           projection == 'tableoid'
         else
@@ -67,14 +36,6 @@ module ActiveRecord
         end
       end
 
-      # def exclusively(tables=[klass])
-      #   @table = table.dup.tap do |t|
-      #     t.only!
-      #   end
-      #   binding.pry
-      #   self
-      # end
-
       private
 
       def perform_calculation(*)

data/lib/active_record/mti/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MTI
-    VERSION = '0.4.0-1'.freeze
+    VERSION = '0.4.0-2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.1
+  version: 0.4.0.pre.2
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -161,7 +161,6 @@ files:
 - LICENSE
 - README.md
 - lib/active_record/mti.rb
-- lib/active_record/mti/config.rb
 - lib/active_record/mti/connection_adapters/postgresql/adapter.rb
 - lib/active_record/mti/connection_adapters/postgresql/schema_statements.rb
 - lib/active_record/mti/core_extension.rb
@@ -169,9 +168,7 @@ files:
 - lib/active_record/mti/relation.rb
 - lib/active_record/mti/schema_dumper.rb
 - lib/active_record/mti/table.rb
-- lib/active_record/mti/table_oid.rb
 - lib/active_record/mti/version.rb
-- lib/core_ext/array.rb
 - lib/core_ext/hash.rb
 - lib/core_ext/thread.rb
 homepage: https://github.com/twilightcoders/active_record-mti
@@ -195,7 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Multi Table Inheritance for PostgreSQL in Rails

data/lib/active_record/mti/config.rb

@@ -1,26 +0,0 @@
-module ActiveRecord
-  module MTI
-    class << self
-      attr_accessor :configuration
-    end
-
-    DEFAULT_CONFIG = {
-      table_name_nesting: true,
-      nesting_seperator: '/',
-      singular_parent: true,
-      prefix_parent: true,
-      suffix_parent: false,
-      namespace_depth: 0 # -1 for all
-    }
-
-    def self.reset_configuration
-      self.configuration = OpenStruct.new(DEFAULT_CONFIG)
-    end
-
-    self.reset_configuration
-
-    def self.configure
-      yield(configuration)
-    end
-  end
-end

data/lib/active_record/mti/table_oid.rb

@@ -1,6 +0,0 @@
-module ActiveRecord
-  module MTI
-    module TableOID
-    end
-  end
-end

data/lib/core_ext/array.rb

@@ -1,14 +0,0 @@
-Array.class_eval do
-
-  alias_method :join_original, :join
-  def join(separator=$,)
-    if block_given?
-      inject(String.new) do |collector, item|
-        collector << yield(item).to_s + separator
-      end.chomp(separator)
-    else
-      join_original(separator)
-    end
-  end
-
-end