activerecord-nulldb-adapter 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 254fde2f4454fe03090b46daf27fffaf379db4cbca87f2a8b83f87fbd4182b74
-  data.tar.gz: 9c2d2ddd16aecba5ed25445876184e46b9ea6acdaeef734d0846c60dead3fedb
+  metadata.gz: e9b442065de1ab8b6f9a1b9a4c887b4446a50ac777c8a3800f07dc7bd7806d95
+  data.tar.gz: 0ccc56568e9610f033361f6229e096966d242edec12e30cfe674bba268da7dc8
 SHA512:
-  metadata.gz: 65a4477a9f589407ec410326114dca64ed342c3be15579a3f5c2467d7ed030521dad205882e48e0cb8d4e6923256baaf9ad13dd479b2f059884c52fc4c55f05f
-  data.tar.gz: 434f119afe4c40c0824a7e62f48e6397103b5988fc70e692f5abef18bd33082b81e591b94641b928551e8ddf778cf47f465367d184c06392c0b66f317cf8e319
+  metadata.gz: daa0faddba9520e94ee32f169054623ca1276c2a137e8ee9f329f8c1e3a1ad60f7f08cf3febb1b3a96b71bc5955d7d89c11944f15dc77a9b2ddc555a25d7200e
+  data.tar.gz: 3c58d754ec1aeb41c0296e5d1b9d298581588dd40a67701e1eabd12e9c7b1d589bec39774afbf098fadaa19a02f04c902826f80bdaea42d47d6054e90ff6a29d

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+name: build
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          [
+            activerecord_5.2,
+            activerecord_6.0,
+            activerecord_6.1,
+            activerecord_master,
+          ]
+        ruby: ["2.5", "2.6", "2.7", "3.0", "jruby-9.2.13.0"]
+        exclude:
+          - ruby: "3.0"
+            gemfile: activerecord_5.2
+
+          - ruby: "jruby-9.2.13.0"
+            gemfile: activerecord_6.1
+
+          - ruby: "jruby-9.2.13.0"
+            gemfile: activerecord_master
+
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -14,6 +14,7 @@ vendor
 
 # gem
 pkg
+*.gem
 
 # mac os specific
 .DS_Store

data/CHANGES.md

@@ -1,10 +1,15 @@
 Unreleased
 ----------
 
+0.7.0 (2021-01-18)
+-----------
+
+- Add support to Rails 6.1 #106
+
 0.6.0 (2021-01-08)
 -----------
 
-- *Breaking* Finish dropping support to Rails <= 5.1. #101
+- *Breaking* Finish dropping support to Rails <= 5.1 by removing custom code for these versions. #101
 
 0.5.0 (2020-10-15)
 -----------

data/Gemfile

@@ -1,12 +1,13 @@
 source "https://rubygems.org"
 
-gem 'activerecord', '>= 5.2.0', '< 6.1.0'
+gem 'activerecord', '>= 5.2.0', '< 6.3'
 
 group :development, :test do
   gem 'spec'
   gem 'rspec', '>= 1.2.9'
   gem 'rake'
   gem 'rdoc'
+  gem 'pry-byebug'
 end
 
 group :development do

data/README.rdoc

@@ -1,6 +1,6 @@
 {<img src="https://badge.fury.io/rb/activerecord-nulldb-adapter.png" alt="Gem Version" />}[http://badge.fury.io/rb/activerecord-nulldb-adapter]
 {<img src="https://codeclimate.com/github/nulldb/nulldb.png" />}[https://codeclimate.com/github/nulldb/nulldb]
-{<img src="https://travis-ci.org/nulldb/nulldb.png?branch=master" alt="Build Status" />}[https://travis-ci.org/nulldb/nulldb]
+{<img src="https://github.com/nulldb/nulldb/workflows/build/badge.svg?branch=master" alt="Build Status" />}[https://github.com/nulldb/nulldb/actions]
 
 
 = The NullDB Connection Adapter Plugin
@@ -16,14 +16,14 @@ a real database.
 == Compatibility
 
 === Ruby
-Currently supported Ruby versions: MRI 2.5.x, 2.6.x, 2.7.x
+Currently supported Ruby versions: MRI 2.5.x, 2.6.x, 2.7.x, 3.X.
 
 Experimental support provided for: JRuby
 
 === ActiveRecord
-Any version of ActiveRecord >= 5
+Any version of ActiveRecord >= 5.2
 
-It is tested against AR 5.2, 6.0 and master branch.
+It is tested against AR 5.2, 6.0, 6.1 and master branch.
 
 == Installation
 
@@ -51,7 +51,7 @@ spec/rails_helper:
   require 'nulldb_rspec'
   include NullDB::RSpec::NullifiedDatabase
 
-after you load your rails environment 
+after you load your rails environment
 
   require File.expand_path('../config/environment', __dir__)
 

data/activerecord-nulldb-adapter.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/nulldb/nulldb"
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency 'activerecord', '>= 5.2.0', '< 6.1'
+  s.add_runtime_dependency 'activerecord', '>= 5.2.0', '< 6.3'
   s.add_development_dependency 'spec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'pry-byebug'
 end

data/gemfiles/activerecord_6.1.gemfile

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

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

@@ -1,20 +1,4 @@
 class ActiveRecord::ConnectionAdapters::NullDBAdapter
   class Column < ::ActiveRecord::ConnectionAdapters::Column
-
-    private
-
-    def simplified_type(field_type)
-      super || simplified_type_from_sql_type
-    end
-
-    def simplified_type_from_sql_type
-      case sql_type
-      when :primary_key
-        :integer
-      when :string
-        :string
-      end
-    end
-
   end
 end

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

@@ -83,15 +83,31 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     @tables[new_name.to_s] = table_definition
   end
 
-  def add_index(table_name, column_names, options = {})
+  def add_index(table_name, column_names, **options)
+    options[:unique] = false unless options.key?(:unique)
     column_names = Array.wrap(column_names).map(&:to_s)
-    index_name, index_type, ignore = add_index_options(table_name, column_names, options)
-    @indexes[table_name] << IndexDefinition.new(table_name, index_name, (index_type == 'UNIQUE'), column_names, [], [])
+
+    index, index_type, ignore = add_index_options(table_name, column_names, **options)
+
+    if index.is_a?(ActiveRecord::ConnectionAdapters::IndexDefinition)
+      @indexes[table_name] << index
+    else
+      # Rails < 6.1
+      @indexes[table_name] << IndexDefinition.new(table_name, index, (index_type == 'UNIQUE'), column_names, [], [])
+    end
   end
 
-  def remove_index(table_name, options = {})
-    index_name = index_name_for_remove(table_name, options)
-    index = @indexes[table_name].reject! { |index| index.name == index_name }
+  # Rails 6.1+
+  if ActiveRecord::VERSION::MAJOR >= 6 and ActiveRecord::VERSION::MINOR > 0
+    def remove_index(table_name, column_name = nil, **options )
+      index_name = index_name_for_remove(table_name, column_name, options)
+      index = @indexes[table_name].reject! { |index| index.name == index_name }
+    end
+  else
+    def remove_index(table_name,  options = {} )
+      index_name = index_name_for_remove(table_name, options)
+      index = @indexes[table_name].reject! { |index| index.name == index_name }
+    end
   end
 
   def add_fk_constraint(*args)
@@ -129,7 +145,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
     if table = @tables[table_name]
       table.columns.map do |col_def|
-        col_args = new_column_arguments(col_def)
+        col_args = default_column_arguments(col_def)
         ActiveRecord::ConnectionAdapters::NullDBAdapter::Column.new(*col_args)
       end
     else
@@ -204,16 +220,16 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   end
 
   def primary_key(table_name)
-    columns(table_name).detect { |col| col.sql_type == :primary_key }.try(:name)
+    columns(table_name).detect { |col| col.type == :primary_key }.try(:name)
   end
 
-  def add_column(table_name, column_name, type, options = {})
+  def add_column(table_name, column_name, type, **options)
     super
 
     table_meta = @tables[table_name.to_s]
     return unless table_meta
 
-    table_meta.column column_name, type, options
+    table_meta.column column_name, type, **options
   end
 
   def change_column(table_name, column_name, type, options = {})
@@ -306,34 +322,23 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     end
   end
 
-  def new_column_arguments(col_def)
-    args_with_optional_cast_type(col_def)
-  end
-
-  def args_with_optional_cast_type(col_def)
-    default_column_arguments(col_def).tap do |args|
-      if defined?(ActiveRecord::ConnectionAdapters::SqlTypeMetadata)
-        meta = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: col_def.type)
-        args.insert(2, meta_with_limit!(meta, col_def))
-      else
-        args[2] = args[2].to_s + "(#{col_def.limit})" if col_def.limit
-      end
-    end
-  end
-
-  def meta_with_limit!(meta, col_def)
-    meta.instance_variable_set('@limit', col_def.limit)
-    meta
-  end
-
   def default_column_arguments(col_def)
     [
       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
+      col_def.default.present? ? col_def.default.to_s : nil,
+      sql_type_definition(col_def),
+      col_def.null.nil? || col_def.null
     ]
   end
 
+  def sql_type_definition(col_def)
+    ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(
+      type: col_def.type,
+      sql_type: col_def.type.to_s,
+      limit: col_def.limit
+    )
+  end
+
   def initialize_args
     [nil, @logger, @config]
   end

data/lib/nulldb/version.rb

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

data/spec/nulldb_spec.rb

@@ -70,6 +70,7 @@ describe "NullDB" do
         t.date    :hire_date
         t.integer :employee_number
         t.decimal :salary
+        t.boolean :active, default: true
       end
 
       create_table(:employees_widgets, :id => false, :force => true) do |t|
@@ -108,6 +109,7 @@ describe "NullDB" do
     should_have_column(Employee, :hire_date, :date)
     should_have_column(Employee, :employee_number, :integer)
     should_have_column(Employee, :salary, :decimal)
+    should_have_column(Employee, :active, :boolean)
   end
 
   it 'should have limit on name' do
@@ -122,6 +124,14 @@ describe "NullDB" do
     expect(Employee.columns_hash['name'].null).to be false
   end
 
+  it "should stringify default values" do
+    expect(Employee.columns_hash['active'].default).to eq "true"
+  end
+
+  it "should have no default for employee_number" do
+    expect(Employee.columns_hash['employee_number'].default).to eq nil
+  end
+
   it "should return the appropriate primary key" do
     expect( ActiveRecord::Base.connection.primary_key('employees') ).to eq 'id'
   end
@@ -291,7 +301,13 @@ describe "NullDB" do
 end
 
 # need a fallback db for contextual nullification
-ActiveRecord::Base.configurations['test'] = {'adapter' => 'nulldb'}
+if defined?(ActiveRecord::DatabaseConfigurations)
+  db_config = { 'test' => {'adapter' => 'nulldb'} }
+  ActiveRecord::Base.configurations = ActiveRecord::DatabaseConfigurations.new(db_config)
+else
+  # Support ActiveRecord 5
+  ActiveRecord::Base.configurations['test'] = {'adapter' => 'nulldb'}
+end
 
 describe NullDB::RSpec::NullifiedDatabase do
   describe 'have_executed rspec matcher' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Avdi Grimm
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: '0'
 description: A database backend that translates database interactions into no-ops.
   Using NullDB enables you to test your model business logic - including after_save
   hooks - without ever touching a real database.
@@ -126,8 +140,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGES.md
 - Gemfile
@@ -137,6 +151,7 @@ files:
 - activerecord-nulldb-adapter.gemspec
 - gemfiles/activerecord_5.2.gemfile
 - gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_master.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
 - lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-bundler_args: --without development
-sudo: false
-
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby
-
-gemfile:
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_6.0.gemfile
-  - gemfiles/activerecord_master.gemfile
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: jruby
-    - gemfile: gemfiles/activerecord_master.gemfile