activerecord-nulldb-adapter 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a2b38931986ca22035d58a578fa13a21f74360
-  data.tar.gz: 5700dffe9b6c19f8ff9c9e0b8cb3c81887c9dde1
+  metadata.gz: 81d75c5def8b53125f8505b1cde22775cb4cbcbd
+  data.tar.gz: fa4c888a50ce9aacdaa58c628890319b35ea01bc
 SHA512:
-  metadata.gz: ace3f7f82325a86cb9744fa365f740ab9317961f724412d07dfc0b8f6e83948a8b98375a228ab9721a230466908f1ed4440c268edfc555be3fd7081c0c119890
-  data.tar.gz: 745b6c3543a7e59563cfbf78edf65345e248641d5b7e9fb90389686ee0375718ca523dc52e4db39a2a12a420a9d1e2829ed2a32242fea5e7f3038cec91f09d84
+  metadata.gz: 9cc5c7db63a7bb752dfcd962d939887bf985a4d0b41fe017ad2310535b0b6747d776ff29976508da9b2f83271c31d1fc77bc4d7a2d9897b8909af3148e13abd5
+  data.tar.gz: ef64f1a39cc7a96d1a5ea2efc1641a4f1019e23ecd5092bd6b100fafbc7eeac0c43c8716fc759cf00e270177d6dabbbfbf22ede67797e871a6ccb4bcfc1bedd6

data/.travis.yml

@@ -17,6 +17,14 @@ matrix:
     - rvm: jruby
     - rvm: rbx
   exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/activerecord_master.gemfile
+    - rvm: 2.1.10
+      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
@@ -37,3 +45,5 @@ gemfile:
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
   - gemfiles/activerecord_5.0.gemfile
+  - gemfiles/activerecord_5.1.gemfile
+  - gemfiles/activerecord_master.gemfile

data/Appraisals

@@ -30,3 +30,7 @@ end
 appraise "activerecord-5.0" do
   gem "activerecord", "~> 5.0.0"
 end
+
+appraise "activerecord-5.1" do
+  gem "activerecord", "~> 5.1.0"
+end

data/CHANGES.md

@@ -1,3 +1,9 @@
+0.3.7 (2017-06-04)
+-----------
+- Adds support for ActiveRecord 5.1/5.2.
+- Support limit and null
+
+
 0.3.6 (2016-11-23)
 -----------
 - Adds support for ActiveRecord 5.0.

data/activerecord-nulldb-adapter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "activerecord-nulldb-adapter"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.require_paths = ["lib"]
   s.authors = ["Avdi Grimm", "Myron Marston"]

data/gemfiles/activerecord_5.1.gemfile

@@ -0,0 +1,16 @@
+# 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

data/gemfiles/activerecord_master.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+git 'https://github.com/rails/rails.git' do
+  gem 'activerecord'
+end
+
+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/lib/active_record/connection_adapters/nulldb_adapter/core.rb

@@ -279,21 +279,37 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
   def args_with_optional_cast_type(col_def)
     default_column_arguments(col_def).tap do |args|
-      if respond_to? :fetch_type_metadata
-        args.insert(2, fetch_type_metadata(col_def.type))
+      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, lookup_cast_type(col_def.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
     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.type,
-      col_def.null
-    ]
+    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?

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

@@ -17,6 +17,10 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter
     def cast_values(type_overrides = nil)
       rows
     end
+
+    def >(num)
+      rows.size > num
+    end
   end
 
 end

data/lib/nulldb/extensions.rb

@@ -33,7 +33,7 @@ end
 
 module ActiveRecord
   # Just make sure you have the latest version of your schema
-  superclass = ActiveRecord::VERSION::MAJOR == 5 ? Migration[5.0] : Migration
+  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)

data/spec/nulldb_spec.rb

@@ -71,7 +71,7 @@ describe "NullDB" do
     ActiveRecord::Migration.verbose = false
     ActiveRecord::Schema.define do
       create_table(:employees) do |t|
-        t.string  :name
+        t.string  :name, null: false, limit: 50
         t.date    :hire_date
         t.integer :employee_number
         t.decimal :salary
@@ -113,6 +113,18 @@ describe "NullDB" do
     should_have_column(Employee, :salary, :decimal)
   end
 
+  it 'should have limit on name' do
+    expect(Employee.columns_hash['name'].limit).to eq 50
+  end
+
+  it "should return true on nullable field" do
+    expect(Employee.columns_hash['salary'].null).to be true
+  end
+
+  it "should return false on non-nullable field" do
+    expect(Employee.columns_hash['name'].null).to be false
+  end
+
   it "should return the appropriate primary key" do
     expect( ActiveRecord::Base.connection.primary_key('employees') ).to eq 'id'
   end
@@ -249,7 +261,7 @@ describe "NullDB" do
 
   def should_have_column(klass, col_name, col_type)
     col = klass.columns_hash[col_name.to_s]
-    expect(col.sql_type.to_sym).to eq col_type
+    expect(col.sql_type.to_s.gsub(/\([0-9]+\)/, "").to_sym).to eq col_type
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Avdi Grimm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -123,6 +123,8 @@ files:
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
 - gemfiles/activerecord_5.0.gemfile
+- gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_master.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
 - lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb
 - lib/active_record/connection_adapters/nulldb_adapter/column.rb
@@ -163,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The Null Object pattern as applied to ActiveRecord database adapters