active_record-mti 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf67d3c346558b94eeaf4b68d354e4f29bcaa0b4
-  data.tar.gz: 29beb0dfeb868e4333add080161327582940ecf0
+  metadata.gz: 83f66dc4e6bb45b2ca6a075be93334d2f9e761f3
+  data.tar.gz: 4e4f3ec52bf515e9d9ffdfaab67306b480bbbdd1
 SHA512:
-  metadata.gz: ad4df7d52b11712e43a283d2e9008c7611f8bc7b96ae1545693e04a002fe694e38f7959b7f04f9fcf4aea76a0e9f8dfb110389b6fa6252ee001b636878706673
-  data.tar.gz: 5ea3c7c73e457bc10f16c69cc4b2a1f53b02f8c904e5cf7ccefb58ec568f4de6079bf2cebd1d512f62ad3940dc0129700ee0901e6e0040274f8356e91ba2f43e
+  metadata.gz: 0d08825e3d3f51e944963bcf9cf64cf27c16a9b3319fe2ccd50022d26ece1f608cae5f23d6ea8576b2fc98c4859726e72ee39a544aad33d8ebf38b4621528efc
+  data.tar.gz: babb8e13a0371b408f3670059bb5482c4db455dd881c801c4ef1f62ddec542b36d79e0592a5e067a203cc3b2ee7b02e7fe9856bef3a0cc8aee1b1752f22cf696

data/README.md

@@ -1,4 +1,9 @@
-# ActiveRecord::MTI [![Build Status](https://travis-ci.org/TwilightCoders/active_record-mti.svg?branch=master)](https://travis-ci.org/TwilightCoders/active_record-mti) [![Code Climate](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/gpa.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti) [![Test Coverage](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti/coverage)
+[![Version      ](https://img.shields.io/gem/v/active_record-mti.svg?maxAge=2592000)](https://rubygems.org/gems/active_record-mti)
+[![Build Status ](https://travis-ci.org/TwilightCoders/active_record-mti.svg)](https://travis-ci.org/TwilightCoders/active_record-mti)
+[![Code Climate ](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/gpa.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti)
+[![Test Coverage](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti/coverage)
+
+# ActiveRecord::MTI
 
 Allows for true native inheritance of tables in PostgreSQL
 

data/active_record-mti.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'simplecov', ['>= 0.9.0', '<1.0.0']
+  spec.add_development_dependency 'simplecov', '~> 0.1'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.6'
 

data/lib/active_record/mti.rb

@@ -14,6 +14,17 @@ require 'active_record/mti/railtie' if defined?(Rails::Railtie)
 module ActiveRecord
   module MTI
 
+    class << self
+      attr_writer :logger
+
+      def logger
+        @logger ||= Logger.new($stdout).tap do |log|
+          log.progname = self.name
+          log.level = Logger::INFO
+        end
+      end
+    end
+
     def self.root
       @root ||= Pathname.new(File.expand_path('../../', File.dirname(__FILE__)))
     end

data/lib/active_record/mti/calculations.rb

@@ -102,7 +102,7 @@ module ActiveRecord
 
           # Remove our cast otherwise PSQL will insist that it be included in the GROUP
           # Somewhere between line 82 and 101 relation.arel.projections gets reset :/
-          relation.arel.projections.select!{ |p| p.to_s != tableoid_cast(klass) } if @klass.using_multi_table_inheritance?
+          relation.arel.projections.select!{ |p| p != tableoid_cast(klass) } if @klass.using_multi_table_inheritance?
 
           query_builder = relation.arel
           bind_values = query_builder.bind_values + relation.bind_values

data/lib/active_record/mti/inheritance.rb

@@ -24,6 +24,7 @@ module ActiveRecord
   module MTI
     module Inheritance
       extend ActiveSupport::Concern
+      @mti_tableoids = {}
 
       included do
         scope :discern_inheritance, -> {
@@ -37,6 +38,9 @@ module ActiveRecord
           self.inheritance_column = inheritance_column
 
           @uses_mti = true
+          @mti_setup = false
+          @mti_tableoid_projection = nil
+          @tableoid_column = nil
         end
 
         def using_multi_table_inheritance?(klass = self)
@@ -44,15 +48,31 @@ module ActiveRecord
         end
 
         def uses_mti?
-          @uses_mti = check_inheritence_of(@table_name) if @uses_mti.nil?
+          inheritence_check = check_inheritence_of(@table_name) unless @mti_setup
+          @uses_mti = inheritence_check if @uses_mti.nil?
           @uses_mti
         end
 
+        def has_tableoid_column?
+          @tableoid_column != false
+        end
+
+        def mti_tableoid_projection
+          @mti_tableoid_projection
+        end
+
+        def mti_tableoid_projection=(value)
+          @mti_tableoid_projection = value
+        end
+
         private
 
         def check_inheritence_of(table_name)
+          ActiveRecord::MTI.logger.debug "Trying to check inheritance of table with no table name (#{self})" unless table_name
           return nil unless table_name
 
+          ActiveRecord::MTI.logger.debug "Checking inheritance for #{table_name}"
+
           result = connection.execute <<-SQL
             SELECT EXISTS (
               SELECT 1
@@ -65,10 +85,40 @@ module ActiveRecord
             );
           SQL
 
+          uses_inheritence = result.try(:first).try(:values).try(:first) == 't'
+
+          register_tableoid(table_name, uses_inheritence)
+
+          @mti_setup = true
           # Some versions of PSQL return {"?column?"=>"t"}
           # instead of {"exists"=>"t"}, so we're saying screw it,
           # just give me the first value of whatever is returned
-          return result.try(:first).try(:values).try(:first) == 't'
+          return uses_inheritence
+        end
+
+        def register_tableoid(table_name, uses_mti=false)
+
+          tableoid_query = connection.execute(<<-SQL
+            SELECT '#{table_name}'::regclass::oid AS tableoid, (SELECT EXISTS (
+              SELECT 1
+              FROM   pg_catalog.pg_attribute
+              WHERE  attrelid = '#{table_name}'::regclass
+              AND    attname  = 'tableoid'
+              AND    NOT attisdropped
+            )) AS has_tableoid_column
+          SQL
+          ).first
+          tableoid = tableoid_query['tableoid']
+          @tableoid_column = tableoid_query['has_tableoid_column'] == 't'
+
+          if (has_tableoid_column?)
+            ActiveRecord::MTI.logger.debug "#{table_name} has tableoid column!"
+            @mti_tableoid_projection = arel_table[:tableoid].as('tableoid')
+          else
+            @mti_tableoid_projection = nil
+          end
+
+          Inheritance.add_mti(tableoid, self)
         end
 
         # Called by +instantiate+ to decide which class to use for a new
@@ -76,7 +126,7 @@ module ActiveRecord
         # for a +type+ column and return the corresponding class.
         def discriminate_class_for_record(record)
           if using_multi_table_inheritance?(base_class)
-            find_mti_class(record)
+            find_mti_class(record) || base_class
           elsif using_single_table_inheritance?(record)
             find_sti_class(record[inheritance_column])
           else
@@ -87,9 +137,11 @@ module ActiveRecord
         # Search descendants for one who's table_name is equal to the returned tableoid.
         # This indicates the class of the record
         def find_mti_class(record)
-          record['tableoid'].classify.constantize
-        rescue NameError => e
-          descendants.find(Proc.new{ self }) { |d| d.table_name == record['tableoid'] }
+          if (has_tableoid_column?)
+            Inheritance.find_mti(record['tableoid'])
+          else
+            self
+          end
         end
 
         # Type condition only applies if it's STI, otherwise it's
@@ -104,8 +156,16 @@ module ActiveRecord
             sti_column.in(sti_names)
           end
         end
+      end
 
+      def self.add_mti(tableoid, klass)
+        @mti_tableoids[tableoid.to_s.to_sym] = klass
       end
+
+      def self.find_mti(tableoid)
+        @mti_tableoids[tableoid.to_s.to_sym]
+      end
+
     end
   end
 end

data/lib/active_record/mti/query_methods.rb

@@ -6,8 +6,10 @@ module ActiveRecord
 
       # Retrieve the OID as well on a default select
       def build_select(arel)
-        arel.project(tableoid_cast(@klass)) if @klass.using_multi_table_inheritance?
-        # arel.project("\"#{klass.table_name}\".\"tableoid\"::regclass as \"#{klass.inheritance_column}\"") if @klass.using_multi_table_inheritance?
+        if @klass.using_multi_table_inheritance? && @klass.has_tableoid_column?
+          arel.project(tableoid_cast(@klass))
+        end
+
         if select_values.any?
           arel.project(*arel_columns(select_values.uniq))
         else
@@ -18,7 +20,7 @@ module ActiveRecord
       def tableoid_cast(klass)
         # Arel::Nodes::NamedFunction.new('CAST', [klass.arel_table[:tableoid].as('regclass')])
         # Arel::Nodes::NamedFunction.new('CAST', [@klass.arel_table['tableoid::regclass'].as('regclass')])
-        "TRIM(BOTH '\"' FROM CAST(\"#{klass.table_name}\".\"tableoid\"::regclass AS text)) AS tableoid"
+        @klass.mti_tableoid_projection
       end
 
     end

data/lib/active_record/mti/railtie.rb

@@ -4,7 +4,7 @@ module ActiveRecord
   module MTI
     class Railtie < Rails::Railtie
       initializer 'active_record-mti.load' do |_app|
-        puts "ActiveRecord::MTI railtie initializer"
+        ActiveRecord::MTI.logger.info "ActiveRecord::MTI railtie initializer"
         ActiveSupport.on_load(:active_record) do
           ActiveRecord::MTI.load
         end

data/lib/active_record/mti/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MTI
-    VERSION = '0.1.1'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -104,22 +104,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement