active_record-mti 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184ec1c49f5ccb8a375f7780684e265bb4132b13
-  data.tar.gz: 74679030c66bf141020f7e58c4aed0597cc83dd6
+  metadata.gz: cf67d3c346558b94eeaf4b68d354e4f29bcaa0b4
+  data.tar.gz: 29beb0dfeb868e4333add080161327582940ecf0
 SHA512:
-  metadata.gz: 9e9d8a6e8f9b116529d648bed2893e8cf85f5c479791362d5dcd903fd502d012557dc8f1f46c4953e4fe0a2c6a982197efa3bf3bc52f46c8661adf788026bbb3
-  data.tar.gz: b78dac12e338c6cb5d236efb59486b34dae3280902097b5daa03eb297513ab9eaff8e61619cec283c97acc56b818ad6e411460bd5fd42d4ade2f6e0b59c705e4
+  metadata.gz: ad4df7d52b11712e43a283d2e9008c7611f8bc7b96ae1545693e04a002fe694e38f7959b7f04f9fcf4aea76a0e9f8dfb110389b6fa6252ee001b636878706673
+  data.tar.gz: 5ea3c7c73e457bc10f16c69cc4b2a1f53b02f8c904e5cf7ccefb58ec568f4de6079bf2cebd1d512f62ad3940dc0129700ee0901e6e0040274f8356e91ba2f43e

data/lib/active_record/mti/inheritance.rb

@@ -33,12 +33,7 @@ module ActiveRecord
 
       module ClassMethods
 
-        def inherited(child)
-          super
-        end
-
-        def uses_mti(table_name = nil, inheritance_column = nil)
-          # self.table_name ||= table_name
+        def uses_mti(custom_table_name = nil, inheritance_column = nil)
           self.inheritance_column = inheritance_column
 
           @uses_mti = true
@@ -49,7 +44,8 @@ module ActiveRecord
         end
 
         def uses_mti?
-          @uses_mti ||= check_inheritence_of(@table_name)
+          @uses_mti = check_inheritence_of(@table_name) if @uses_mti.nil?
+          @uses_mti
         end
 
         private
@@ -58,16 +54,21 @@ module ActiveRecord
           return nil unless table_name
 
           result = connection.execute <<-SQL
-            SELECT EXISTS ( SELECT 1
-            FROM pg_catalog.pg_inherits
-            WHERE inhrelid = 'public.#{table_name}'::regclass::oid
-            OR inhparent = 'public.#{table_name}'::regclass::oid);
+            SELECT EXISTS (
+              SELECT 1
+              FROM      pg_catalog.pg_inherits AS i
+              LEFT JOIN pg_catalog.pg_rewrite  AS r    ON r.ev_class = 'public.#{table_name}'::regclass::oid
+              LEFT JOIN pg_catalog.pg_depend   AS d    ON d.objid    = r.oid
+              LEFT JOIN pg_catalog.pg_class    AS cl_d ON cl_d.oid   = d.refobjid
+              WHERE inhrelid  = COALESCE(cl_d.relname, 'public.#{table_name}')::regclass::oid
+              OR    inhparent = COALESCE(cl_d.relname, 'public.#{table_name}')::regclass::oid
+            );
           SQL
 
           # Some versions of PSQL return {"?column?"=>"t"}
-          # instead of {"first"=>"t"}, so we're saying screw it,
+          # instead of {"exists"=>"t"}, so we're saying screw it,
           # just give me the first value of whatever is returned
-          result.try(:first).try(:values).try(:first) == 't'
+          return result.try(:first).try(:values).try(:first) == 't'
         end
 
         # Called by +instantiate+ to decide which class to use for a new

data/lib/active_record/mti/model_schema.rb

@@ -30,7 +30,6 @@ module ActiveRecord
 
             "#{full_table_name_prefix}#{contained}#{undecorated_table_name(name)}#{full_table_name_suffix}"
           elsif uses_mti?
-
             # Nested classes are prefixed with singular parent table name.
             if superclass < Base && !superclass.abstract_class?
               contained = superclass.table_name

data/lib/active_record/mti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg