active_record-mti 0.3.2 → 0.4.0.pre.1

data/lib/active_record/mti/railtie.rb

@@ -1,15 +1,20 @@
-require 'rails/railtie'
+require 'active_record/mti/core_extension'
+require 'active_record/mti/connection_adapters/postgresql/schema_statements'
+require 'active_record/mti/connection_adapters/postgresql/adapter'
+require 'active_record/mti/schema_dumper'
 
 module ActiveRecord
   module MTI
     class Railtie < Rails::Railtie
       initializer 'active_record-mti.load' do |_app|
-        ActiveRecord::MTI.logger.debug "active_record-mti.load"
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::MTI.load
+          ::ActiveRecord::Base.prepend(::ActiveRecord::MTI::CoreExtension)
+
+          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ConnectionAdapters::PostgreSQL::Adapter)
+          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ConnectionAdapters::PostgreSQL::SchemaStatements)
+          ::ActiveRecord::SchemaDumper.prepend(SchemaDumper)
         end
       end
     end
   end
 end
-

data/lib/active_record/mti/relation.rb

@@ -0,0 +1,95 @@
+require 'active_support/core_ext/object/blank'
+
+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)
+        end
+      end
+
+      def build_mti(arel)
+        if klass.tableoid?
+          arel.project(tableoid_project) if !projecting_tableoid?(arel)
+          arel.group(tableoid_group) if group_values.any?
+        end
+      end
+
+      def projecting_tableoid?(arel)
+        arel.projections.any? do |projection|
+          tableoid_projection?(projection)
+        end
+      end
+
+      def tableoid_projection?(projection)
+        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::SqlLiteral
+          projection == 'tableoid'
+        else
+          false
+        end
+      end
+
+      # def exclusively(tables=[klass])
+      #   @table = table.dup.tap do |t|
+      #     t.only!
+      #   end
+      #   binding.pry
+      #   self
+      # end
+
+      private
+
+      def perform_calculation(*)
+        Thread.currently(:skip_tableoid_cast, true) do
+          super
+        end
+      end
+
+      def tableoid_project
+        arel_table[:tableoid]#.as('tableoid')
+      end
+
+      def tableoid_group
+        arel_table[:tableoid]
+      end
+    end
+  end
+end

data/lib/active_record/mti/schema_dumper.rb

@@ -1,3 +1,5 @@
+require 'core_ext/hash'
+
 # Modified SchemaDumper that knows how to dump
 # inherited tables. Key is that we have to dump parent
 # tables before we dump child tables (of course).
@@ -10,7 +12,6 @@ module ActiveRecord
   # output format (i.e., ActiveRecord::Schema).
   module MTI
     module SchemaDumper #:nodoc:
-
       def dumped_tables
         @dumped_tables ||= []
       end
@@ -44,7 +45,7 @@ module ActiveRecord
 
       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_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
@@ -65,13 +66,12 @@ module ActiveRecord
       end
 
       def remove_prefix_and_suffix(table)
-        table.gsub(/^(#{ActiveRecord::Base.table_name_prefix})(.+)(#{ActiveRecord::Base.table_name_suffix})$/,  "\\2")
+        table.gsub(/^(#{ActiveRecord::Base.table_name_prefix})(.+)(#{ActiveRecord::Base.table_name_suffix})$/, '\\2')
       end
 
       def already_dumped?(table)
         dumped_tables.include? table
       end
-
     end
   end
 end

data/lib/active_record/mti/table.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module MTI
+    module Table
+
+      def self.find(klass, table_name, parent_class=klass.superclass)
+        if concrete?(parent_class) && parent_mti_table = parent_class.mti_table
+          ::ActiveRecord::MTI.child_tables.find(inhparent: parent_mti_table.oid, name: table_name) #|| parent_mti_table
+        else
+          ::ActiveRecord::MTI.parent_tables.find(name: table_name)
+        end
+      end
+
+      def self.concrete?(klass)
+        klass < ::ActiveRecord::Base && !klass.try(:abstract_class?)
+      end
+
+    end
+  end
+end

data/lib/active_record/mti/table_oid.rb

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

data/lib/active_record/mti/version.rb

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

data/lib/core_ext/array.rb

@@ -0,0 +1,14 @@
+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

data/lib/core_ext/hash.rb

@@ -1,7 +1,5 @@
 class Hash
-
   def &(other)
-    Hash[(self.keys & other.keys).zip(other.values_at(*(self.keys & other.keys)))]
+    Hash[(keys & other.keys).zip(other.values_at(*(keys & other.keys)))]
   end
-
 end

data/lib/core_ext/thread.rb

@@ -0,0 +1,14 @@
+class Thread
+  def self.currently(key, value=true)
+    __currently_org__, Thread.current[key] = Thread.current[key], value
+    yield if block_given?
+  ensure
+    Thread.current[key] = __currently_org__
+  end
+
+  def self.currently?(key, value=true)
+    if Thread.current[key] == value
+      block_given? ? yield : true
+    end
+  end
+end

metadata

@@ -1,105 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0.pre.1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: registry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 description: Gives ActiveRecord support for PostgreSQL's native inherited tables
 email:
 - dale@twilightcoders.net
@@ -107,53 +157,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
-- active_record-mti.gemspec
-- gemfiles/activerecord-4.0.Gemfile
-- gemfiles/activerecord-4.1.Gemfile
-- gemfiles/activerecord-4.2.Gemfile
-- gemfiles/activerecord-5.0.Gemfile
-- gemfiles/activerecord-5.1.Gemfile
 - lib/active_record/mti.rb
-- lib/active_record/mti/calculations.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/inheritance.rb
-- lib/active_record/mti/model_schema.rb
-- lib/active_record/mti/query_methods.rb
-- lib/active_record/mti/querying.rb
+- lib/active_record/mti/core_extension.rb
 - lib/active_record/mti/railtie.rb
-- lib/active_record/mti/registry.rb
+- 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
-- spec/active_record/mti/calculations_spec.rb
-- spec/active_record/mti/inheritance_spec.rb
-- spec/active_record/mti/model_schema_spec.rb
-- spec/active_record/mti/query_methods_spec.rb
-- spec/active_record/mti/schema_dumper_spec.rb
-- spec/active_record/mti_spec.rb
-- spec/active_record/sti/inheritance_spec.rb
-- spec/spec_helper.rb
-- spec/support/rails/app/models/admin.rb
-- spec/support/rails/app/models/comment.rb
-- spec/support/rails/app/models/post.rb
-- spec/support/rails/app/models/transportation/military/vehicle.rb
-- spec/support/rails/app/models/transportation/truck.rb
-- spec/support/rails/app/models/transportation/vehicle.rb
-- spec/support/rails/app/models/user.rb
-- spec/support/rails/config/database.yml
-- spec/support/rails/config/routes.rb
-- spec/support/rails/db/schema.rb
-- spec/support/rails/log/.gitignore
-- spec/support/rails/public/favicon.ico
+- lib/core_ext/thread.rb
 homepage: https://github.com/twilightcoders/active_record-mti
 licenses:
 - MIT
@@ -168,36 +188,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multi Table Inheritance for PostgreSQL in Rails
-test_files:
-- spec/active_record/mti/calculations_spec.rb
-- spec/active_record/mti/inheritance_spec.rb
-- spec/active_record/mti/model_schema_spec.rb
-- spec/active_record/mti/query_methods_spec.rb
-- spec/active_record/mti/schema_dumper_spec.rb
-- spec/active_record/mti_spec.rb
-- spec/active_record/sti/inheritance_spec.rb
-- spec/spec_helper.rb
-- spec/support/rails/app/models/admin.rb
-- spec/support/rails/app/models/comment.rb
-- spec/support/rails/app/models/post.rb
-- spec/support/rails/app/models/transportation/military/vehicle.rb
-- spec/support/rails/app/models/transportation/truck.rb
-- spec/support/rails/app/models/transportation/vehicle.rb
-- spec/support/rails/app/models/user.rb
-- spec/support/rails/config/database.yml
-- spec/support/rails/config/routes.rb
-- spec/support/rails/db/schema.rb
-- spec/support/rails/log/.gitignore
-- spec/support/rails/public/favicon.ico
+test_files: []