declare_schema 0.14.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ae145f4edb218307dce4bf78aefff0de21188a481f8c9180a33831fe6ae9dc
-  data.tar.gz: a8750df254820e71a477763731d09367449469d243021a6b246a4cd7118b2eee
+  metadata.gz: 53f77b255392ad9338faad2f2488c3ae34a134c6687cbce5e42d74d33fd2e099
+  data.tar.gz: f07a30238d79d7d8e4194f28cd6d8f3979a9d40ec326ef93f47f76b125a894c9
 SHA512:
-  metadata.gz: b042815d991c698b5975a810ec25d741aa7897c3ec4df4acbbe2bcd29f47e52ba7b04ec4256bf9800fc721d5f81e27b8adbef7dfcda930d7cc4941a944ad3dfa
-  data.tar.gz: 66528d14e7fcf88766271bd507e5e69b45514db5342baa39f2db75e5da562335c19159a1e7ed45c20a8cb9c4485283c1027aadb079f465a3eea2fe1ef5cdcc3f
+  metadata.gz: aa62f18456e37ab3e809ee1099ee8aa7513dee715f3fd7fafbfb3b56d1f91e5d13cdd31b6d95395f9da46cfa33ff200ea52bd8a57d53416f1909b8ad207d19b9
+  data.tar.gz: 29be47457d43fe9f1b9f58da7bc8865e0780d172667464af25afa62923e9841439f4c4662cb3e1a89f2eee43944779410602c52be3398a61334afbd6ca993d3a

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Invoca/octothorpe

data/.github/workflows/declare_schema_build.yml

@@ -8,18 +8,29 @@ jobs:
     name: DeclareSchema Build
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ 2.4.5, 2.5.8, 2.6.5, 2.7.1 ]
+        ruby: [2.6, 2.7, '3.0', 3.1]
         gemfile:
         - gemfiles/rails_5_mysql.gemfile
         - gemfiles/rails_5_sqlite.gemfile
         - gemfiles/rails_6_mysql.gemfile
         - gemfiles/rails_6_sqlite.gemfile
+        include:
+        - gemfile: gemfiles/rails_5_mysql.gemfile
+          ruby: 2.5
+        - gemfile: gemfiles/rails_5_sqlite.gemfile
+          ruby: 2.5
         exclude:
-        - { gemfile: gemfiles/rails_5_mysql.gemfile, ruby: 2.4.5 }
-        - { gemfile: gemfiles/rails_5_sqlite.gemfile, ruby: 2.4.5 }
-        - { gemfile: gemfiles/rails_6_mysql.gemfile, ruby: 2.4.5 }
-        - { gemfile: gemfiles/rails_6_sqlite.gemfile, ruby: 2.4.5 }
+        - ruby: '3.0'
+          gemfile: gemfiles/rails_5_mysql.gemfile
+        - ruby: 3.1
+          gemfile: gemfiles/rails_5_mysql.gemfile
+        - ruby: '3.0'
+          gemfile: gemfiles/rails_5_sqlite.gemfile
+        - ruby: 3.1
+          gemfile: gemfiles/rails_5_sqlite.gemfile
+
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     services:
@@ -30,27 +41,15 @@ jobs:
         ports:
           - 3306:3306
     steps:
-      - name: Checkout Branch
-        id: checkout_branch
-        uses: actions/checkout@v2
-      - name: Setup Ruby
-        id: setup_ruby
-        uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
         with:
-          bundler: 1.17.3
           ruby-version: ${{matrix.ruby}}
-      - name: Remove Bundler 2
-        id: remove_bundler_2
-        if: ${{ matrix.ruby >= '2.6.5' }}
-        run: |
-          rm -f /opt/hostedtoolcache/Ruby/2.*/x64/lib/ruby/gems/2.*/specifications/default/bundler-2.*.gemspec
-          gem install bundler:1.17.3 --force --default
-          gem install bundler -v 1.17.3
-      - name: Appraisals
-        id: appraisals
+          bundler: 2.2.29
+          bundler-cache: true
+      - name: Setup
         run: |
-          bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} --gemfile=${{ matrix.gemfile }}
           git config --global user.email "dummy@example.com"
           git config --global user.name "dummy"
           MYSQL_PORT=3306 bundle exec rake test:prepare_testapp[force]
-          bundle exec rake test:all
+      - run: bundle exec rake test:all

data/.ruby-version

@@ -1 +1 @@
-2.7.0
+2.7.5

data/Appraisals

@@ -3,11 +3,18 @@
 appraise 'rails-5-sqlite' do
   gem 'rails', '~> 5.2'
   gem 'sqlite3'
+
+  remove_gem 'mail'
+  remove_gem 'net-smtp'
 end
 
 appraise 'rails-5-mysql' do
   gem 'rails', '~> 5.2'
   gem 'mysql2'
+
+  remove_gem 'mail'
+  remove_gem 'net-smtp'
+  remove_gem 'sqlite3'
 end
 
 appraise 'rails-6-sqlite' do
@@ -18,4 +25,5 @@ end
 appraise 'rails-6-mysql' do
   gem 'rails', '~> 6.1'
   gem 'mysql2'
+  remove_gem 'sqlite3'
 end

data/CHANGELOG.md

@@ -4,6 +4,22 @@ 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).
 
+## [1.0.2] - 2022-07-18
+### Fixed
+- Fixed a bug where `SchemaChange::ColumnRemove` was not loaded and causing an exception to raise
+when a column was being removed during migration generation
+
+## [1.0.1] - 2022-07-12
+### Fixed
+- Remove lingering usage of `fallback_find_primary_key` method that was removed in `0.14.0`
+
+## [1.0.0] - 2022-03-28
+### Added
+- Added support for Ruby 3+
+
+### Removed
+- Removed deprecated `fields` block declaration
+
 ## [0.14.3] - 2021-09-01
 ### Fixed
 - Fixed more Ruby 2.7 warnings about needing `**options` when calling a method that has `**options` in its signature.
@@ -18,7 +34,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 
 ## [0.14.0] - 2021-08-10
 ### Removed
-- Dropped support for Rails versions less than 5. 
+- Dropped support for Rails versions less than 5.
 
 ## [0.13.2] - 2021-08-04
 ### Fixed
@@ -55,7 +71,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
  The migration will be run if `--migrate` is passed; otherwise, the migrate command will be displayed to be run later.
 ### Added
 - Added the new configuration option `DeclareSchema.@db_migrate_command =`.
-### Fixed 
+### Fixed
 - Fixed bug where foreign key constraint names are not globally unique
 
 ## [0.10.1] - 2021-03-18
@@ -109,7 +125,7 @@ i.e. `declare schema { string :title }`. Otherwise, there is no difference betwe
 ### Fixed
 - Fixed a bug in migration generation caused by `DeclareSchema::Migration#create_constraints`
   calling `DeclareSchema::Model::ForeignKeyDefinition#to_add_statement` with unused parameters.
- 
+
 - Fixed a bug in `DeclareSchema::Migration#remove_foreign_key` where special characters would not be quoted properly.
 
 ## [0.6.2] - 2021-01-06
@@ -134,7 +150,7 @@ because all of the existing primary key columns are being removed.
 - FieldSpec#initialize interface now includes `position` keyword argument and `**options` hash.
 
 ### Fixed
-- Fixed cycle in which FieldSpec#initialize was calling `model.field_specs` 
+- Fixed cycle in which FieldSpec#initialize was calling `model.field_specs`
 
 ### Changed
 - Changed ci support from Travis to Github Workflow
@@ -208,6 +224,9 @@ using the appropriate Rails configuration attributes.
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[1.0.2]: https://github.com/Invoca/declare_schema/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/Invoca/declare_schema/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/Invoca/declare_schema/compare/v0.14.3...v1.0.0
 [0.14.3]: https://github.com/Invoca/declare_schema/compare/v0.14.2...v0.14.3
 [0.14.2]: https://github.com/Invoca/declare_schema/compare/v0.14.1...v0.14.2
 [0.14.1]: https://github.com/Invoca/declare_schema/compare/v0.14.0...v0.14.1

data/Gemfile

@@ -10,11 +10,12 @@ group :testapp do
 end
 
 gem 'appraisal'
-gem 'bundler',          '< 2'
 gem "climate_control",  '~> 0.2'
+gem 'mail'
+gem 'net-smtp'
 gem 'pry'
 gem 'pry-byebug'
-gem 'rails',            '~> 5.2', '>= 5.2.4.3'
+gem 'rails',            '~> 6.0'
 gem 'responders'
 gem 'rspec'
 gem 'rubocop'

data/Gemfile.lock

@@ -1,58 +1,75 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.14.3)
+    declare_schema (1.0.2)
       rails (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    actioncable (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    actionmailbox (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
+      mail (>= 2.7.1)
+    actionmailer (6.1.5)
+      actionpack (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activesupport (= 6.1.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.5)
+      actionview (= 6.1.5)
+      activesupport (= 6.1.5)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.5)
+      actionpack (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.5)
+      activesupport (= 6.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.5)
+      activesupport (= 6.1.5)
       globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
-      marcel (~> 1.0.0)
-    activesupport (5.2.6)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activerecord (6.1.5)
+      activemodel (= 6.1.5)
+      activesupport (= 6.1.5)
+    activestorage (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activesupport (= 6.1.5)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.3.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
     ast (2.4.1)
     bootsnap (1.7.2)
       msgpack (~> 1.0)
@@ -60,32 +77,41 @@ GEM
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.4.4)
+    digest (3.1.0)
     erubi (1.10.0)
     ffi (1.15.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    io-wait (0.2.1)
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.10.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     msgpack (1.4.2)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.19.2)
     parser (2.7.1.4)
@@ -96,36 +122,38 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
-      bundler (>= 1.3.0)
-      railties (= 5.2.6)
+    rails (6.1.5)
+      actioncable (= 6.1.5)
+      actionmailbox (= 6.1.5)
+      actionmailer (= 6.1.5)
+      actionpack (= 6.1.5)
+      actiontext (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activemodel (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
+      bundler (>= 1.15.0)
+      railties (= 6.1.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -159,23 +187,24 @@ GEM
     rubocop-ast (0.4.2)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    sprockets (4.0.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    thor (1.2.1)
+    timeout (0.2.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    websocket-driver (0.7.4)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.26)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -183,13 +212,14 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bootsnap (>= 1.1.0)
-  bundler (< 2)
   climate_control (~> 0.2)
   declare_schema!
   listen
+  mail
+  net-smtp
   pry
   pry-byebug
-  rails (~> 5.2, >= 5.2.4.3)
+  rails (~> 6.0)
   responders
   rspec
   rubocop
@@ -197,4 +227,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.2.29

data/README.md

@@ -8,10 +8,10 @@ Make a model and declare your schema within a `declare_schema do ... end` block:
 ```ruby
 class Company < ActiveRecord::Base
   declare_schema do
-    company_name :string, limit: 100
-    ticker_symbol :string, limit: 4, null: true, index: true, unique: true
-    employee_count :integer
-    comments :text
+    string  :company_name,  limit: 100
+    string  :ticker_symbol, limit: 4, null: true, index: true, unique: true
+    integer :employee_count
+    text    :comments
 
     timestamps
   end
@@ -50,6 +50,16 @@ Migration filename: [<enter>=declare_schema_migration_1|<custom_name>]: add_comp
 ```
 Note that the migration generator is interactive -- it can't tell the difference between renaming something vs. adding one thing and removing another, so sometimes it will ask you to clarify.
 
+## declare_schema macro options
+
+Any options provided to the `declare_schema` macro will be passed on to `create_table`. For example, to set the `id` column of the table explicitly to `:bigint`:
+```
+declare_schema id: :bigint do
+  string  :company_name,  limit: 100
+  ...
+end
+```
+
 ## Migrator Configuration
 
 The following configuration options are available for the gem and can be used
@@ -224,8 +234,8 @@ like the following:
 
 class Comment < ActiveRecord::Base
   declare_schema charset: "utf8mb4", collation: "utf8mb4_bin" do
-    subject :string, limit: 255
-    content :text,   limit: 0xffff_ffff
+    string :subject, limit: 255
+    text   :content, limit: 0xffff_ffff
   end
 end
 ```
@@ -244,8 +254,8 @@ look like the following:
 
 class Comment < ActiveRecord::Base
   declare_schema do
-    subject :string, limit: 255
-    context :text,   limit: 0xffff_ffff, charset: "utf8mb4", collation: "utf8mb4_bin"
+    string :subject, limit: 255
+    text   :context, limit: 0xffff_ffff, charset: "utf8mb4", collation: "utf8mb4_bin"
   end
 end
 ```

data/Rakefile

@@ -50,7 +50,7 @@ namespace "test" do
            echo \"gem 'irb', :group => :development\") >> Gemfile"
       sh "echo '' > app/models/.gitignore" # because git reset --hard would rm the dir
       rm ".gitignore" # we need to reset everything in a testapp
-      sh "git init && git add . && git commit -m \"initial commit\""
+      sh "git init && git add . && git commit -nm \"initial commit\""
       sh "rake db:create"
       puts "The testapp has been created in '#{TESTAPP_PATH}'"
     else

data/gemfiles/rails_5_mysql.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "< 2"
 gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"

data/gemfiles/rails_5_sqlite.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "< 2"
 gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"

data/gemfiles/rails_6_mysql.gemfile

@@ -3,8 +3,9 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "< 2"
 gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 6.1"

data/gemfiles/rails_6_sqlite.gemfile

@@ -3,8 +3,9 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "< 2"
 gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 6.1"

data/lib/declare_schema/command.rb

@@ -16,7 +16,7 @@ module DeclareSchema
     EOS
 
     class << self
-      def run(gem, args, version, gemfile_options = {})
+      def run(gem, args, version, **gemfile_options)
         command = args.shift
 
         case command

data/lib/declare_schema/dsl.rb

@@ -12,7 +12,7 @@ module DeclareSchema
       end
     end
 
-    def initialize(model, options = {})
+    def initialize(model, **options)
       @model = model
       @options = options
     end

data/lib/declare_schema/extensions/active_record/fields_declaration.rb

@@ -9,24 +9,6 @@ module DeclareSchema
   module Macros
     attr_reader :_table_options
 
-    def fields(table_options = {}, &block)
-      # Any model that calls 'fields' gets DeclareSchema::Model behavior
-      DeclareSchema::Model.mix_in(self)
-
-      @include_in_migration = true
-      @_table_options        = table_options
-
-      if block
-        dsl = DeclareSchema::FieldDeclarationDsl.new(self)
-        if block.arity == 1
-          yield dsl
-        else
-          dsl.instance_eval(&block)
-        end
-      end
-    end
-    deprecate :fields, deprecator: ActiveSupport::Deprecation.new('1.0', 'DeclareSchema')
-
     def declare_schema(default_schema: true, **table_options, &block)
       # Any model that calls 'fields' gets DeclareSchema::Model behavior
       DeclareSchema::Model.mix_in(self)

data/lib/declare_schema/field_declaration_dsl.rb

@@ -12,7 +12,7 @@ module DeclareSchema
       end
     end
 
-    def initialize(model, options = {})
+    def initialize(model, **options)
       @model = model
       @options = options
     end
@@ -29,11 +29,11 @@ module DeclareSchema
     end
 
     def field(name, type, *args, **options)
-      @model.declare_field(name, type, *[*args, @options.merge(options)])
+      @model.declare_field(name, type, *args, **@options.merge(options))
     end
 
-    def method_missing(name, *args)
-      field(name, *args)
+    def method_missing(name, *args, **options)
+      field(name, *args, **options)
     end
   end
 end

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -10,7 +10,7 @@ module DeclareSchema
       attr_reader :constraint_name, :model, :foreign_key, :foreign_key_name, :parent_table_name, :child_table_name, :options, :on_delete_cascade
 
 
-      def initialize(model, foreign_key, options = {})
+      def initialize(model, foreign_key, **options)
         @model = model
         @foreign_key = foreign_key.to_s.presence
         @options = options
@@ -38,7 +38,7 @@ module DeclareSchema
             }
             options[:dependent] = :delete if fkc['ON DELETE CASCADE']
 
-            new(model, foreign_key, options)
+            new(model, foreign_key, **options)
           end
         end
       end