declare_schema 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31dd49e36793094f670d30211da95c08739c4f0c65d11ef1824ab0cacff6508a
-  data.tar.gz: 0f74f11ad7d6a6b6631dbf695cadcae1d59554ba956306ddda0cd26eee1316c4
+  metadata.gz: b38ba5f14cb9ff014da1baaf10698db6e1ad744aa50804e62c2a958d75f26c47
+  data.tar.gz: 526ab470daae916fcb233fa397d385feef77b7933237219e733db1543bef7184
 SHA512:
-  metadata.gz: 73cec99029586a2e9250848013a86548a14fb64eb46d2f2aecc6c5ed4d1679de8d264e06fde1db9640293ee7e2705d13dfd770c62aecb1f7ab089ca8c805d213
-  data.tar.gz: bc61c8db52f1890398dfd663c0e7f0d76441fc1d1713f89d095a2cb40bed654ae14a2dfd40a007013cc762f8ae397368e1a89d210e5b9e853953db595ec9ec1d
+  metadata.gz: 18768edfdc06e9562246243d1d91e698545f0dfceefbcd48a29894733a684493e2c521cc782bbd45767d0980479c17657a12bc7ec25242d594ac4851b62925c5
+  data.tar.gz: 760e5374a42726af4a3eb04f3c6063c1266d3384a5c23082d671b0485ce341b58c0ac5cf6726a49b5ddeb73d01cccd8213e81ea64eee1ac19fa219b3bdefb961

data/.github/workflows/{declare_schema_build.yml → pipeline.yml}

@@ -4,39 +4,25 @@ on: [push]
 name: DeclareSchema Build
 
 jobs:
-  build:
+  tests:
     name: DeclareSchema Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         adapter: [mysql, postgresql, sqlite3]
-        ruby: ['3.0', 3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         gemfile:
-        - gemfiles/rails_6_1.gemfile
         - gemfiles/rails_7_0.gemfile
         - gemfiles/rails_7_1.gemfile
         - gemfiles/rails_7_2.gemfile
+        - gemfiles/rails_8_0.gemfile
         exclude:
-        - adapter: mysql
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
-        - adapter: postgresql
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: 3.1
+          gemfile: gemfiles/rails_8_0.gemfile
+        # TODO: Support SQLite3 with Rails 8.0
         - adapter: sqlite3
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
-        - adapter: mysql
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-        - adapter: postgresql
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-        - adapter: sqlite3
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-
+          gemfile: gemfiles/rails_8_0.gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       MYSQL_HOST: 127.0.0.1

data/Appraisals

@@ -3,7 +3,7 @@
 require 'json'
 require 'open-uri'
 
-MIN_RAILS_VERSION = Gem::Version.new('6.1.0')
+MIN_RAILS_VERSION = Gem::Version.new('7.0.0')
 
 rails_versions_to_test = Set.new
 

data/CHANGELOG.md

@@ -4,6 +4,15 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.2] - 2025-02-21
+### Fixed
+- Removed require of `activesupport/proxy_object` which is removed in Rails 8.0
+
+## [2.3.1] - 2024-12-10
+### Fixed
+- Fixed bug where a new model with `belongs_to :owner, polymorphic: true` would cause
+  a "Mysql2::Error: Table '<new table>' doesn't exist:" exception when generating a migration.
+
 ## [2.3.0] - 2024-10-31
 ### Updated
 - Updated the `current_adapter` method to use `connection_db_config` for Rails 6.1 and higher, while retaining `connection_config` for earlier versions

data/Gemfile

@@ -26,3 +26,10 @@ gem 'yard'
 gem 'mysql2',  '~> 0.5'
 gem 'pg',      '~> 1.1'
 gem 'sqlite3', '~> 1.4'
+
+
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (2.3.0)
+    declare_schema (2.3.2)
       rails (>= 6.0)
 
 GEM
@@ -71,6 +71,8 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
@@ -106,6 +108,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.25.0)
     msgpack (1.7.2)
+    mutex_m (0.3.0)
     mysql2 (0.5.6)
     net-imap (0.4.14)
       date
@@ -228,11 +231,15 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  base64 (>= 0.2.0)
+  bigdecimal (>= 3.1)
   bootsnap (>= 1.1.0)
   climate_control (~> 0.2)
+  concurrent-ruby (~> 1.3, < 1.3.5)
   declare_schema!
   listen
   mail
+  mutex_m (>= 0.3.0)
   mysql2 (~> 0.5)
   net-smtp
   pg (~> 1.1)

data/catalog-info.yaml

@@ -26,6 +26,8 @@ metadata:
   - open-source
   - gem
   - executable
+  - public
+  - rails-dependent
   description: Declare your Rails/active_record model schemas and have database migrations
     generated for you!
 spec:

data/gemfiles/rails_7_0.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_7_1.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_7_2.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/{rails_6_1.gemfile → rails_8_0.gemfile}

@@ -8,7 +8,7 @@ gem "mail"
 gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 8.0.0"
 gem "responders"
 gem "rspec"
 gem "rspec-its"
@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/lib/declare_schema/dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/proxy_object'
-
 module DeclareSchema
   class Dsl < BasicObject # avoid Object because that gets extended by lots of gems
     include ::Kernel      # but we need the basic class methods

data/lib/declare_schema/field_declaration_dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/proxy_object'
-
 module DeclareSchema
   class FieldDeclarationDsl < BasicObject # avoid Object because that gets extended by lots of gems
     include ::Kernel                      # but we need the basic class methods

data/lib/declare_schema/model.rb

@@ -240,7 +240,7 @@ module DeclareSchema
 
       def _infer_fk_limit(foreign_key_column, reflection)
         if reflection.options[:polymorphic]
-          if (foreign_key_column = columns_hash[foreign_key_column.to_s]) && foreign_key_column.type == :integer
+          if (foreign_key_column = _column(foreign_key_column)) && foreign_key_column.type == :integer
             foreign_key_column.limit
           end
         else

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "2.3.0"
+  VERSION = "2.3.2"
 end

data/lib/generators/declare_schema/migration/migration_generator.rb

@@ -68,7 +68,7 @@ module DeclareSchema
       final_migration_name =
         name.presence ||
         if !options[:default_name]
-          choose("\nMigration filename (spaces will be converted to _) [#{default_migration_name}]:", /^[a-z0-9_ ]*$/,
+          choose("Migration filename (spaces will be converted to _) [#{default_migration_name}]:", /^[a-z0-9_ ]*$/,
                  default_migration_name).strip.gsub(' ', '_').presence
         end ||
         default_migration_name

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -899,7 +899,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
       up, _down = Generators::DeclareSchema::Migration::Migrator.run
       ActiveRecord::Migration.class_eval(up)
-      expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
+
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+        expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
+      else
+        expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{presence: true, uniqueness: {case_sensitive: false}}")
+      end
 
       # DeclareSchema supports has_and_belongs_to_many relationships and generates the intersection ("join") table
       # with appropriate primary key, indexes, and foreign keys.
@@ -1305,6 +1310,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
               belongs_to :id_default
               belongs_to :id4
               belongs_to :id8
+              belongs_to :owner, polymorphic: true
             end
           end
 
@@ -1332,20 +1338,24 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           it 'infers the correct FK type from the create_table id: type' do
             up = Generators::DeclareSchema::Migration::Migrator.run.first
 
-            create_fks = up.split("\n").grep(/t\.integer /).map { |command| command.gsub(', null: false', '').gsub(/^ +/, '') }
+            create_fks = up.split("\n").grep(/t\.integer|string /).map { |command| command.gsub(', null: false', '').gsub(/^ +/, '') }
             if current_adapter == 'sqlite3'
               create_fks.map! { |command| command.gsub(/limit: [a-z0-9]+/, 'limit: X') }
               expect(create_fks).to eq([
                                          't.integer :id_default_id, limit: X',
                                          't.integer :id4_id, limit: X',
-                                         't.integer :id8_id, limit: X'
-                                       ]), up
+                                         't.integer :id8_id, limit: X',
+                                         't.integer :owner_id, limit: X',
+                                         't.string  :owner_type, limit: X'
+                                       ])
             else
               expect(create_fks).to eq([
                                          't.integer :id_default_id, limit: 8',
                                          't.integer :id4_id, limit: 4',
-                                         't.integer :id8_id, limit: 8'
-                                       ]), up
+                                         't.integer :id8_id, limit: 8',
+                                         't.integer :owner_id, limit: 8',
+                                         "t.string  :owner_type, limit: 255#{charset_and_collation}"
+                                       ])
             end
           end
 

data/spec/lib/declare_schema/model/table_options_definition_spec.rb

@@ -24,7 +24,11 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
 
       describe '#to_key' do
         subject { model.to_key }
-        it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+          it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
+        else
+          it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"]) }
+        end
       end
 
       describe '#settings' do
@@ -56,7 +60,11 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
 
       describe '#hash' do
         subject { model.hash }
-        it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+          it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
+        else
+          it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"].hash) }
+        end
       end
 
       describe '#to_s' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2025-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,8 +37,8 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".devcontainer/docker-compose.yml"
 - ".github/CODEOWNERS"
-- ".github/workflows/declare_schema_build.yml"
 - ".github/workflows/gem_release.yml"
+- ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -57,10 +57,10 @@ files:
 - config/brakeman.ignore
 - declare_schema.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
 - gemfiles/rails_7_1.gemfile
 - gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
 - lib/declare_schema.rb
 - lib/declare_schema/command.rb
 - lib/declare_schema/dsl.rb
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails