activerecord-nulldb-adapter 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e780de7d78de64745ed62212e2adeaef5459888c79ce93bc4329661fa28004c6
-  data.tar.gz: fdbb0918d50b97d6c1fdb8a14463812bff0521d3e1bfa35356883844ec1673bb
+  metadata.gz: 254fde2f4454fe03090b46daf27fffaf379db4cbca87f2a8b83f87fbd4182b74
+  data.tar.gz: 9c2d2ddd16aecba5ed25445876184e46b9ea6acdaeef734d0846c60dead3fedb
 SHA512:
-  metadata.gz: 18fd320b4f78637b7dae988fcf811ee5e68806903fd57b5acc90a8016c8d49a3272e756428375431a530d3caeea6cb8bc120fdcdd7149b6e5c743c47db667ebd
-  data.tar.gz: 9ea3e21644ba7fb2d6fb14a3a07d0b6e840b9bc181fea79bf3aff3c5c0d51a0b721f903c0060d490ca9412ee14a0ef8a6dce1a4ecd0575a96feb94a50bda28c1
+  metadata.gz: 65a4477a9f589407ec410326114dca64ed342c3be15579a3f5c2467d7ed030521dad205882e48e0cb8d4e6923256baaf9ad13dd479b2f059884c52fc4c55f05f
+  data.tar.gz: 434f119afe4c40c0824a7e62f48e6397103b5988fc70e692f5abef18bd33082b81e591b94641b928551e8ddf778cf47f465367d184c06392c0b66f317cf8e319

data/.gitignore

@@ -10,6 +10,7 @@ doc
 # bundler
 .bundle
 *.lock
+vendor
 
 # gem
 pkg

data/CHANGES.md

@@ -1,10 +1,10 @@
 Unreleased
 ----------
 
-0.5.1 (2020-11-25)
+0.6.0 (2021-01-08)
 -----------
 
-- Add support to UUID. #97
+- *Breaking* Finish dropping support to Rails <= 5.1. #101
 
 0.5.0 (2020-10-15)
 -----------

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activerecord', '>= 2.0.0'
+gem 'activerecord', '>= 5.2.0', '< 6.1.0'
 
 group :development, :test do
   gem 'spec'

data/README.rdoc

@@ -46,11 +46,17 @@ RAILS_ROOT/db/schema.rb.  You can override that by setting the
 
 NullDB comes with RSpec integration.  To replace the database with
 NullDB in all of your specs, put the following in your
-spec/spec_helper:
+spec/rails_helper:
 
   require 'nulldb_rspec'
   include NullDB::RSpec::NullifiedDatabase
 
+after you load your rails environment 
+
+  require File.expand_path('../config/environment', __dir__)
+
+otherwise you will encounter issues such as (bug)[https://github.com/nulldb/nulldb/pull/90#issuecomment-496690958].
+
 Or if you just want to use NullDB in a specific spec context, you can
 include the same module inside a context:
 

data/activerecord-nulldb-adapter.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/nulldb/nulldb"
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency 'activerecord', '>= 5.2.0'
+  s.add_runtime_dependency 'activerecord', '>= 5.2.0', '< 6.1'
   s.add_development_dependency 'spec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'
@@ -28,4 +28,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'simplecov'
 end
-

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

@@ -34,8 +34,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
         self.class.const_get(config[:table_definition_class_name]))
     end
 
-    register_types unless NullDB::LEGACY_ACTIVERECORD || \
-                          ActiveRecord::VERSION::MAJOR < 4
+    register_types
   end
 
   # A log of every statement that has been "executed" by this connection adapter
@@ -95,38 +94,6 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     index = @indexes[table_name].reject! { |index| index.name == index_name }
   end
 
-  unless instance_methods.include? :add_index_options
-    def add_index_options(table_name, column_name, options = {})
-      column_names = Array.wrap(column_name)
-      index_name   = index_name(table_name, :column => column_names)
-
-      if Hash === options # legacy support, since this param was a string
-        index_type = options[:unique] ? "UNIQUE" : ""
-        index_name = options[:name].to_s if options.key?(:name)
-      else
-        index_type = options
-      end
-
-      if index_name.length > index_name_length
-        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{index_name_length} characters"
-      end
-      if index_name_exists?(table_name, index_name, false)
-        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
-      end
-      index_columns = quoted_columns_for_index(column_names, options).join(", ")
-
-      [index_name, index_type, index_columns]
-    end
-  end
-
-  unless instance_methods.include? :index_name_exists?
-    def index_name_exists?(table_name, index_name, default)
-      return default unless respond_to?(:indexes)
-      index_name = index_name.to_s
-      indexes(table_name).detect { |i| i.name == index_name }
-    end
-  end
-
   def add_fk_constraint(*args)
     # NOOP
   end
@@ -334,10 +301,6 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
       TableDefinition.new(self, table_name, temporary: is_temporary, options: options.except(:id))
     when 5
       TableDefinition.new(table_name, is_temporary, options.except(:id), nil)
-    when 4
-      TableDefinition.new(native_database_types, table_name, is_temporary, options)
-    when 2,3
-      TableDefinition.new(adapter)
     else
       raise "Unsupported ActiveRecord version #{::ActiveRecord::VERSION::STRING}"
     end
@@ -352,8 +315,6 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
       if defined?(ActiveRecord::ConnectionAdapters::SqlTypeMetadata)
         meta = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: col_def.type)
         args.insert(2, meta_with_limit!(meta, col_def))
-      elsif initialize_column_with_cast_type?
-        args.insert(2, meta_with_limit!(lookup_cast_type(col_def.type), col_def))
       else
         args[2] = args[2].to_s + "(#{col_def.limit})" if col_def.limit
       end
@@ -366,44 +327,24 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   end
 
   def default_column_arguments(col_def)
-    if ActiveRecord::VERSION::MAJOR >= 5
-      [
-        col_def.name.to_s,
-        col_def.default,
-        col_def.null.nil? || col_def.null # cast  [false, nil, true] => [false, true, true], other adapters default to null=true 
-      ]
-    else
-      [
-        col_def.name.to_s,
-        col_def.default,
-        col_def.type,
-        col_def.null.nil? || col_def.null # cast  [false, nil, true] => [false, true, true], other adapters default to null=true 
-      ]
-    end
-  end
-
-  def initialize_column_with_cast_type?
-    ::ActiveRecord::VERSION::MAJOR == 4 && ::ActiveRecord::VERSION::MINOR >= 2
+    [
+      col_def.name.to_s,
+      col_def.default,
+      col_def.null.nil? || col_def.null # cast  [false, nil, true] => [false, true, true], other adapters default to null=true
+    ]
   end
 
   def initialize_args
-    return [nil, @logger, @config] if ActiveRecord::VERSION::MAJOR > 3
-    [nil, @logger]
+    [nil, @logger, @config]
   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
+    require 'active_model/type'
+    ActiveRecord::Type.register(
+      :primary_key,
+      ActiveModel::Type::Integer,
+      adapter: adapter_name,
+      override: true
+    )
   end
 end

data/lib/nulldb/core.rb

@@ -3,9 +3,6 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module NullDB
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/nulldb_spec.rb

@@ -11,12 +11,7 @@ require 'active_record'
 require 'active_record/version'
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 
-if ActiveRecord::VERSION::MAJOR > 2
-  require 'rspec' # rspec 2
-else
-  require 'spec' # rspec 1
-end
-
+require 'rspec'
 require 'nulldb_rspec'
 
 class Employee < ActiveRecord::Base
@@ -492,11 +487,9 @@ describe 'adapter-specific extensions' do
     should_have_column(ExtendedModel, :jsonb_column, :json)
   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
+  it 'registers a primary_key type' do
+    expect(ActiveRecord::Type.lookup(:primary_key, adapter: 'NullDB'))
+      .to be_a(ActiveModel::Type::Integer)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Avdi Grimm
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,6 +19,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,6 +29,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement