activerecord-nulldb-adapter 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0977e58aadc5717c6303c46fa071b05f9d3f4551d20faa1cf820389363ea1b4
-  data.tar.gz: 9a89250a169be9d67b40a2235a6c22a9015886cd94f2639b3ce05da7a5f206b1
+  metadata.gz: e28ca94f06b2337cd9493abfad27346a67d83e2b1d2c62502d36488b141c8ce9
+  data.tar.gz: 8ba786f431c4869ffd2679a6306da5d80fcb93d10514cb78fc0c9e6a34d13f94
 SHA512:
-  metadata.gz: ea8a0ca7eccc255134383140d4cfc7e74c959108536abfbf56c5da3649b3e024721193df8e7791fcd3fc43b4c1f4bffb4306aae869d571c53209d761aa11cfd5
-  data.tar.gz: 3ffa933914659c3f945bd66c82a19afd1e60ed76a14f467b474a622a85fa23e1eea7e56a20b3c2c25fef751288e347039b911d4bda2a0f10fef3d78c1f8b43ac
+  metadata.gz: 7b482f6fc83e8ed912bd7157799bca3765000656744b54edc60c9c9dacde90e0ce1218f047c17ca02825d8c0224be44bda810db446ff2dd54054916f7f273720
+  data.tar.gz: 8ebc55bd87b24ce9355be8b435512cb01c84608acfe036a5835a059a85f9300fe95a968220edc441bbe7dd796670c3c27f22076ae2e20888620b0b068fb2450b

data/.travis.yml

@@ -4,22 +4,13 @@ bundler_args: --without development
 sudo: false
 
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - jruby
-  - rbx
 
 gemfile:
-  - gemfiles/activerecord_2.3.gemfile
-  - gemfiles/activerecord_3.2.gemfile
-  - 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
+  - gemfiles/activerecord_5.2.gemfile
   - gemfiles/activerecord_6.0.gemfile
   - gemfiles/activerecord_master.gemfile
 
@@ -27,49 +18,4 @@ matrix:
   fast_finish: true
   allow_failures:
     - rvm: jruby
-    - rvm: rbx
     - gemfile: gemfiles/activerecord_master.gemfile
-  exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/activerecord_2.3.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.3
-      gemfile: gemfiles/activerecord_2.3.gemfile
-    - rvm: 2.3
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.3
-      gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_2.3.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_3.2.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_4.1.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/activerecord_2.3.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/activerecord_3.2.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: 2.5
-      gemfile: gemfiles/activerecord_4.1.gemfile
-    - rvm: 2.6
-      gemfile: gemfiles/activerecord_2.3.gemfile
-    - rvm: 2.6
-      gemfile: gemfiles/activerecord_3.2.gemfile
-    - rvm: 2.6
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: 2.6
-      gemfile: gemfiles/activerecord_4.1.gemfile
-
-
-

data/Appraisals

@@ -1,40 +1,11 @@
-appraise "activerecord-2.3" do
-  gem 'iconv', :platforms => :ruby
-  gem "activerecord", "~> 2.3.0"
+appraise "activerecord-5.2" do
+  gem "activerecord", "~> 5.2.0"
 end
 
-appraise "activerecord-3.0" do
-  gem "activerecord", "~> 3.0.0"
-end
-
-appraise "activerecord-3.1" do
-  gem "activerecord", "~> 3.1.0"
-end
-
-appraise "activerecord-3.2" do
-  gem "activerecord", "~> 3.2.0"
-end
-
-appraise "activerecord-4.0" do
-  gem "activerecord", "~> 4.0.0"
-end
-
-appraise "activerecord-4.1" do
-  gem "activerecord", "~> 4.1.0"
-end
-
-appraise "activerecord-4.2" do
-  gem "activerecord", "~> 4.2.0"
-end
-
-appraise "activerecord-5.0" do
-  gem "activerecord", "~> 5.0.0"
-end
-
-appraise "activerecord-5.1" do
-  gem "activerecord", "~> 5.1.0"
+appraise "activerecord-6.0" do
+  gem "activerecord", "~> 6.0.0"
 end
 
-appraise "activerecord-6.0" do
-  gem "activerecord", "~> 6.0.0.rc1"
+appraise "activerecord-master" do
+  gem "activerecord", github: 'rails/rails'
 end

data/CHANGES.md

@@ -1,6 +1,14 @@
 Unreleased
 ----------
 
+0.5.0 (2020-10-15)
+-----------
+
+- *Breaking* Drop support to Ruby 2.2, 2.3, 2.4
+- *Breaking* Drop support to Rails 2.X, 3.X, 4.X, 5.0, 5.1
+- Drop support to old versions of Ruby and Rails. #96
+- Added support for postgres column types included jsonb and ability to delete columns #94
+
 0.4.0 (2019-07-22)
 -----------
 

data/README.rdoc

@@ -16,14 +16,14 @@ a real database.
 == Compatibility
 
 === Ruby
-Currently supported Ruby versions: MRI 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x
+Currently supported Ruby versions: MRI 2.5.x, 2.6.x, 2.7.x
 
-Experimental support provided for: JRuby, Rubinius
+Experimental support provided for: JRuby
 
 === ActiveRecord
-Any version of ActiveRecord since 2.0, including ActiveRecord 5.0
+Any version of ActiveRecord >= 5
 
-It is tested against AR 2.3, 3.0, 3.1, 3.2, 4.0, 4.1, 4.2 and 5.0.
+It is tested against AR 5.2, 6.0 and master branch.
 
 == Installation
 
@@ -136,7 +136,8 @@ nothing will be saved.
 == Who
 
 NullDB was originally written by Avdi Grimm <mailto:avdi@avdi.org>.
-It is currently maintained by {Bram de Vries}[https://github.com/blaet].
+It is currently maintained by {Danilo Cabello}[https://github.com/cabello].
+Previously maintained by: {Bram de Vries}[https://github.com/blaet].
 
 == Where
 

data/activerecord-nulldb-adapter.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files    = `git ls-files`.split($/)
-  s.homepage = "http://github.com/nulldb/nulldb"
+  s.homepage = "https://github.com/nulldb/nulldb"
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency 'activerecord', '>= 2.0.0'
+  s.add_runtime_dependency 'activerecord', '>= 5.2.0'
   s.add_development_dependency 'spec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'

data/gemfiles/{activerecord_4.2.gemfile → activerecord_5.2.gemfile}

@@ -2,15 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 5.2.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
+  gem "simplecov", require: false
 end

data/gemfiles/activerecord_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0.rc1"
+gem "activerecord", "~> 6.0.0"
 
 group :development, :test do
   gem "spec"

data/gemfiles/activerecord_master.gemfile

@@ -2,19 +2,16 @@
 
 source "https://rubygems.org"
 
-git 'https://github.com/rails/rails.git' do
-  gem 'activerecord'
-end
-
-gem 'arel', github: 'rails/arel', branch: 'master'
+gem "activerecord", github: "rails/rails"
 
 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
+  gem "simplecov", require: false
 end

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

@@ -74,7 +74,14 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
     yield table_definition if block_given?
 
-    @tables[table_name] = table_definition
+    @tables[table_name.to_s] = table_definition
+  end
+
+  def rename_table(table_name, new_name)
+    table_definition = @tables.delete(table_name.to_s)
+
+    table_definition.name = new_name.to_s
+    @tables[new_name.to_s] = table_definition
   end
 
   def add_index(table_name, column_names, options = {})
@@ -83,6 +90,11 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     @indexes[table_name] << IndexDefinition.new(table_name, index_name, (index_type == 'UNIQUE'), column_names, [], [])
   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 }
+  end
+
   unless instance_methods.include? :add_index_options
     def add_index_options(table_name, column_name, options = {})
       column_names = Array.wrap(column_name)
@@ -228,6 +240,45 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     columns(table_name).detect { |col| col.sql_type == :primary_key }.try(:name)
   end
 
+  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
+  end
+
+  def change_column(table_name, column_name, type, options = {})
+    table_meta = @tables[table_name.to_s]
+    column = table_meta.columns.find { |column| column.name == column_name.to_s }
+    return unless column
+
+    column.type = type
+    column.options = options if options
+  end
+
+  def rename_column(table_name, column_name, new_column_name)
+    table_meta = @tables[table_name.to_s]
+    column = table_meta.columns.find { |column| column.name == column_name.to_s }
+    return unless column
+
+    column.name = new_column_name
+  end
+
+  def change_column_default(table_name, column_name, default_or_changes)
+    table_meta = @tables[table_name.to_s]
+    column = table_meta.columns.find { |column| column.name == column_name.to_s }
+
+    return unless column
+
+    if default_or_changes.kind_of? Hash
+      column.default = default_or_changes[:to]
+    else
+      column.default = default_or_changes
+    end
+  end
+
   protected
 
   def select(statement, name = nil, binds = [])

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

@@ -1,5 +1,10 @@
 class ActiveRecord::ConnectionAdapters::NullDBAdapter
 
-  TableDefinition = ActiveRecord::ConnectionAdapters::TableDefinition
-
+  class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
+    attr_accessor :name
+    alias_method :citext, :text
+    alias_method :interval, :text
+    alias_method :geometry, :text
+    alias_method :jsonb, :json if method_defined? :json
+  end
 end

data/lib/nulldb/version.rb

@@ -1,3 +1,3 @@
 module NullDB
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/nulldb_spec.rb

@@ -84,6 +84,8 @@ describe "NullDB" do
 
       add_index "employees", :name, :name => "index_employees_on_name"
       add_index "employees", ["employee_number"], :name => "index_employees_on_employee_number", :unique => true
+      add_index "employees", :hire_date
+      remove_index "employees", :hire_date
       add_index "employees_widgets", ["employee_id", "widget_id"], :name => "my_index"
 
       add_fk_constraint "foo", "bar", "baz", "buz", "bungle"
@@ -265,7 +267,7 @@ describe "NullDB" do
   end
 
 
-  it "should support adding indexes" do
+  it "should support adding and removing indexes" do
     expect( Employee.connection.indexes('employees').size ).to eq 2
     expect( Employee.connection.indexes('employees_widgets').size ).to eq 1
   end
@@ -288,7 +290,7 @@ describe "NullDB" do
     expect { NullDB.nullify }.to_not raise_error
   end
 
-  it 'should handle count queries' do 
+  it 'should handle count queries' do
     expect(Employee.count).to eql(0)
   end
 end
@@ -324,6 +326,131 @@ describe NullDB::RSpec::NullifiedDatabase do
   end
 end
 
+describe 'table changes' do
+  before(:each) do
+    ActiveRecord::Base.establish_connection :adapter => :nulldb
+    ActiveRecord::Migration.verbose = false
+
+    ActiveRecord::Schema.define do
+      create_table(:employees) do |t|
+        t.string  :name, null: false, limit: 50
+        t.date    :hire_date
+        t.integer :employee_number
+        t.decimal :salary
+      end
+    end
+  end
+
+  def should_have_column(klass, col_name, col_type)
+    col = klass.columns_hash[col_name.to_s]
+    expect(col.sql_type.to_s.gsub(/\([0-9]+\)/, "").to_sym).to eq col_type
+  end
+
+  describe 'rename_table' do
+    it 'should rename a table' do
+      expect{
+        ActiveRecord::Schema.define do
+          rename_table :employees, :workers
+        end
+      }.to_not raise_error
+
+      class Worker < ActiveRecord::Base
+        after_save :on_save_finished
+
+        def on_save_finished
+        end
+      end
+
+      should_have_column(Worker, :name, :string)
+      should_have_column(Worker, :hire_date, :date)
+      should_have_column(Worker, :employee_number, :integer)
+      should_have_column(Worker, :salary, :decimal)
+
+      worker = Worker.create(:name => "Bob Jones")
+      expect(worker.name).to eq "Bob Jones"
+    end
+  end
+
+  describe 'add_column' do
+    it 'should add a column to an existing table' do
+      expect{
+        ActiveRecord::Schema.define do
+          add_column :employees, :title, :string
+        end
+        Employee.connection.schema_cache.clear!
+        Employee.reset_column_information
+      }.to_not raise_error
+
+      should_have_column(Employee, :name, :string)
+      should_have_column(Employee, :hire_date, :date)
+      should_have_column(Employee, :employee_number, :integer)
+      should_have_column(Employee, :salary, :decimal)
+      should_have_column(Employee, :title, :string)
+    end
+  end
+
+  describe 'change_column' do
+    it 'should change the column type' do
+      expect{
+        ActiveRecord::Schema.define do
+          change_column :employees, :name, :text
+        end
+        Employee.connection.schema_cache.clear!
+        Employee.reset_column_information
+      }.to_not raise_error
+
+      should_have_column(Employee, :name, :text)
+      should_have_column(Employee, :hire_date, :date)
+      should_have_column(Employee, :employee_number, :integer)
+      should_have_column(Employee, :salary, :decimal)
+    end
+  end
+
+  describe 'rename_column' do
+    it 'should rename a column' do
+      expect{
+        ActiveRecord::Schema.define do
+          rename_column :employees, :name, :full_name
+        end
+        Employee.connection.schema_cache.clear!
+        Employee.reset_column_information
+      }.to_not raise_error
+
+      should_have_column(Employee, :full_name, :string)
+      should_have_column(Employee, :hire_date, :date)
+      should_have_column(Employee, :employee_number, :integer)
+      should_have_column(Employee, :salary, :decimal)
+    end
+  end
+
+  describe 'change_column_default' do
+    it 'should change default value of a column' do
+      expect{
+        ActiveRecord::Schema.define do
+          change_column_default :employees, :name, 'Jon Doe'
+        end
+        Employee.connection.schema_cache.clear!
+        Employee.reset_column_information
+      }.to_not raise_error
+
+      columns = Employee.columns
+      expect(columns.second.default).to eq('Jon Doe')
+    end
+
+    it 'should change default value of a with has syntax' do
+      expect{
+        ActiveRecord::Schema.define do
+          change_column_default :employees, :name, from: nil, to: 'Jon Doe'
+        end
+        Employee.connection.schema_cache.clear!
+        Employee.reset_column_information
+      }.to_not raise_error
+
+      columns = Employee.columns
+      expect(columns.second.default).to eq('Jon Doe')
+    end
+  end
+end
 
 describe 'adapter-specific extensions' do
   before(:all) do
@@ -331,6 +458,11 @@ describe 'adapter-specific extensions' do
     ActiveRecord::Migration.verbose = false
   end
 
+  def should_have_column(klass, col_name, col_type)
+    col = klass.columns_hash[col_name.to_s]
+    expect(col.sql_type.to_s.gsub(/\([0-9]+\)/, "").to_sym).to eq col_type
+  end
+
   it "supports 'enable_extension' in the schema definition" do
     expect{
       ActiveRecord::Schema.define do
@@ -339,6 +471,27 @@ describe 'adapter-specific extensions' do
     }.to_not raise_error
   end
 
+  it 'supports postgres extension columns' do
+    expect {
+      ActiveRecord::Schema.define do
+        create_table :extended_models do |t|
+          t.citext :text
+          t.interval :time_interval
+          t.geometry :feature_geometry, srid: 4326, type: "multi_polygon"
+          t.jsonb :jsonb_column
+        end
+      end
+    }.to_not raise_error
+
+    class ExtendedModel < ActiveRecord::Base
+    end
+
+    should_have_column(ExtendedModel, :text, :text)
+    should_have_column(ExtendedModel, :time_interval, :text)
+    should_have_column(ExtendedModel, :feature_geometry, :text)
+    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'))

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Avdi Grimm
 - Myron Marston
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement
@@ -128,13 +128,7 @@ files:
 - README.rdoc
 - Rakefile
 - activerecord-nulldb-adapter.gemspec
-- gemfiles/activerecord_2.3.gemfile
-- gemfiles/activerecord_3.2.gemfile
-- 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
+- gemfiles/activerecord_5.2.gemfile
 - gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_master.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
@@ -159,11 +153,11 @@ files:
 - lib/tasks/database.rake
 - spec/nulldb_spec.rb
 - spec/spec.opts
-homepage: http://github.com/nulldb/nulldb
+homepage: https://github.com/nulldb/nulldb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The Null Object pattern as applied to ActiveRecord database adapters
 test_files: []

data/gemfiles/activerecord_2.3.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 2.3.0"
-gem "iconv", :platforms => :ruby
-
-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.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.2.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_4.0.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.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_4.1.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.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

data/gemfiles/activerecord_5.0.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.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_5.1.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.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