active_record-mti 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6cc42809a8381152867f5083a0801180d2c8b59
-  data.tar.gz: 597fd1818b06313a94d2c8f4a704acf22874416a
+  metadata.gz: f561f8c3e6dff9e4c46e297bb68cf4e00d5d5891
+  data.tar.gz: 44bf123a8420156b88e21e5e9f1d9c39e4379a8d
 SHA512:
-  metadata.gz: 54e156c3a04639e434793c4ff7bc39d185c887d428754ffb447111718428a1127261a4c49e49c554d7df437d1143c5bf96627da48eebe33e1b79e1c7e2942d4d
-  data.tar.gz: 051683cc7a617b3f96c0c285f39f5070919c9d92c7a020144020edf1d2c50d4c9b5e339c9e02fc3a5e294f5f37ebdc2997f507faa65d33a926837ebaca0d9510
+  metadata.gz: be36facecf13fe566b71bab1825e9d7ef0311b85b48bb34456476d649cad0a0adcb3877f2f25afac7ec2755149ef0a258aac9d9f69410f55aa537c60efbfc227
+  data.tar.gz: aff8249f8050fe264785718e2ce773132e64b0153d50524bae003f6dad83c5f98ce74d5f1ed155b0fd197fc6beead571a6f2b020631253f648214dee74bd21c0

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: .
+  specs:
+    active_record-mti (0.0.6)
+      activerecord (~> 4.1, > 4.1)
+      activesupport (~> 4.1, > 4.1)
+      pg (~> 0)
+      railties (~> 4.1, > 4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    builder (3.2.3)
+    erubis (2.7.0)
+    i18n (0.8.1)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
+    pg (0.20.0)
+    rack (1.6.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (0.9.6)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_record-mti!
+  bundler (~> 1.6)
+  rake (~> 0)
+
+BUNDLED WITH
+   1.13.6

data/active_record-mti.gemspec

@@ -20,7 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency 'rake', '~> 0'
-  spec.add_runtime_dependency 'rails', '~> 4.1', '> 4.1'
-  spec.add_runtime_dependency 'pg', '~> 0'
+
+  spec.add_dependency 'pg', '~> 0'
+
+  spec.add_dependency 'activerecord', '~> 4.1', '> 4.1'
+  spec.add_dependency 'railties', '~> 4.1', '> 4.1'
+  spec.add_dependency 'activesupport', '~> 4.1', '> 4.1'
 
 end

data/lib/active_record/mti.rb

@@ -1,8 +1,24 @@
-require "active_record/mti/version"
-require 'active_record/mti/railtie' if defined?(Rails)
+require 'active_record/mti/version'
+require 'active_record/mti/railtie'
+require 'active_record'
+require 'active_record/connection_handling'
+require 'active_record/mti/schema_dumper'
+require 'active_record/mti/inheritance'
+require 'active_record/mti/query_methods'
+require 'active_record/mti/calculations'
+require 'active_record/mti/connection_adapters/postgresql/schema_statements'
 
 module ActiveRecord
   module MTI
     # Your code goes here...
+    def self.load
+      puts "ActiveRecord::MTI loaded"
+      ::ActiveRecord::Base.send :include, Inheritance
+      ::ActiveRecord::Relation.send :include, QueryMethods
+      ::ActiveRecord::Relation.send :include, ActiveRecord::MTI::Calculations
+
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :include, ConnectionAdapters::PostgreSQL::SchemaStatements
+      ::ActiveRecord::SchemaDumper.send :include, ActiveRecord::MTI::SchemaDumper
+    end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'active_record/connection_adapters/postgresql_adapter'
+
 module ActiveRecord
   module MTI
     module ConnectionAdapters
@@ -22,11 +24,11 @@ module ActiveRecord
             if schema = options.delete(:schema)
               # If we specify a schema then we only create it if it doesn't exist
               # and we only force create it if only the specific schema is in the search path
-              table_name = "#{schema}.#{table_name}"
+              table_name = %Q("#{schema}"."#{table_name}")
             end
 
             if parent_table = options.delete(:inherits)
-              options[:options] = ["INHERITS (#{parent_table})", options[:options]].compact.join
+              options[:options] = [%Q(INHERITS ("#{parent_table}")), options[:options]].compact.join
             end
 
             td = create_table_definition table_name, options[:temporary], options[:options], options[:as]
@@ -58,7 +60,7 @@ module ActiveRecord
 
             if parent_table
               parent_table_primary_key = primary_key(parent_table)
-              execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{parent_table_primary_key})"
+              execute %Q(ALTER TABLE "#{table_name}" ADD PRIMARY KEY ("#{parent_table_primary_key}"))
               indexes(parent_table).each do |index|
                 add_index table_name, index.columns, :unique => index.unique
               end

data/lib/active_record/mti/inheritance.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module ActiveRecord
   # == Multi table inheritance
   #
@@ -57,6 +59,8 @@ 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'] }
         end
 

data/lib/active_record/mti/querying.rb

@@ -0,0 +1,7 @@
+module ActiveRecord
+  module MTI
+    module Querying
+      delegate :count_estimate, to: :all
+    end
+  end
+end

data/lib/active_record/mti/railtie.rb

@@ -1,19 +1,13 @@
-require 'active_record/mti/schema_dumper'
-require 'active_record/mti/inheritance'
-require 'active_record/mti/query_methods'
-require 'active_record/mti/calculations'
-require 'active_record/mti/connection_adapters/postgresql/schema_statements'
+require 'rails/railtie'
 
 module ActiveRecord
   module MTI
     class Railtie < Rails::Railtie
-      initializer 'active_record-mti.inheritance.initialization' do |_app|
-        ::ActiveRecord::Base.send :include, Inheritance
-        ::ActiveRecord::Relation.send :include, QueryMethods
-        ::ActiveRecord::Relation.send :include, ActiveRecord::MTI::Calculations
-
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :include, ConnectionAdapters::PostgreSQL::SchemaStatements
-        ::ActiveRecord::SchemaDumper.send :include, ActiveRecord::MTI::SchemaDumper
+      initializer 'active_record-mti.load' do |_app|
+        puts "ActiveRecord::MTI railtie initializer"
+        ActiveSupport.on_load(:active_record) do
+          ActiveRecord::MTI.load
+        end
       end
     end
   end

data/lib/active_record/mti/schema_dumper.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 # 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).
@@ -28,6 +30,7 @@ module ActiveRecord
         # schema in the search path (not including the $user schema)
         def table(table, stream)
           return if already_dumped?(table)
+
           if parent_table = @connection.parent_table(table)
             table(parent_table, stream)
             parent_column_names = @connection.columns(parent_table).map(&:name)
@@ -42,12 +45,12 @@ module ActiveRecord
 
             tbl.print "  create_table #{remove_prefix_and_suffix(table).inspect}"
             if parent_table
-              tbl.print %Q(, inherits: "#{parent_table}")
+              tbl.print %Q(, inherits: '#{parent_table}')
             else
               pkcol = columns.detect { |c| c.name == pk }
               if pkcol
                 if pk != 'id'
-                  tbl.print %Q(, primary_key: "#{pk}")
+                  tbl.print %Q(, primary_key: '#{pk}')
                 elsif pkcol.sql_type == 'bigint'
                   tbl.print ", id: :bigserial"
                 elsif pkcol.sql_type == 'uuid'

data/lib/active_record/mti/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MTI
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,19 +73,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: Allows use of native inherited tables in PostgreSQL
 email:
 - dale@twilightcoders.net
@@ -80,6 +120,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -89,6 +131,7 @@ files:
 - lib/active_record/mti/connection_adapters/postgresql/schema_statements.rb
 - lib/active_record/mti/inheritance.rb
 - lib/active_record/mti/query_methods.rb
+- lib/active_record/mti/querying.rb
 - lib/active_record/mti/railtie.rb
 - lib/active_record/mti/schema_dumper.rb
 - lib/active_record/mti/version.rb