activerecord-nulldb-adapter 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a936204a697130ba6be50b69f69a53f33a91bce7
-  data.tar.gz: 7b72a4a62dcbceb164fdd6abeed448d2671e46cd
+  metadata.gz: d5cd5ca699c63224bf641cf3e358137e6ded9a4c
+  data.tar.gz: 04e46ea2bf9ce3bca28cf96e94e6c8b73321e447
 SHA512:
-  metadata.gz: 9247780b056dc9429814aca02b1340d910b012fa11a749a666faacd3537162356932d5cae20d1a1fee33f55923ffb69011f175de2bf887a995f05c6c1b74dfef
-  data.tar.gz: 17ee0213ab9a305b612486558f0a6db1e32be0f699b3ca87c36a39490776d40dc663acb6f1e3f2ef22b03f7b238a78649bdab927e9a4fa6f7447ec398fa36861
+  metadata.gz: b39b59c2cfaefa4874fa2072b1eb128042c526690e12beb211f477b3fdf35ea78a0a838e1f98e43f46fba6ffd3d286e71e0ea855695a8c1b0acd14a7bb95fe3e
+  data.tar.gz: e33abeaa78ef7d331c02eac7f2538bc3c0837b388f2cbb4e20cdabb7b04fa2f7bcad0ef4e2991d5c4fcd0810138f958a47436d95a54aea6e25a866caa51ed843

data/.travis.yml

@@ -5,9 +5,9 @@ sudo: false
 
 rvm:
   - 1.9.3
-  - 2.1.10
   - 2.2.5
   - 2.3.1
+  - 2.4
   - jruby
   - rbx
 
@@ -19,27 +19,29 @@ matrix:
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.1.10
+    - rvm: 2.2.5
+      gemfile: gemfiles/activerecord_master.gemfile
+    - rvm: 2.3.1
       gemfile: gemfiles/activerecord_master.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/activerecord_5.1.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/activerecord_5.1.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/activerecord_5.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/activerecord_5.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/activerecord_2.3.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/activerecord_4.1.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/activerecord_4.0.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/activerecord_3.2.gemfile
     - rvm: 2.2.5
       gemfile: gemfiles/activerecord_2.3.gemfile
     - rvm: 2.3.1
       gemfile: gemfiles/activerecord_2.3.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/activerecord_2.3.gemfile
 
 gemfile:
   - gemfiles/activerecord_2.3.gemfile
-  - gemfiles/activerecord_3.0.gemfile
-  - gemfiles/activerecord_3.1.gemfile
   - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.3.9 (2018-07-07)
+-----------
+- Fix broken count
+- Avoid monkey patching Schema.define
+- Support ruby 2.4 (drop support for ruby 2.1 and rails 3.0/3.1)
+- Support custom TableDefinition (useful for postgres)
+
 0.3.8 (2018-02-06)
 -----------
 - Adds support for ActiveRecord Edge (6.0)

data/lib/active_record/connection_adapters/nulldb_adapter/core.rb

@@ -15,6 +15,8 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   # Recognized options:
   #
   # [+:schema+] path to the schema file, relative to Rails.root
+  # [+:table_definition_class_name+] table definition class
+  # (e.g. ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition for Postgres) or nil.
   def initialize(config={})
     @log            = StringIO.new
     @logger         = Logger.new(@log)
@@ -25,6 +27,15 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     @config         = config.merge(:adapter => :nulldb)
     super *initialize_args
     @visitor ||= Arel::Visitors::ToSql.new self if defined?(Arel::Visitors::ToSql)
+
+    if config[:table_definition_class_name]
+      ActiveRecord::ConnectionAdapters::NullDBAdapter.send(:remove_const, 'TableDefinition')
+      ActiveRecord::ConnectionAdapters::NullDBAdapter.const_set('TableDefinition',
+        self.class.const_get(config[:table_definition_class_name]))
+    end
+
+    register_types unless NullDB::LEGACY_ACTIVERECORD || \
+                          ActiveRecord::VERSION::MAJOR < 4
   end
 
   # A log of every statement that has been "executed" by this connection adapter
@@ -221,7 +232,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
   def select(statement, name = nil, binds = [])
     EmptyResult.new.tap do |r|
-      r.columns = columns_for(name)
+      r.bind_column_meta(columns_for(name))
       self.execution_log << Statement.new(entry_point, statement)
     end
   end
@@ -229,8 +240,9 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   private
 
   def columns_for(table_name)
-    table_def = @tables[table_name]
-    table_def ? table_def.columns : []
+    table_meta = @tables[table_name]
+    return [] unless table_meta
+    table_meta.columns
   end
 
   def next_unique_id
@@ -322,4 +334,19 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     [nil, @logger]
   end
 
+  # 4.2 introduced ActiveRecord::Type
+  # https://github.com/rails/rails/tree/4-2-stable/activerecord/lib/active_record
+  def register_types
+    if ActiveRecord::VERSION::MAJOR < 5
+      type_map.register_type(:primary_key, ActiveRecord::Type::Integer.new)
+    else      
+      require 'active_model/type'
+      ActiveRecord::Type.register(
+        :primary_key,
+        ActiveModel::Type::Integer,
+        adapter: adapter_name,
+        override: true
+      )
+    end
+  end
 end

data/lib/active_record/connection_adapters/nulldb_adapter/empty_result.rb

@@ -1,26 +1,38 @@
 class ActiveRecord::ConnectionAdapters::NullDBAdapter
 
   class EmptyResult < Array
-    attr_writer :columns
-    def rows
-      []
-    end
+    attr_reader :column_types
+    
+    def bind_column_meta(columns)
+      @columns = columns
+      return if columns.empty?
 
-    def column_types
-      columns.map{|col| col.type}
+      @column_types = columns.reduce({}) do |ctypes, col|
+        ctypes[col.name] = ActiveRecord::Type.lookup(col.type)
+        ctypes
+      end      
     end
 
     def columns
       @columns ||= []
     end
 
+    def column_types
+      @column_types ||= {}
+    end
+
     def cast_values(type_overrides = nil)
       rows
     end
 
+    def rows
+      []
+    end
+
     def >(num)
       rows.size > num
     end
+
   end
 
 end

data/lib/nulldb/core.rb

@@ -3,6 +3,9 @@ require 'active_support/deprecation'
 require 'active_record/connection_adapters/nulldb_adapter'
 
 module NullDB
+  LEGACY_ACTIVERECORD = 
+    Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.2.0')
+
   class Configuration < Struct.new(:project_root); end
 
   class << self

data/lib/nulldb/extensions.rb

@@ -28,15 +28,4 @@ class ActiveRecord::Base
   def self.nulldb_connection(config)
     ActiveRecord::ConnectionAdapters::NullDBAdapter.new(config)
   end
-end
-
-
-module ActiveRecord
-  # Just make sure you have the latest version of your schema
-  superclass = ActiveRecord::VERSION::MAJOR >= 5 ? Migration.public_send(:[], "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f) : Migration
-  class Schema < superclass
-    def self.define(info={}, &block)
-      instance_eval(&block)
-    end
-  end
-end
+end

data/lib/nulldb/version.rb

@@ -1,3 +1,3 @@
 module NullDB
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/nulldb_spec.rb

@@ -287,6 +287,10 @@ describe "NullDB" do
     expect( ActiveRecord::Base ).to receive(:connection_pool).and_raise(ActiveRecord::ConnectionNotEstablished)
     expect { NullDB.nullify }.to_not raise_error
   end
+
+  it 'should handle count queries' do 
+    expect(Employee.count).to eql(0)
+  end
 end
 
 # need a fallback db for contextual nullification
@@ -334,6 +338,13 @@ describe 'adapter-specific extensions' do
       end
     }.to_not raise_error
   end
+
+  if ActiveRecord::VERSION::MAJOR > 4
+    it 'registers a primary_key type' do
+      expect(ActiveRecord::Type.lookup(:primary_key, adapter: 'NullDB'))
+        .to be_a(ActiveModel::Type::Integer)
+    end
+  end
 end
 
 describe ActiveRecord::ConnectionAdapters::NullDBAdapter::EmptyResult do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Avdi Grimm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,8 +129,6 @@ files:
 - Rakefile
 - activerecord-nulldb-adapter.gemspec
 - gemfiles/activerecord_2.3.gemfile
-- gemfiles/activerecord_3.0.gemfile
-- gemfiles/activerecord_3.1.gemfile
 - gemfiles/activerecord_3.2.gemfile
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile

data/gemfiles/activerecord_3.0.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.0.0"
-
-group :development, :test do
-  gem "spec"
-  gem "rspec", ">= 1.2.9"
-  gem "rake"
-end
-
-group :development do
-  gem "appraisal"
-  gem "simplecov", :require => false
-end

data/gemfiles/activerecord_3.1.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.1.0"
-
-group :development, :test do
-  gem "spec"
-  gem "rspec", ">= 1.2.9"
-  gem "rake"
-end
-
-group :development do
-  gem "appraisal"
-  gem "simplecov", :require => false
-end