activerecord-import 1.8.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1478b29daf1e757c91a0ca8693bb1b03f9a90daa2fe02f0959576bcec900d85
-  data.tar.gz: dc938a1936c931182675a118ad24a37e2a7c5a27c0419e5bd947e0ec35aa4334
+  metadata.gz: f7cd19fa557186daf34db96db71f26a7db70b15e66a0a42eaab33be304945ab0
+  data.tar.gz: ff8afe763d437210ea1c78e21bacd0b4ae84f113fbadbda087077bf402f08e64
 SHA512:
-  metadata.gz: e276196113f433c8989a9a06cfad36df650105183a5559a548bdd8a04bd2da22db36ca996d2d0d04c4561b33ceb44559b50b4ad98e0a2d9f050b8084ee99c8e6
-  data.tar.gz: e699052ac2499bac23a9955fef71df853050767785d573523e23a1d216cfba9cb75b81b0db9f5e2afac02afbcb416563af6e7a2bf69f6d1288c6e6c71aeb7e5c
+  metadata.gz: 402d2087c8c35a2adfa3787ee4e183883df74cc1f4ad2276de1227ba9778b630bfbee546faa3b53b7dcbe1142232bd7d03de046ccab5c6caa5c475a3bc4f15c1
+  data.tar.gz: ef5ce7d4dba744b3c58a0affbe326b50d764c7e4c4726b468ad4d18eacee13fbaa8d7b5d78459bc048e8eeb0628cf34b52a59f759f0a1f4d9d491b7439d5845a

data/.github/workflows/test.yaml

@@ -21,6 +21,7 @@ jobs:
         ports:
           - 3306:3306
         env:
+          MYSQL_HOST: 127.0.0.1
           MYSQL_ROOT_PASSWORD: root
           MYSQL_USER: github
           MYSQL_PASSWORD: github
@@ -36,6 +37,8 @@ jobs:
         ruby:
           - 3.3
         env:
+          - AR_VERSION: '8.0'
+            RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: '7.2'
             RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: '7.1'
@@ -45,6 +48,9 @@ jobs:
           - AR_VERSION: 6.1
             RUBYOPT: --enable-frozen-string-literal
         include:
+          - ruby: 3.2
+            env:
+              AR_VERSION: '8.0'
           - ruby: 3.2
             env:
               AR_VERSION: '7.2'
@@ -72,7 +78,7 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
-          - ruby: jruby-9.4.5.0
+          - ruby: jruby-9.4.8.0
             env:
               AR_VERSION: '7.0'
           - ruby: 2.7
@@ -84,7 +90,7 @@ jobs:
           - ruby: 2.7
             env:
               AR_VERSION: '6.0'
-          - ruby: jruby-9.3.10.0
+          - ruby: jruby-9.3.15.0
             env:
               AR_VERSION: '6.1'
           - ruby: 2.6
@@ -96,6 +102,10 @@ jobs:
       DB_DATABASE: activerecord_import_test
     steps:
       - uses: actions/checkout@v4
+      - name: Install SQLite3 Development Library
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsqlite3-dev
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -103,8 +113,6 @@ jobs:
           rubygems: latest
       - name: Set up databases
         run: |
-          sudo /etc/init.d/mysql start
-          mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }} CHARACTER SET utf8 COLLATE utf8_general_ci;' -u root -proot
           psql -h localhost -U postgres -c 'create database ${{ env.DB_DATABASE }};'
           psql -h localhost -U postgres -d ${{ env.DB_DATABASE }} -c 'create extension if not exists hstore;'
           psql -h localhost -U postgres -c 'create extension if not exists postgis;'
@@ -117,11 +125,14 @@ jobs:
           bundle exec rake test:mysql2
           bundle exec rake test:mysql2_makara
           bundle exec rake test:mysql2spatial
+          bundle exec rake test:mysql2_proxy
+          bundle exec rake test:janus_mysql2
       - name: Run tests with postgresql
         run: |
           bundle exec rake test:postgis
           bundle exec rake test:postgresql
           bundle exec rake test:postgresql_makara
+          bundle exec rake test:postgresql_proxy
       - name: Run tests with seamless_database_pool
         run: |
           bundle exec rake test:seamless_database_pool
@@ -132,16 +143,23 @@ jobs:
           bundle exec rake test:sqlite3
       - name: Run trilogy tests
         if: ${{ matrix.env.AR_VERSION >= '7.0' && !startsWith(matrix.ruby, 'jruby') }}
-        run: bundle exec rake test:trilogy
+        run: |
+          bundle exec rake test:trilogy
+          bundle exec rake test:janus_trilogy
+
   lint:
     runs-on: ubuntu-latest
     env:
       AR_VERSION: '7.0'
     steps:
       - uses: actions/checkout@v4
+      - name: Install SQLite3 Development Library
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsqlite3-dev
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 3.0.x
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -12,9 +15,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -90,6 +90,9 @@ Layout/SpaceInsideParens:
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
+Layout/LineLength:
+  Enabled: false
+
 Lint/ErbNewArguments:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## Changes in 2.2.0
+
+### New Features
+
+* Add Support for Janus ActiveRecord adapters. Thanks to @permidon via #\873.
+
+## Changes in 2.1.0
+
+### New Features
+
+* Add Support for `active_record_proxy_adapters` gem thanks to @stingrayzboy via #\867.
+  Since Rails 7.1 makara no longer works and it is not currently maintained. The @nasdaq team
+  have written a gem called [active_record_proxy_adapters](https://rubygems.org/gems/active_record_proxy_adapters)
+  that implements some makara functionality.
+
+## Changes in 2.0.0
+
+### Breaking Changes
+
+* Fix `recursive_on_duplicate_key_update` doesn't work with non-standard
+  association name. Thanks to @jacob-carlborg-apoex via \#852. The documentation for the
+  `:recursive_on_duplicate_key_update` option specifies that the hash key is
+  the association name. But previously the name of associated table was used to
+  look up the options. Now the behavior matches the documentation and the name
+  of the association is used instead. This only affects associations that uses
+  a name that doesn't follow the ActiveRecord naming conventions of
+  associations and class names, i.e. when the `class_name:` option is used on
+  an association.
+
+## Changes in 1.8.1
+
+### Fixes
+
+* Further update for ActiveRecord 7.2 compatibility when running validations. Thanks to @denisahearn  via \##847.
+
 ## Changes in 1.8.0
 
 ### New Features

data/Gemfile

@@ -6,13 +6,15 @@ gemspec
 
 version = ENV['AR_VERSION'].to_f
 
-mysql2_version = '0.3.0'
-mysql2_version = '0.4.0' if version >= 4.2
+mysql2_version = '0.4.0'
 mysql2_version = '0.5.0' if version >= 6.1
+mysql2_version = '0.5.6' if version >= 8.0
 sqlite3_version = '1.3.0'
 sqlite3_version = '1.4.0' if version >= 6.0
+sqlite3_version = '2.2.0' if version >= 8.0
 pg_version = '0.9'
 pg_version = '1.1' if version >= 6.1
+pg_version = '1.5' if version >= 8.0
 
 group :development, :test do
   gem 'rubocop'
@@ -51,19 +53,11 @@ gem "chronic"
 gem "mocha", "~> 2.1.0"
 
 # Debugging
-platforms :jruby do
-  gem "ruby-debug", "= 0.10.4"
-end
-
 platforms :ruby do
   gem "pry-byebug"
   gem "pry", "~> 0.14.0"
 end
 
-if version >= 4.0
-  gem "minitest"
-else
-  gem "test-unit"
-end
+gem "minitest"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/README.markdown

@@ -569,11 +569,11 @@ require 'activerecord-import'
 ### Load Path Setup
 To understand how rubygems loads code you can reference the following:
 
-  http://guides.rubygems.org/patterns/#loading-code
+  https://guides.rubygems.org/patterns/#loading-code
 
 And an example of how active_record dynamically load adapters:
 
-  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+  https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters.rb
 
 In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propagate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
 

data/Rakefile

@@ -19,17 +19,21 @@ ADAPTERS = %w(
   mysql2
   mysql2_makara
   mysql2spatial
+  mysql2_proxy
+  janus_mysql2
   jdbcmysql
   jdbcsqlite3
   jdbcpostgresql
   postgresql
   postgresql_makara
+  postgresql_proxy
   postgis
   makara_postgis
   sqlite3
   spatialite
   seamless_database_pool
   trilogy
+  janus_trilogy
 ).freeze
 ADAPTERS.each do |adapter|
   namespace :test do

data/benchmarks/benchmark.rb

@@ -44,8 +44,6 @@ require adapter_schema if File.exist?(adapter_schema)
 Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 
 require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
-
-table_types = nil
 table_types = if options.benchmark_all_types
   ["all"]
 else

data/benchmarks/lib/base.rb

@@ -16,7 +16,7 @@ class BenchmarkBase
     end
   end
 
-  # Returns an OpenStruct which contains two attritues, +description+ and +tms+ after performing an
+  # Returns a struct which contains two attritues, +description+ and +tms+ after performing an
   # actual benchmark.
   #
   # == PARAMETERS
@@ -24,9 +24,12 @@ class BenchmarkBase
   #  * blk - the block of code to benchmark
   #
   # == RETURNS
-  # An OpenStruct object with the following attributes:
+  # A struct object with the following attributes:
   #   * description - the description of the benchmark ran
   #   * tms - a Benchmark::Tms containing the results of the benchmark
+
+  BmStruct = Struct.new( :description, :tms, :failed, keyword_init: true )
+
   def bm( description, &block )
     tms = nil
     puts "Benchmarking #{description}"
@@ -35,7 +38,7 @@ class BenchmarkBase
     delete_all
     failed = false
 
-    OpenStruct.new description: description, tms: tms, failed: failed
+    BmStruct.new( description: description, tms: tms, failed: failed )
   end
 
   # Given a model class (ie: Topic), and an array of columns and value sets

data/benchmarks/lib/cli_parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'ostruct'
 
 #
 # == PARAMETERS
@@ -10,7 +9,7 @@ require 'ostruct'
 # * t - the table types to test. ie: myisam, innodb, memory, temporary, etc.
 #
 module BenchmarkOptionParser
-  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options.".freeze
 
   def self.print_banner
     puts BANNER
@@ -38,8 +37,11 @@ module BenchmarkOptionParser
     end
   end
 
+  OptionsStruct = Struct.new( :adapter, :table_types, :delete_on_finish, :number_of_objects, :outputs,
+                              :benchmark_all_types, keyword_init: true )
+  OutputStruct = Struct.new( :format, :filename, keyword_init: true )
   def self.parse( args )
-    options = OpenStruct.new(
+    options = OptionsStruct.new(
       adapter: 'mysql2',
       table_types: {},
       delete_on_finish: true,
@@ -81,12 +83,12 @@ module BenchmarkOptionParser
 
       # print results in CSV format
       opts.on( "--to-csv [String]", "Print results in a CSV file format" ) do |filename|
-        options.outputs << OpenStruct.new( format: 'csv', filename: filename)
+        options.outputs << OutputStruct.new( format: 'csv', filename: filename)
       end
 
       # print results in HTML format
       opts.on( "--to-html [String]", "Print results in HTML format" ) do |filename|
-        options.outputs << OpenStruct.new( format: 'html', filename: filename )
+        options.outputs << OutputStruct.new( format: 'html', filename: filename )
       end
     end # end opt.parse!
 
@@ -100,7 +102,7 @@ module BenchmarkOptionParser
     end
 
     options.number_of_objects = [1000] if options.number_of_objects.empty?
-    options.outputs = [OpenStruct.new( format: 'html', filename: 'benchmark.html')] if options.outputs.empty?
+    options.outputs = [OutputStruct.new( format: 'html', filename: 'benchmark.html')] if options.outputs.empty?
 
     print_options( options )
 

data/gemfiles/8.0.gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem 'activerecord', '~> 8.0.0'

data/lib/activerecord-import/adapters/sqlite3_adapter.rb

@@ -58,7 +58,7 @@ module ActiveRecord::Import::SQLite3Adapter
     sql = []
 
     # Options :recursive and :on_duplicate_key_ignore are mutually exclusive
-    if supports_on_duplicate_key_update? && ((options[:ignore] || options[:on_duplicate_key_ignore]) && !options[:on_duplicate_key_update])
+    if supports_on_duplicate_key_update? && (options[:ignore] || options[:on_duplicate_key_ignore]) && !options[:on_duplicate_key_update]
       sql << sql_for_on_duplicate_key_ignore( options[:on_duplicate_key_ignore] )
     end
 

data/lib/activerecord-import/base.rb

@@ -11,11 +11,15 @@ module ActiveRecord::Import
     case adapter
     when 'mysql2_makara' then 'mysql2'
     when 'mysql2spatial' then 'mysql2'
+    when 'mysql2_proxy' then 'mysql2'
+    when 'janus_mysql2' then 'mysql2'
     when 'spatialite' then 'sqlite3'
     when 'postgresql_makara' then 'postgresql'
+    when 'postgresql_proxy' then 'postgresql'
     when 'makara_postgis' then 'postgresql'
     when 'postgis' then 'postgresql'
     when 'cockroachdb' then 'postgresql'
+    when 'janus_trilogy' then 'trilogy'
     else adapter
     end
   end

data/lib/activerecord-import/import.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "ostruct"
-
 module ActiveRecord::Import::ConnectionAdapters; end
 
 module ActiveRecord::Import # :nodoc:
@@ -94,7 +92,7 @@ module ActiveRecord::Import # :nodoc:
             env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
             if runner.respond_to?(:call) # ActiveRecord < 5.1
               runner.call(env)
-            else # ActiveRecord 5.1
+            else # ActiveRecord >= 5.1
               # Note that this is a gross simplification of ActiveSupport::Callbacks#run_callbacks.
               # It's technically possible for there to exist an "around" callback in the
               # :validate chain, but this would be an aberration, since Rails doesn't define
@@ -107,7 +105,8 @@ module ActiveRecord::Import # :nodoc:
               # no real-world use case for it.
               raise "The :validate callback chain contains an 'around' callback, which is unsupported" unless runner.final?
               runner.invoke_before(env)
-              runner.invoke_after(env)
+              # Ensure a truthy value is returned. ActiveRecord < 7.2 always returned an array.
+              runner.invoke_after(env) || []
             end
           elsif @validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
             model.instance_eval @validate_callbacks.compile
@@ -560,7 +559,7 @@ class ActiveRecord::Base
       options[:primary_key] = primary_key
       options[:locking_column] = locking_column if locking_enabled?
 
-      is_validating = options[:validate_with_context].present? ? true : options[:validate]
+      is_validating = options[:validate_with_context].present? || options[:validate]
       validator = ActiveRecord::Import::Validator.new(self, options)
 
       # assume array of model objects
@@ -858,12 +857,11 @@ class ActiveRecord::Base
 
     private
 
-    def associated_options(options, associated_class)
+    def associated_options(options, association)
       return options unless options.key?(:recursive_on_duplicate_key_update)
 
-      table_name = associated_class.arel_table.name.to_sym
       options.merge(
-        on_duplicate_key_update: options[:recursive_on_duplicate_key_update][table_name]
+        on_duplicate_key_update: options[:recursive_on_duplicate_key_update][association]
       )
     end
 
@@ -972,12 +970,12 @@ class ActiveRecord::Base
       options.delete(:returning)
 
       associated_objects_by_class.each_value do |associations|
-        associations.each_value do |associated_records|
+        associations.each do |association, associated_records|
           next if associated_records.empty?
 
           associated_class = associated_records.first.class
           associated_class.bulk_import(associated_records,
-                                       associated_options(options, associated_class))
+                                       associated_options(options, association))
         end
       end
     end
@@ -1134,8 +1132,6 @@ When importing an array of hashes with provided columns_names, each hash must co
 
 Required keys: #{required_keys}
 Missing keys: #{missing_keys}
-
-Hash: #{hash}
         EOS
       else
         <<-EOS
@@ -1148,8 +1144,6 @@ for the missing keys or group these records into batches by key set before impor
 Required keys: #{required_keys}
 Extra keys: #{extra_keys}
 Missing keys: #{missing_keys}
-
-Hash: #{hash}
         EOS
       end
     end

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.8.0"
+    VERSION = "2.2.0"
   end
 end

data/test/adapters/janus_mysql2.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "mysql2"

data/test/adapters/janus_trilogy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+ENV["ARE_DB"] = "trilogy"
+
+if ENV['AR_VERSION'].to_f <= 7.0
+  require "activerecord-trilogy-adapter"
+  require "trilogy_adapter/connection"
+  ActiveRecord::Base.extend TrilogyAdapter::Connection
+end

data/test/adapters/mysql2_proxy.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "mysql2"

data/test/adapters/postgresql_proxy.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "postgresql"

data/test/adapters/trilogy.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 ENV["ARE_DB"] = "trilogy"
 
 if ENV['AR_VERSION'].to_f <= 7.0

data/test/database.yml.sample

@@ -16,6 +16,12 @@ mysql2spatial:
 mysql2_makara:
   <<: *mysql2
 
+mysql2_proxy:
+  <<: *mysql2
+
+janus_mysql2:
+  <<: *mysql2
+
 postgresql: &postgresql
   <<: *common
   username: postgres
@@ -26,6 +32,9 @@ postgresql: &postgresql
 postresql_makara:
   <<: *postgresql
 
+postresql_proxy:
+  <<: *postgresql
+
 postgis:
   <<: *postgresql
 
@@ -57,3 +66,8 @@ trilogy:
   <<: *common
   adapter: trilogy
   host: mysql
+
+janus_trilogy:
+  <<: *common
+  adapter: trilogy
+  host: mysql

data/test/github/database.yml

@@ -3,7 +3,7 @@ common: &common
   password: root
   encoding: utf8
   collation: utf8_general_ci
-  host:     localhost
+  host: 127.0.0.1
   database: activerecord_import_test
 
 jdbcpostgresql: &postgresql
@@ -30,6 +30,12 @@ mysql2spatial:
 mysql2_makara:
   <<: *mysql2
 
+mysql2_proxy:
+  <<: *mysql2
+
+janus_mysql2:
+  <<: *mysql2
+
 oracle:
   <<: *common
   adapter: oracle
@@ -45,6 +51,9 @@ postgresql: &postgresql
 postresql_makara:
   <<: *postgresql
 
+postresql_proxy:
+  <<: *postgresql
+
 postgis:
   <<: *postgresql
 
@@ -54,7 +63,7 @@ seamless_database_pool:
   pool_adapter: mysql2
   prepared_statements: false
   master:
-    host: localhost
+    host: 127.0.0.1
 
 sqlite:
   adapter: sqlite
@@ -70,3 +79,7 @@ spatialite:
 trilogy:
   <<: *common
   adapter: trilogy
+
+janus_trilogy:
+  <<: *common
+  adapter: trilogy

data/test/import_test.rb

@@ -741,14 +741,8 @@ describe "#import" do
       ]
       Book.import books
       assert_equal 2, Book.count
-
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-        assert_equal 'published', Book.last.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-        assert_equal 1, Book.last.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
 
     it 'should be able to import enum fields with default value' do
@@ -758,32 +752,19 @@ describe "#import" do
       ]
       Book.import books
       assert_equal 1, Book.count
-
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
     end
 
-    if ENV['AR_VERSION'].to_f > 4.1
-      it 'should be able to import enum fields by name' do
-        Book.delete_all if Book.count > 0
-        books = [
-          Book.new(author_name: "Foo", title: "Baz", status: :draft),
-          Book.new(author_name: "Foo2", title: "Baz2", status: :published),
-        ]
-        Book.import books
-        assert_equal 2, Book.count
-
-        if ENV['AR_VERSION'].to_i >= 5.0
-          assert_equal 'draft', Book.first.read_attribute('status')
-          assert_equal 'published', Book.last.read_attribute('status')
-        else
-          assert_equal 0, Book.first.read_attribute('status')
-          assert_equal 1, Book.last.read_attribute('status')
-        end
-      end
+    it 'should be able to import enum fields by name' do
+      Book.delete_all if Book.count > 0
+      books = [
+        Book.new(author_name: "Foo", title: "Baz", status: :draft),
+        Book.new(author_name: "Foo2", title: "Baz2", status: :published),
+      ]
+      Book.import books
+      assert_equal 2, Book.count
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
   end
 
@@ -796,13 +777,8 @@ describe "#import" do
       Book.import columns, values
       assert_equal 2, Book.count
 
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-        assert_equal 'published', Book.last.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-        assert_equal 1, Book.last.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
   end