activerecord-import 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866dd09466fbda981329e13916e89986cb47d65259f0889b8a3b53aeca1aee32
-  data.tar.gz: 258a0d2fc34bbb928500e2f8a83df4f5bdc8901c25e2e123a569c56d587d3f53
+  metadata.gz: f8b122b955b4a926db451a6a3ef72405ade6d69b54876bccb9ea51680486b328
+  data.tar.gz: 3af5c65f25ffb54d338d012aab4f3608513071287c8a759f3ba678850a81f6e0
 SHA512:
-  metadata.gz: 989562e1fb64d669a96211c6b80df5b89d8a43aa38575ec6706d0633b405983a63849bd5fb78d4031ed7e4b2c239192f62d4b3d9e720f4c474cd3801600d11ef
-  data.tar.gz: 22e6ccbb750bb7851930d98c2b90f496c759d35503c8c1e58b841f4a928a283c486caec3f22cb57e6948b6960e6fff2a598499f0670f59b281e321dded20c183
+  metadata.gz: 638f6a8062713b07b1c2ebe866fa647c254d42e594c0fa056b5a710bcd9a2560b2217db73a89f5804c9fc1a71d5de05fc98625771e6225e9e148f58048618079
+  data.tar.gz: 806d66d95034276b0daec9c6c207b8a6187ec0950a44b312267aeef4d491b1c9f5e036641df35950296180f124315fc220e9af5d5b4d4057278176dcf667b1c3

data/.github/workflows/test.yaml

@@ -22,11 +22,16 @@ jobs:
         ruby:
           - 3.2
         env:
+          - AR_VERSION: '7.1'
+            RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: '7.0'
             RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: 6.1
             RUBYOPT: --enable-frozen-string-literal
         include:
+          - ruby: 3.1
+            env:
+              AR_VERSION: '7.1'
           - ruby: 3.1
             env:
               AR_VERSION: '7.0'
@@ -39,6 +44,9 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
+          - ruby: jruby
+            env:
+              AR_VERSION: '7.0'
           - ruby: 2.7
             env:
               AR_VERSION: '7.0'
@@ -48,6 +56,9 @@ jobs:
           - ruby: 2.7
             env:
               AR_VERSION: '6.0'
+          - ruby: jruby-9.3.10.0
+            env:
+              AR_VERSION: '6.1'
           - ruby: 2.6
             env:
               AR_VERSION: 5.2
@@ -65,7 +76,7 @@ jobs:
       AR_VERSION: ${{ matrix.env.AR_VERSION }}
       DB_DATABASE: activerecord_import_test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -104,7 +115,7 @@ jobs:
     env:
       AR_VERSION: '7.0'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Changes in 1.5.1
+
+### Fixes
+
+* Stop memoizing schema_columns_hash so dynamic schema changes are picked up. Thanks to @koshigoe via \##812.
+
 ## Changes in 1.5.0
 
 ### New Features

data/Dockerfile

@@ -0,0 +1,23 @@
+# Use the official Ruby 3.2 image as a base image
+ARG RUBY_VERSION=3.2
+FROM ruby:${RUBY_VERSION}-bullseye
+
+# Set the working directory
+WORKDIR /usr/src/app
+
+# Install system packages
+RUN apt-get update -qq && \
+    apt-get install -y default-mysql-client postgresql postgresql-contrib vim && \
+    apt-get clean
+
+# Set environment variables
+ENV AR_VERSION=7.0
+
+# Copy all files
+COPY . .
+
+# Move sample database.yml and install gems
+RUN mv test/database.yml.sample test/database.yml && \
+    bundle install
+
+CMD ["irb"]

data/Gemfile

@@ -31,9 +31,9 @@ end
 platforms :jruby do
   gem "jdbc-mysql"
   gem "jdbc-postgres"
-  gem "activerecord-jdbcsqlite3-adapter",    "~> 1.3"
-  gem "activerecord-jdbcmysql-adapter",      "~> 1.3"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
 end
 
 # Support libs

data/README.markdown

@@ -626,6 +626,19 @@ AR_VERSION=7.0 bundle exec rake test:postgresql test:sqlite3 test:mysql2
 
 Once you have pushed up your changes, you can find your CI results [here](https://github.com/zdennis/activerecord-import/actions).
 
+#### Docker Setup
+
+Before you begin, make sure you have [Docker](https://www.docker.com/products/docker-desktop/) and [Docker Compose](https://docs.docker.com/compose/) installed on your machine. If you don't, you can install both via Homebrew using the following command:
+
+```bash
+brew install docker && brew install docker-compose
+```
+##### Steps
+
+1. In your terminal run `docker-compose up --build`
+1. In another tab/window run `docker-compose exec app bash`
+1. In that same terminal run the mysql2 test by running `bundle exec rake test:mysql2`
+
 ## Issue Triage [![Open Source Helpers](https://www.codetriage.com/zdennis/activerecord-import/badges/users.svg)](https://www.codetriage.com/zdennis/activerecord-import)
 
 You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to activerecord-import on CodeTriage](https://www.codetriage.com/zdennis/activerecord-import).

data/docker-compose.yml

@@ -0,0 +1,34 @@
+version: "3.5"
+
+services:
+  mysql:
+    platform: linux/x86_64
+    image: mysql:5.7
+    volumes:
+      - mysql-data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+
+  postgresql:
+    image: postgres:latest
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+  app:
+    build:
+      context: .
+    environment:
+      DB_HOST: mysql
+      AR_VERSION: 7.0
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - mysql
+      - postgresql
+    command: tail -f /dev/null
+
+volumes:
+  mysql-data:
+  postgresql-data:

data/gemfiles/7.1.gemfile

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

data/lib/activerecord-import/import.rb

@@ -969,7 +969,7 @@ class ActiveRecord::Base
     end
 
     def schema_columns_hash
-      @schema_columns_hash ||= if respond_to?(:ignored_columns) && ignored_columns.any?
+      if respond_to?(:ignored_columns) && ignored_columns.any?
         connection.schema_cache.columns_hash(table_name)
       else
         columns_hash

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

data/test/database.yml.sample

@@ -8,6 +8,7 @@ common: &common
 mysql2: &mysql2
   <<: *common
   adapter: mysql2
+  host: mysql
 
 mysql2spatial:
   <<: *mysql2
@@ -19,6 +20,7 @@ postgresql: &postgresql
   <<: *common
   username: postgres
   adapter: postgresql
+  host: postgresql
   min_messages: warning
 
 postresql_makara:

data/test/models/book.rb

@@ -2,7 +2,7 @@
 
 class Book < ActiveRecord::Base
   belongs_to :topic, inverse_of: :books
-  belongs_to :tag, foreign_key: [:tag_id, :parent_id]
+  belongs_to :tag, foreign_key: [:tag_id, :parent_id] unless ENV["SKIP_COMPOSITE_PK"]
 
   has_many :chapters, inverse_of: :book
   has_many :discounts, as: :discountable

data/test/models/customer.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 class Customer < ActiveRecord::Base
-  has_many :orders,
-    inverse_of: :customer,
-    primary_key: %i(account_id id),
-    foreign_key: %i(account_id customer_id)
+  unless ENV["SKIP_COMPOSITE_PK"]
+    has_many :orders,
+      inverse_of: :customer,
+      primary_key: %i(account_id id),
+      foreign_key: %i(account_id customer_id)
+  end
 end

data/test/models/order.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 class Order < ActiveRecord::Base
-  belongs_to :customer,
-    inverse_of: :orders,
-    primary_key: %i(account_id id),
-    foreign_key: %i(account_id customer_id)
+  unless ENV["SKIP_COMPOSITE_PK"]
+    belongs_to :customer,
+      inverse_of: :orders,
+      primary_key: %i(account_id id),
+      foreign_key: %i(account_id customer_id)
+  end
 end

data/test/models/tag_alias.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class TagAlias < ActiveRecord::Base
-  belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
+  unless ENV["SKIP_COMPOSITE_PK"]
+    belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
+  end
 end

data/test/schema/generic_schema.rb

@@ -2,8 +2,10 @@
 
 ActiveRecord::Schema.define do
   create_table :schema_info, force: :cascade do |t|
-    t.integer :version, unique: true
+    t.integer :version
   end
+  add_index :schema_info, :version, unique: true
+
   SchemaInfo.create version: SchemaInfo::VERSION
 
   create_table :group, force: :cascade do |t|

data/test/schema/postgresql_schema.rb

@@ -8,10 +8,7 @@ ActiveRecord::Schema.define do
   # create ENUM if it does not exist yet
   begin
     execute('CREATE TYPE vendor_type AS ENUM (\'wholesaler\', \'retailer\');')
-  rescue ActiveRecord::StatementInvalid => e
-    # since PostgreSQL does not support IF NOT EXISTS when creating a TYPE,
-    # rescue the error and check the error class
-    raise unless e.cause.is_a? PG::DuplicateObject
+  rescue ActiveRecord::StatementInvalid
     execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'wholesaler\';')
     execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'retailer\';')
   end

data/test/support/shared_examples/recursive_import.rb

@@ -147,7 +147,7 @@ def should_support_recursive_import
       end
 
       books.each do |book|
-        assert_equal book.topic_id, nil
+        assert_nil book.topic_id, nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Zach Dennis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -51,6 +51,7 @@ files:
 - ".rubocop_todo.yml"
 - Brewfile
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.markdown
@@ -68,6 +69,7 @@ files:
 - benchmarks/models/test_memory.rb
 - benchmarks/models/test_myisam.rb
 - benchmarks/schema/mysql2_schema.rb
+- docker-compose.yml
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
@@ -75,6 +77,7 @@ files:
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -175,7 +178,7 @@ homepage: https://github.com/zdennis/activerecord-import
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.25
+signing_key:
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files: