declare_schema 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0328d501bd76426598e121bc75283089a2a1b7c72781ce9b29ae4e60f8dff2
-  data.tar.gz: a734efaadde7dae50ee1cf512a52858eabc7c7315e6b5dbf3a8f6660eda32da4
+  metadata.gz: fd53a96307dce4b6f8c1ab3372820991af20afdb91f78dc28a022ccd4edc6867
+  data.tar.gz: b8a2a17a17b6df4fd4f6b5915386734cdc439613a65b60e490dd5d906fd4e457
 SHA512:
-  metadata.gz: 697da828c1b2fe88048a4c66cccda205adc809d449361294fc4e0e0c69d229bb97ed8b861979ab85eed6c8bd30d5dd942ed2791b8ded632eb371f084215e56c8
-  data.tar.gz: 5ff7eb9bc51daba2f0544e093baf38e2b181b2631683d3e2548d2054c4da70036ed98cdc7223658c93f5cb9423a79081c67e600629e0441dd505b09b82039bc1
+  metadata.gz: 64cf2d70ecb330394607241f4a4094c37ad0ee1291df3b1ce8e652f82c8e1ebdd96fc0adffa48bdcfe2e641a8be0197541cce19d46b89460aef3b656718a4d5b
+  data.tar.gz: afcdcc1e94a8504797d9e5b986009d7f932e9822e717ce33fb4588a53039ae9e53a389642c98c0be38b3c922c10de1314fba663f1a9badc739fdb69357772e24

data/.github/workflows/declare_schema_build.yml

@@ -11,15 +11,11 @@ jobs:
       matrix:
         ruby: [ 2.4.5, 2.5.8, 2.6.5, 2.7.1 ]
         gemfile:
-        - gemfiles/rails_4_mysql.gemfile
-        - gemfiles/rails_4_sqlite.gemfile
         - gemfiles/rails_5_mysql.gemfile
         - gemfiles/rails_5_sqlite.gemfile
         - gemfiles/rails_6_mysql.gemfile
         - gemfiles/rails_6_sqlite.gemfile
         exclude:
-        - { gemfile: gemfiles/rails_4_mysql.gemfile, ruby: 2.7.1 }
-        - { gemfile: gemfiles/rails_4_sqlite.gemfile, ruby: 2.7.1 }
         - { 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 }

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.0

data/Appraisals

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-4-sqlite' do
-  gem 'rails', '~> 4.2'
-  gem 'sqlite3', '~> 1.3.0'
-end
-
-appraise 'rails-4-mysql' do
-  gem 'rails', '~> 4.2'
-  gem 'mysql2'
-end
-
 appraise 'rails-5-sqlite' do
   gem 'rails', '~> 5.2'
   gem 'sqlite3'

data/CHANGELOG.md

@@ -4,7 +4,24 @@ 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).
 
-## [0.13.0] - 2020-06-11
+## [0.14.1] - 2021-09-01
+### Fixed
+- Fixed Ruby 2.7 warning about needing `**options` when calling a method that has `**options` in its signature.
+
+## [0.14.0] - 2021-08-10
+### Removed
+- Dropped support for Rails versions less than 5. 
+
+## [0.13.2] - 2021-08-04
+### Fixed
+- Fixed issue with disable_auto_increment support for new tables.
+
+## [0.13.1] - 2021-08-02
+### Fixed
+- Fixed migration file indentation bug in Rails 5 where the first line was indented an extra 4 characters.
+ And fixed the longstanding triple-spacing bug to use double spacing.
+
+## [0.13.0] - 2021-06-11
 ### Added
 - Added support for `default_schema` block to apply a default schema to every model, unless disabled for that model with `default_schema: false`.
 
@@ -183,6 +200,9 @@ using the appropriate Rails configuration attributes.
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[0.14.1]: https://github.com/Invoca/declare_schema/compare/v0.14.0...v0.14.1
+[0.14.0]: https://github.com/Invoca/declare_schema/compare/v0.13.1...v0.14.0
+[0.13.1]: https://github.com/Invoca/declare_schema/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/Invoca/declare_schema/compare/v0.12.1...v0.13.0
 [0.12.1]: https://github.com/Invoca/declare_schema/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/Invoca/declare_schema/compare/v0.11.1...v0.12.0

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.13.0)
-      rails (>= 4.2)
+    declare_schema (0.14.1)
+      rails (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.5)
-      actionpack (= 5.2.4.5)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.5)
-      actionview (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activerecord (5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    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.4.5)
-      actionpack (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.5)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -60,33 +60,31 @@ GEM
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
     erubi (1.10.0)
-    ffi (1.14.2)
+    ffi (1.15.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     msgpack (1.4.2)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.19.2)
@@ -102,33 +100,33 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.5)
-      actioncable (= 5.2.4.5)
-      actionmailer (= 5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      activestorage (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    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.4.5)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (1.8.0)
@@ -174,7 +172,7 @@ GEM
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.26)

data/declare_schema.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 4.2'
+  s.add_dependency 'rails', '>= 5.0'
 end

data/lib/declare_schema/model/column.rb

@@ -52,17 +52,9 @@ module DeclareSchema
 
         def deserialize_default_value(column, type, default_value)
           type or raise ArgumentError, "must pass type; got #{type.inspect}"
-
-          case ActiveSupport::VERSION::MAJOR
-          when 4
-            # TODO: Delete this Rails 4 support ASAP! This could be wrong, since it's using the type of the old column...which
-            # might be getting migrated to a new type. We should be using just type as below. -Colin
-            column.type_cast_from_database(default_value)
-          else
-            cast_type = ActiveRecord::Base.connection.send(:lookup_cast_type, type.to_s) or
-              raise "cast_type not found for #{type}"
-            cast_type.deserialize(default_value)
-          end
+          cast_type = ActiveRecord::Base.connection.send(:lookup_cast_type, type.to_s) or
+            raise "cast_type not found for #{type}"
+          cast_type.deserialize(default_value)
         end
 
         # Normalizes schema attributes for the given database adapter name.

data/lib/declare_schema/model/index_definition.rb

@@ -63,32 +63,6 @@ module DeclareSchema
         def index_name(columns)
           "on_#{Array(columns).join("_and_")}"
         end
-
-        private
-
-        # This is the old approach which is still needed for MySQL in Rails 4 and SQLite
-        def fallback_find_primary_key(model, table)
-          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) || ActiveSupport::VERSION::MAJOR < 5 or return nil
-
-          connection = model.connection.dup
-
-          class << connection   # defeat Rails MySQL driver code that skips the primary key by changing its name to a symbol
-            def each_hash(result)
-              super do |hash|
-                if hash[:Key_name] == PRIMARY_KEY_NAME
-                  hash[:Key_name] = PRIMARY_KEY_NAME.to_sym
-                end
-                yield hash
-              end
-            end
-          end
-
-          if (pk_index = connection.indexes(table).find { |index| index.name.to_s == PRIMARY_KEY_NAME })
-            Array(pk_index.columns)
-          elsif model.connection.columns(table).any? { |col| col.name == 'id' }
-            ['id']
-          end
-        end
       end
 
       def primary_key?

data/lib/declare_schema/model.rb

@@ -131,11 +131,7 @@ module DeclareSchema
 
         fk_options[:dependent] = options.delete(:far_end_dependent) if options.has_key?(:far_end_dependent)
 
-        if ActiveSupport::VERSION::MAJOR >= 5
-          super
-        else
-          super(name, scope, options.except(:optional))
-        end
+        super
 
         refl = reflections[name.to_s] or raise "Couldn't find reflection #{name} in #{reflections.keys}"
         fkey = refl.foreign_key or raise "Couldn't find foreign_key for #{name} in #{refl.inspect}"
@@ -156,7 +152,7 @@ module DeclareSchema
           end
         end
 
-        declare_field(fkey.to_sym, :bigint, fkey_id_column_options)
+        declare_field(fkey.to_sym, :bigint, **fkey_id_column_options)
 
         if refl.options[:polymorphic]
           foreign_type = options[:foreign_type] || "#{name}_type"
@@ -190,12 +186,6 @@ module DeclareSchema
         end
       end
 
-      if ::ActiveSupport::VERSION::MAJOR < 5
-        def primary_key
-          super || 'id'
-        end
-      end
-
       # returns the primary key (String) as declared with primary_key =
       # unlike the `primary_key` method, DOES NOT query the database to find the actual primary key in use right now
       # if no explicit primary key set, returns the _default_declared_primary_key
@@ -224,7 +214,7 @@ module DeclareSchema
       # Declares the "foo_type" field that accompanies the "foo_id"
       # field for a polymorphic belongs_to
       def _declare_polymorphic_type_field(foreign_type, column_options)
-        declare_field(foreign_type, :string, column_options.merge(limit: 255))
+        declare_field(foreign_type, :string, **column_options.merge(limit: 255))
         # FIXME: Before declare_schema was extracted, this used to now do:
         # never_show(type_col)
         # That needs doing somewhere
@@ -268,10 +258,8 @@ module DeclareSchema
                   ActiveRecord::Coders::JSON
                 elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
                   class_name_or_coder
-                elsif ActiveSupport::VERSION::MAJOR >= 5
+                else 
                   ActiveRecord::Coders::YAMLColumn.new(attr_name, class_name_or_coder)
-                else
-                  ActiveRecord::Coders::YAMLColumn.new(class_name_or_coder)
                 end
 
         if default == coder.load(nil)

data/lib/declare_schema/version.rb

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

data/lib/declare_schema.rb

@@ -28,12 +28,7 @@ module DeclareSchema
   @default_null                  = false
   @default_generate_foreign_keys = true
   @default_generate_indexing     = true
-  @db_migrate_command            =
-    if ActiveSupport::VERSION::MAJOR < 5
-      "bundle exec rake db:migrate"
-    else
-      "bundle exec rails db:migrate"
-    end
+  @db_migrate_command            = "bundle exec rails db:migrate"
 
   class << self
     attr_reader :default_charset, :default_collation, :default_text_limit, :default_string_limit, :default_null,

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

@@ -83,11 +83,7 @@ module DeclareSchema
       if options[:migrate]
         say db_migrate_command
         bare_rails_command = db_migrate_command.sub(/\Abundle exec +/, '').sub(/\Arake +|rails +/, '')
-        if ActiveSupport::VERSION::MAJOR < 5
-          rake(bare_rails_command)
-        else
-          rails_command(bare_rails_command)
-        end
+        rails_command(bare_rails_command)
       else
         say "\nNot running migration since --migrate not given. When you are ready, run:\n\n   #{db_migrate_command}\n\n"
       end
@@ -97,24 +93,15 @@ module DeclareSchema
 
     private
 
-    if ActiveSupport::VERSION::MAJOR < 5
-      def indent(string, columns)
-        whitespace = ' ' * columns
-        string.gsub("\n", "\n#{whitespace}").gsub(/ +\n/, "\n")
-      end
-    end
-
     def migrations_pending?
       migrations = case ActiveSupport::VERSION::MAJOR
-                   when 4
-                     ActiveRecord::Migrator.migrations('db/migrate')
                    when 5
                      ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
                    else
                      ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
                    end
       pending_migrations = case ActiveSupport::VERSION::MAJOR
-                           when 4, 5
+                           when 5
                              ActiveRecord::Migrator.new(:up, migrations).pending_migrations
                            else
                              ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations

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

@@ -226,7 +226,9 @@ module Generators
 
             primary_key_definition =
               if disable_auto_increment
-                [:integer, :id, limit: 8, auto_increment: false, primary_key: true]
+                [[:integer, :id, limit: 8, auto_increment: false, primary_key: true]]
+              else
+                []
               end
 
             field_definitions = model.field_specs.values.sort_by(&:position).map do |f|
@@ -237,7 +239,7 @@ module Generators
             table_options = create_table_options(model, disable_auto_increment)
 
             table_add = ::DeclareSchema::SchemaChange::TableAdd.new(t,
-                                                                    Array(primary_key_definition) + field_definitions,
+                                                                    primary_key_definition + field_definitions,
                                                                     table_options,
                                                                     sql_options: table_options_definition.settings)
             [
@@ -299,7 +301,7 @@ module Generators
           up   = migration_commands.map(&:up  ).select(&:present?)
           down = migration_commands.map(&:down).select(&:present?).reverse
 
-          [up * "\n\n", down * "\n\n"]
+          [up * "\n", down * "\n"]
         end
 
         def create_table_options(model, disable_auto_increment)
@@ -487,11 +489,7 @@ module Generators
             parent_columns = connection.columns(parent_table) rescue []
             pk_limit =
               if (pk_column = parent_columns.find { |column| column.name.to_s == "id" }) # right now foreign keys assume id is the target
-                if ActiveSupport::VERSION::MAJOR < 5
-                  pk_column.cast_type.limit
-                else
-                  pk_column.limit
-                end
+                pk_column.limit
               else
                 8
               end
@@ -553,12 +551,8 @@ module Generators
           end
         end
 
-        SchemaDumper = case ActiveSupport::VERSION::MAJOR
-                       when 4
-                         ActiveRecord::SchemaDumper
-                       else
-                         ActiveRecord::ConnectionAdapters::SchemaDumper
-                       end
+        SchemaDumper = ActiveRecord::ConnectionAdapters::SchemaDumper
+                      
 
         def add_table_back(table)
           dumped_schema_stream = StringIO.new

data/lib/generators/declare_schema/migration/templates/migration.rb.erb

@@ -1,9 +1,9 @@
-class <%= @migration_class_name %> < (ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
+class <%= @migration_class_name %> < (ActiveRecord::Migration[4.2])
   def self.up
-    <%= @up.presence or raise "no @up given!" %>
+<%= @up.presence or raise "no @up given!" %>
   end
 
   def self.down
-    <%= @down.presence or raise "no @down given!" %>
+<%= @down.presence or raise "no @down given!" %>
   end
 end

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -11,10 +11,6 @@ RSpec.describe DeclareSchema::Model::FieldSpec do
 
   before do
     load File.expand_path('prepare_testapp.rb', __dir__)
-
-    if ActiveSupport::VERSION::MAJOR < 5
-      allow(col_spec).to receive(:type_cast_from_database, &:itself)
-    end
   end
 
   describe '#initialize' do
@@ -226,14 +222,8 @@ RSpec.describe DeclareSchema::Model::FieldSpec do
 
   describe '#schema_attributes' do
     let(:col_spec) do
-      case ActiveSupport::VERSION::MAJOR
-      when 4
-        cast_type = ActiveRecord::Type::Integer.new(limit: 8)
-        ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
-      else
-        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
-        ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
-      end
+      sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
+      ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
     end
 
     it 'returns the attributes except name, position, and non-SQL options' do

data/spec/lib/declare_schema/generator_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     EOS
 
     case ActiveSupport::VERSION::MAJOR
-    when 4, 5
+    when 5
       expect_test_definition_to_eq('alpha/beta', <<~EOS)
         require "test_helper"
 
@@ -51,20 +51,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     case ActiveSupport::VERSION::MAJOR
-    when 4
-      expect_test_fixture_to_eq('alpha/beta', <<~EOS)
-        # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-        # This model initially had no columns defined.  If you add columns to the
-        # model remove the '{}' from the fixture names and add the columns immediately
-        # below each fixture, per the syntax in the comments below
-        #
-        one: {}
-        # column: value
-        #
-        two: {}
-        #  column: value
-      EOS
     when 5
       expect_test_fixture_to_eq('alpha/beta', <<~EOS)
         # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html

data/spec/lib/declare_schema/interactive_primary_key_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
         ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY AUTOINCREMENT NOT NULL)")
       end
 
-      if ActiveSupport::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
+      if !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
         # replace custom primary_key
         class Foo < ActiveRecord::Base
           fields do
@@ -128,7 +128,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
         ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY AUTOINCREMENT NOT NULL)")
       end
 
-      if ActiveSupport::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
+      if !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
         # replace custom primary_key
         class Foo < ActiveRecord::Base
           declare_schema do

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
   end
   let(:datetime_precision) do
-    if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR >= 5
+    if defined?(Mysql2)
       ', precision: 0'
     end
   end
@@ -43,7 +43,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           ''
         end
     else
-      ", id: :integer" unless ActiveSupport::VERSION::MAJOR < 5
+      ", id: :integer"
     end
   end
   let(:lock_version_limit) do
@@ -91,16 +91,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       ActiveRecord::Migration.class_eval(up)
       expect(Advert.columns.map(&:name)).to eq(["id", "name"])
 
-      if ActiveSupport::VERSION::MAJOR < 5
-        # Rails 4 drivers don't always create PK properly. Fix that by dropping and recreating.
-        ActiveRecord::Base.connection.execute("drop table adverts")
-        if defined?(Mysql2)
-          ActiveRecord::Base.connection.execute("CREATE TABLE adverts (id integer PRIMARY KEY AUTO_INCREMENT NOT NULL, name varchar(250)) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin")
-        else
-          ActiveRecord::Base.connection.execute("CREATE TABLE adverts (id integer PRIMARY KEY AUTOINCREMENT  NOT NULL, name varchar(250))")
-        end
-      end
-
       class Advert < ActiveRecord::Base
         fields do
           name :string, limit: 250, null: true
@@ -803,9 +793,36 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
+      Advert.connection.schema_cache.clear!
+      Advert.reset_column_information
+
       nuke_model_class(Advert)
       ActiveRecord::Base.connection.execute("drop table `adverts`;")
 
+      if !defined?(SQLite3) && ActiveSupport::VERSION::MAJOR >= 5
+        class Advert < ActiveRecord::Base
+          def self.disable_auto_increment
+            true
+          end
+
+          fields do
+            description :text, limit: 250, null: true
+          end
+        end
+
+        up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
+          expect(migrations).to(
+            migrate_up(<<~EOS.strip)
+                create_table :adverts, id: false, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                  t.integer :id, limit: 8, auto_increment: false, primary_key: true
+                  t.text    :description, limit: 255, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+                end
+              EOS
+              .and migrate_down("drop_table :adverts")
+          )
+        end
+      end
+
       ## DSL
 
       # The DSL allows lambdas and constants
@@ -886,7 +903,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         nuke_model_class(Advertiser)
         nuke_model_class(Affiliate)
       end
-    end if !defined?(SQLite3) && ActiveRecord::VERSION::MAJOR >= 5
+    end if !defined?(SQLite3)
 
     describe 'serialize' do
       before do
@@ -1073,13 +1090,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     context "for Rails #{ActiveSupport::VERSION::MAJOR}" do
-      if ActiveSupport::VERSION::MAJOR >= 5
-        let(:optional_true) { { optional: true } }
-        let(:optional_false) { { optional: false } }
-      else
-        let(:optional_true) { {} }
-        let(:optional_false) { {} }
-      end
+      let(:optional_true) { { optional: true } }
+      let(:optional_false) { { optional: false } }
       let(:optional_flag) { { false => optional_false, true => optional_true } }
 
       describe 'belongs_to' do
@@ -1179,36 +1191,30 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migration_content = File.read(migrations.first)
         first_line = migration_content.split("\n").first
         base_class = first_line.split(' < ').last
-        expect(base_class).to eq("(ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
+        expect(base_class).to eq("(ActiveRecord::Migration[4.2])")
       end
     end
 
     context 'Does not generate migrations' do
       it 'for aliased fields bigint -> integer limit 8' do
-        if ActiveSupport::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
-          class Advert < active_record_base_class.constantize
-            fields do
-              price :bigint
-            end
+        class Advert < active_record_base_class.constantize
+          fields do
+            price :bigint
           end
+        end
 
-          generate_migrations '-n', '-m'
-
-          migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
-          expect(migrations.size).to eq(1), migrations.inspect
+        generate_migrations '-n', '-m'
 
-          if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR < 5
-            ActiveRecord::Base.connection.execute("ALTER TABLE adverts ADD PRIMARY KEY (id)")
-          end
+        migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
+        expect(migrations.size).to eq(1), migrations.inspect
 
-          class Advert < active_record_base_class.constantize
-            fields do
-              price :integer, limit: 8
-            end
+        class Advert < active_record_base_class.constantize
+          fields do
+            price :integer, limit: 8
           end
-
-          expect { generate_migrations '-n', '-g' }.to output("Database and models match -- nothing to change\n").to_stdout
         end
+
+        expect { generate_migrations '-n', '-g' }.to output("Database and models match -- nothing to change\n").to_stdout
       end
     end
   end
@@ -1250,16 +1256,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       ActiveRecord::Migration.class_eval(up)
       expect(Advert.columns.map(&:name)).to eq(["id", "name"])
 
-      if ActiveSupport::VERSION::MAJOR < 5
-        # Rails 4 drivers don't always create PK properly. Fix that by dropping and recreating.
-        ActiveRecord::Base.connection.execute("drop table adverts")
-        if defined?(Mysql2)
-          ActiveRecord::Base.connection.execute("CREATE TABLE adverts (id integer PRIMARY KEY AUTO_INCREMENT NOT NULL, name varchar(250)) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin")
-        else
-          ActiveRecord::Base.connection.execute("CREATE TABLE adverts (id integer PRIMARY KEY AUTOINCREMENT  NOT NULL, name varchar(250))")
-        end
-      end
-
       class Advert < ActiveRecord::Base
         declare_schema do
           string :name, limit: 250, null: true
@@ -2046,7 +2042,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         nuke_model_class(Advertiser)
         nuke_model_class(Affiliate)
       end
-    end if !defined?(SQLite3) && ActiveRecord::VERSION::MAJOR >= 5
+    end if !defined?(SQLite3)
 
     describe 'serialize' do
       before do
@@ -2233,13 +2229,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     context "for Rails #{ActiveSupport::VERSION::MAJOR}" do
-      if ActiveSupport::VERSION::MAJOR >= 5
-        let(:optional_true) { { optional: true } }
-        let(:optional_false) { { optional: false } }
-      else
-        let(:optional_true) { {} }
-        let(:optional_false) { {} }
-      end
+      let(:optional_true) { { optional: true } }
+      let(:optional_false) { { optional: false } }
       let(:optional_flag) { { false => optional_false, true => optional_true } }
 
       describe 'belongs_to' do
@@ -2348,9 +2339,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
             end
             class Fk < ActiveRecord::Base
               declare_schema { }
-              belongs_to :id_default, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
-              belongs_to :id4, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
-              belongs_to :id8, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
+              belongs_to :id_default, ({})
+              belongs_to :id4, ({})
+              belongs_to :id8, ({})
             end
           end
 
@@ -2461,36 +2452,30 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migration_content = File.read(migrations.first)
         first_line = migration_content.split("\n").first
         base_class = first_line.split(' < ').last
-        expect(base_class).to eq("(ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
+        expect(base_class).to eq("(ActiveRecord::Migration[4.2])")
       end
     end
 
     context 'Does not generate migrations' do
       it 'for aliased fields bigint -> integer limit 8' do
-        if ActiveSupport::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
-          class Advert < active_record_base_class.constantize
-            declare_schema do
-              bigint :price
-            end
+        class Advert < active_record_base_class.constantize
+          declare_schema do
+            bigint :price
           end
+        end
 
-          generate_migrations '-n', '-m'
-
-          migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
-          expect(migrations.size).to eq(1), migrations.inspect
+        generate_migrations '-n', '-m'
 
-          if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR < 5
-            ActiveRecord::Base.connection.execute("ALTER TABLE adverts ADD PRIMARY KEY (id)")
-          end
+        migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
+        expect(migrations.size).to eq(1), migrations.inspect
 
-          class Advert < active_record_base_class.constantize
-            declare_schema do
-              integer :price, limit: 8
-            end
+        class Advert < active_record_base_class.constantize
+          declare_schema do
+            integer :price, limit: 8
           end
-
-          expect { generate_migrations '-n', '-g' }.to output("Database and models match -- nothing to change\n").to_stdout
         end
+
+        expect { generate_migrations '-n', '-g' }.to output("Database and models match -- nothing to change\n").to_stdout
       end
     end
 

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

@@ -14,11 +14,8 @@ RSpec.describe DeclareSchema::Model::Column do
 
   describe 'class methods' do
     describe '.native_type?' do
-      if ActiveSupport::VERSION::MAJOR >= 5
-        let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean, :json] }
-      else
-        let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean] }
-      end
+      let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean, :json] }
+    
 
       it 'is falsey for :primary_key' do
         expect(described_class.native_type?(:primary_key)).to be_falsey
@@ -63,19 +60,17 @@ RSpec.describe DeclareSchema::Model::Column do
     end
 
     describe '.deserialize_default_value' do
-      if ::ActiveSupport::VERSION::MAJOR >= 5
-        it 'deserializes :boolean' do
-          expect(described_class.deserialize_default_value(nil, :boolean, 'true')).to eq(true)
-          expect(described_class.deserialize_default_value(nil, :boolean, 'false')).to eq(false)
-        end
+      it 'deserializes :boolean' do
+        expect(described_class.deserialize_default_value(nil, :boolean, 'true')).to eq(true)
+        expect(described_class.deserialize_default_value(nil, :boolean, 'false')).to eq(false)
+      end
 
-        it 'deserializes :integer' do
-          expect(described_class.deserialize_default_value(nil, :integer, '12')).to eq(12)
-        end
+      it 'deserializes :integer' do
+        expect(described_class.deserialize_default_value(nil, :integer, '12')).to eq(12)
+      end
 
-        it 'deserializes :json' do
-          expect(described_class.deserialize_default_value(nil, :json, '{}')).to eq({})
-        end
+      it 'deserializes :json' do
+        expect(described_class.deserialize_default_value(nil, :json, '{}')).to eq({})
       end
     end
   end

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

@@ -110,16 +110,6 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if ActiveSupport::VERSION::MAJOR < 5
-                expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
-                connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
-                expect(connection_stub).to receive(:indexes).
-                  with('index_definition_compound_index_models').
-                  and_return([DeclareSchema::Model::IndexDefinition.new(model_class, ['fk1_id', 'fk2_id'], name: 'PRIMARY')])
-
-                expect(model_class.connection).to receive(:dup).and_return(connection_stub)
-              end
-
               expect(subject.size).to eq(1), subject.inspect
               expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
                 ['PRIMARY', ['fk1_id', 'fk2_id'], true]
@@ -219,16 +209,6 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if ActiveSupport::VERSION::MAJOR < 5
-                expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
-                connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
-                expect(connection_stub).to receive(:indexes).
-                    with('index_definition_compound_index_models').
-                    and_return([DeclareSchema::Model::IndexDefinition.new(model_class, ['fk1_id', 'fk2_id'], name: 'PRIMARY')])
-
-                expect(model_class.connection).to receive(:dup).and_return(connection_stub)
-              end
-
               expect(subject.size).to eq(1), subject.inspect
               expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
                                                                                              ['PRIMARY', ['fk1_id', 'fk2_id'], true]

data/spec/spec_helper.rb

@@ -27,11 +27,7 @@ RSpec.configure do |config|
   RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 2_000
 
   def active_record_base_class
-    if ActiveSupport::VERSION::MAJOR == 4
-      'ActiveRecord::Base'
-    else
-      'ApplicationRecord'
-    end
+    'ApplicationRecord'
   end
 
   def migrate(renames = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 description: Declare your Rails/active_record model schemas and have database migrations
   generated for you!
 email: development@invoca.com
@@ -49,8 +49,6 @@ files:
 - bin/declare_schema
 - declare_schema.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_4_mysql.gemfile
-- gemfiles/rails_4_sqlite.gemfile
 - gemfiles/rails_5_mysql.gemfile
 - gemfiles/rails_5_sqlite.gemfile
 - gemfiles/rails_6_mysql.gemfile
@@ -143,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails

data/gemfiles/rails_4_mysql.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "bundler", "< 2"
-gem "climate_control", "~> 0.2"
-gem "pry"
-gem "pry-byebug"
-gem "rails", "~> 4.2"
-gem "responders"
-gem "rspec"
-gem "rubocop"
-gem "yard"
-gem "mysql2"
-
-group :testapp do
-  gem "bootsnap", ">= 1.1.0", require: false
-  gem "listen"
-end
-
-gemspec path: "../"

data/gemfiles/rails_4_sqlite.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "bundler", "< 2"
-gem "climate_control", "~> 0.2"
-gem "pry"
-gem "pry-byebug"
-gem "rails", "~> 4.2"
-gem "responders"
-gem "rspec"
-gem "rubocop"
-gem "yard"
-gem "sqlite3", "~> 1.3.0"
-
-group :testapp do
-  gem "bootsnap", ">= 1.1.0", require: false
-  gem "listen"
-end
-
-gemspec path: "../"