active_record-mti 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14d2c9a38a839510f0246918f467e58e592aef4
-  data.tar.gz: bf6e66c09163a3296f93befdbaf1fe7a3b043ad8
+  metadata.gz: 184ec1c49f5ccb8a375f7780684e265bb4132b13
+  data.tar.gz: 74679030c66bf141020f7e58c4aed0597cc83dd6
 SHA512:
-  metadata.gz: 7fb70a3c6492b2c70dd4a95198116a9a4dc3eb2e45f66ca5be70b38d5658a38fc39742d820320091b6f3411717ee23a1fca3eb71e362a95cb8dfe7f6803537ee
-  data.tar.gz: e1066d95c0fd0ebdf83fd7d2aded8de84c665829a71929c2e35bdb70b5b9dc7754ee4b11a1f126dac0f30f96a4440ad60fde724f813f624a8c5abc5baf6b22cf
+  metadata.gz: 9e9d8a6e8f9b116529d648bed2893e8cf85f5c479791362d5dcd903fd502d012557dc8f1f46c4953e4fe0a2c6a982197efa3bf3bc52f46c8661adf788026bbb3
+  data.tar.gz: b78dac12e338c6cb5d236efb59486b34dae3280902097b5daa03eb297513ab9eaff8e61619cec283c97acc56b818ad6e411460bd5fd42d4ade2f6e0b59c705e4

data/.gitignore

@@ -74,3 +74,4 @@ ehthumbs.db
 Thumbs.db
 /Gemfile.lock
 /coverage
+/.editorconfig

data/.travis.yml

@@ -14,7 +14,7 @@ after_success:
   - bundle exec codeclimate-test-reporter
 
 addons:
-  postgresql: "9.1"
+  postgresql: "9.3"
 
 env:
   - RSPEC_VERSION="<2.99"

data/active_record-mti.gemspec

@@ -37,7 +37,8 @@ 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 "codeclimate-test-reporter", "~> 1.0"
+  spec.add_development_dependency 'simplecov', ['>= 0.9.0', '<1.0.0']
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
+  spec.add_development_dependency 'database_cleaner', '~> 1.6'
 
 end

data/lib/active_record/mti.rb

@@ -7,6 +7,7 @@ require 'active_record/mti/model_schema'
 require 'active_record/mti/query_methods'
 require 'active_record/mti/calculations'
 require 'active_record/mti/connection_adapters/postgresql/schema_statements'
+require 'active_record/mti/connection_adapters/postgresql/adapter'
 
 require 'active_record/mti/railtie' if defined?(Rails::Railtie)
 
@@ -18,12 +19,13 @@ module ActiveRecord
     end
 
     def self.load
-      ::ActiveRecord::Base.send :include, Inheritance
-      ::ActiveRecord::Base.send :include, ActiveRecord::MTI::ModelSchema
-      ::ActiveRecord::Relation.send :include, QueryMethods
-      ::ActiveRecord::Relation.send :include, ActiveRecord::MTI::Calculations
+      ::ActiveRecord::Base.send                                  :include, Inheritance
+      ::ActiveRecord::Base.send                                  :include, ModelSchema
+      ::ActiveRecord::Relation.send                              :include, QueryMethods
+      ::ActiveRecord::Relation.send                              :include, Calculations
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :prepend, ConnectionAdapters::PostgreSQL::Adapter
       ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :include, ConnectionAdapters::PostgreSQL::SchemaStatements
-      ::ActiveRecord::SchemaDumper.send :include, ActiveRecord::MTI::SchemaDumper
+      ::ActiveRecord::SchemaDumper.send                          :include, SchemaDumper
     end
   end
 end

data/lib/active_record/mti/calculations.rb

@@ -52,7 +52,7 @@ module ActiveRecord
         relation.select_values = select_values
 
         # Remove our cast otherwise PSQL will insist that it be included in the GROUP
-        relation.arel.projections.select!{ |p| p.to_s != "CAST(\"#{klass.table_name}\".\"tableoid\"::regclass AS text)" } if @klass.using_multi_table_inheritance?
+        relation.arel.projections.select!{ |p| p.to_s != tableoid_cast(klass) } if @klass.using_multi_table_inheritance?
 
         calculated_data = @klass.connection.select_all(relation, nil, relation.arel.bind_values + bind_values)
 
@@ -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 != "CAST(\"#{klass.table_name}\".\"tableoid\"::regclass AS text)" } if @klass.using_multi_table_inheritance?
+          relation.arel.projections.select!{ |p| p.to_s != 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/connection_adapters/postgresql/adapter.rb

@@ -0,0 +1,30 @@
+module ActiveRecord
+  module MTI
+    module ConnectionAdapters
+      module PostgreSQL
+        module Adapter
+
+          def version
+            Gem::Version.new exec_query(<<-SQL, 'SCHEMA').rows.first.first
+              SHOW server_version;
+            SQL
+          end
+
+          def column_definitions(table_name) # :nodoc:
+            exec_query(<<-SQL, 'SCHEMA').rows
+              SELECT a.attname, format_type(a.atttypid, a.atttypmod),
+                  pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod
+              FROM pg_attribute a LEFT JOIN pg_attrdef d
+                ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+              WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
+                AND a.attnum > 0 AND NOT a.attisdropped
+                AND a.attname != 'tableoid'
+              ORDER BY a.attnum
+            SQL
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/active_record/mti/inheritance.rb

@@ -34,12 +34,13 @@ module ActiveRecord
       module ClassMethods
 
         def inherited(child)
-          child.uses_mti if self.uses_mti?
           super
         end
 
-        def uses_mti
-          self.inheritance_column = nil
+        def uses_mti(table_name = nil, inheritance_column = nil)
+          # self.table_name ||= table_name
+          self.inheritance_column = inheritance_column
+
           @uses_mti = true
         end
 
@@ -48,11 +49,27 @@ module ActiveRecord
         end
 
         def uses_mti?
-          @uses_mti ||= false
+          @uses_mti ||= check_inheritence_of(@table_name)
         end
 
         private
 
+        def check_inheritence_of(table_name)
+          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);
+          SQL
+
+          # Some versions of PSQL return {"?column?"=>"t"}
+          # instead of {"first"=>"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'
+        end
+
         # Called by +instantiate+ to decide which class to use for a new
         # record instance. For single-table inheritance, we check the record
         # for a +type+ column and return the corresponding class.

data/lib/active_record/mti/model_schema.rb

@@ -8,16 +8,51 @@ module ActiveRecord
 
         # Computes the table name, (re)sets it internally, and returns it.
         def reset_table_name #:nodoc:
-          # binding.pry
           self.table_name = if abstract_class?
             superclass == Base ? nil : superclass.table_name
-          elsif superclass.abstract_class? || superclass.using_multi_table_inheritance?
+          elsif superclass.abstract_class?# || superclass.using_multi_table_inheritance?
             superclass.table_name || compute_table_name
           else
             compute_table_name
           end
         end
 
+        # Computes and returns a table name according to default conventions.
+        def compute_table_name
+          base = base_class
+          if self == base
+            # Nested classes are prefixed with singular parent table name.
+            if parent < Base && !parent.abstract_class?
+              contained = parent.table_name
+              contained = contained.singularize if parent.pluralize_table_names
+              contained += '_'
+            end
+
+            "#{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
+              contained = contained.singularize if superclass.pluralize_table_names
+              contained += '/'
+            end
+
+            "#{full_table_name_prefix}#{contained}#{decorated_table_name(name)}#{full_table_name_suffix}"
+          else
+            # STI subclasses always use their superclass' table.
+            superclass.table_name
+          end
+        end
+
+        private
+
+        # Guesses the table name, but does not decorate it with prefix and suffix information.
+        def decorated_table_name(class_name = base_class.name)
+          table_name = class_name.to_s.underscore
+          pluralize_table_names ? table_name.pluralize : table_name
+        end
+
       end
     end
   end

data/lib/active_record/mti/query_methods.rb

@@ -18,7 +18,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')])
-        "CAST(\"#{klass.table_name}\".\"tableoid\"::regclass AS text)"
+        "TRIM(BOTH '\"' FROM CAST(\"#{klass.table_name}\".\"tableoid\"::regclass AS text)) AS tableoid"
       end
 
     end

data/lib/active_record/mti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Allows use of native inherited tables in PostgreSQL
 email:
 - dale@twilightcoders.net
@@ -151,6 +165,7 @@ files:
 - active_record-mti.gemspec
 - lib/active_record/mti.rb
 - lib/active_record/mti/calculations.rb
+- lib/active_record/mti/connection_adapters/postgresql/adapter.rb
 - lib/active_record/mti/connection_adapters/postgresql/schema_statements.rb
 - lib/active_record/mti/inheritance.rb
 - lib/active_record/mti/model_schema.rb