declare_schema 0.2.0.pre.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce85b3e273a189a4ab8b48e333c2f12b2aea4962c0c277ae3c289f1904cddd8
-  data.tar.gz: d12345f0a483effa2724e0cd315efa759b2ace23e82ef9a1ae2cdaae28aa2571
+  metadata.gz: 3f3116a6fbb5a47de5809f3f813c88783284bad601452679fa59784f3598834b
+  data.tar.gz: 8f4b6fee7b4d17e5b644f32a4b624a3f77526f91826a8c0b82d61b6e25130332
 SHA512:
-  metadata.gz: 84cfbdd55c37a0404b672fbbca5c12dfeee765b0582cdf369b8b3f95159cfb8f82eb3fb1e6149e830ba4fe4481d6df6ef4df45398e30985380ae6681c731f8a9
-  data.tar.gz: adeda560e6bb859104b78e3710fb94d438606cf42c10b199527e5d14545505dda6dde3206500a5f7ea38b79530952182954f5e3892779f9d96db9270d59a28f1
+  metadata.gz: b833000d28d64e7856de05c9ae822c88dcceeb7861f777f13177ea8017e56bf937aba42b9da14ae1ce4810fd275c5462cb08c18c32839255ab46f1de116eee1d
+  data.tar.gz: c41c8cbdafd96eeb92fcf5c646ff9d18f4ce2374f06ecc6977015fa8406bc4639ab3722354212d1a75274c5af982f10b6c2f4c838de94f4b9436da20f836d5d3

data/CHANGELOG.md

@@ -4,14 +4,18 @@ 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.2.0] - Unreleased
+## [0.2.0] - 2020-10-26
 ### Added
 - Automatically eager_load! all Rails::Engines before generating migrations.
 
 ### Changed
 - Changed tests from rdoctest to rspec.
 
-## [0.1.3] - Unreleased
+### Fixed
+- Fixed a bug where `:text limit: 0xffff_ffff` (max size) was omitted from migrations.
+- Fixed a bug where `:bigint` foreign keys were omitted from the migration. 
+
+## [0.1.3] - 2020-10-08
 ### Changed
 - Updated the `always_ignore_tables` list in `Migrator` to access Rails metadata table names
 using the appropriate Rails configuration attributes.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.2.0.pre.1)
+    declare_schema (0.2.0)
       rails (>= 4.2)
 
 GEM

data/lib/declare_schema/model/field_spec.rb

@@ -53,7 +53,7 @@ module DeclareSchema
             @options[:limit] = self.class.round_up_mysql_text_limit(@options[:limit] || MYSQL_LONGTEXT_LIMIT)
           end
         when :string
-          @options[:limit] or raise "limit must be given for :string field #{model}##{@name}: #{@options.inspect}; do you want 255?"
+          @options[:limit] or raise "limit must be given for :string field #{model}##{@name}: #{@options.inspect}; do you want `limit: 255`?"
         end
         @position = position_option || model.field_specs.length
       end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.2.0.pre.1"
+  VERSION = "0.2.0"
 end

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

@@ -96,6 +96,20 @@ module Generators
           def connection
             ActiveRecord::Base.connection
           end
+
+          def fix_native_types(types)
+            case connection.class.name
+            when /mysql/i
+              types[:integer][:limit] ||= 11
+              types[:text][:limit]    ||= 0xffff
+              types[:binary][:limit]  ||= 0xffff
+            end
+            types
+          end
+
+          def native_types
+            @native_types ||= fix_native_types(connection.native_database_types)
+          end
         end
 
         def initialize(ambiguity_resolver = {})
@@ -129,22 +143,6 @@ module Generators
           self.class.connection
         end
 
-        class << self
-          def fix_native_types(types)
-            case connection.class.name
-            when /mysql/i
-              types[:integer][:limit] ||= 11
-              types[:text][:limit]    ||= 0xffff
-              types[:binary][:limit]  ||= 0xffff
-            end
-            types
-          end
-
-          def native_types
-            @native_types ||= fix_native_types(connection.native_database_types)
-          end
-        end
-
         def native_types
           self.class.native_types
         end
@@ -412,7 +410,7 @@ module Generators
             spec = model.field_specs[c]
             if spec.different_to?(col) # TODO: DRY this up to a diff function that returns the differences. It's different if it has differences. -Colin
               change_spec = fk_field_options(model, c)
-              change_spec[:limit]     = spec.limit     if (spec.sql_type != :text ||
+              change_spec[:limit]     ||= spec.limit   if (spec.sql_type != :text ||
                                                          ::DeclareSchema::Model::FieldSpec.mysql_text_limits?) &&
                                                           (spec.limit || col.limit)
               change_spec[:precision] = spec.precision unless spec.precision.nil?
@@ -518,8 +516,7 @@ module Generators
               next if k == :null && v == true
             end
 
-            next if k == :limit && type == :text &&
-                    (!::DeclareSchema::Model::FieldSpec.mysql_text_limits? || v == ::DeclareSchema::Model::FieldSpec::MYSQL_LONGTEXT_LIMIT)
+            next if k == :limit && type == :text && !::DeclareSchema::Model::FieldSpec.mysql_text_limits?
 
             if k.is_a?(Symbol)
               "#{k}: #{v.inspect}"
@@ -530,10 +527,20 @@ module Generators
         end
 
         def fk_field_options(model, field_name)
-          if (foreign_key = model.constraint_specs.find { |fk| field_name == fk.foreign_key.to_s }) && (parent_table = foreign_key.parent_table_name)
+          foreign_key = model.constraint_specs.find { |fk| field_name == fk.foreign_key.to_s }
+          if foreign_key && (parent_table = foreign_key.parent_table_name)
             parent_columns = connection.columns(parent_table) rescue []
-            pk_column = parent_columns.find { |column| column.name == "id" } # right now foreign keys assume id is the target
-            pk_limit  = pk_column ? pk_column.cast_type.limit : 8
+            pk_limit  =
+              if (pk_column = parent_columns.find { |column| column.name.to_s == "id" }) # right now foreign keys assume id is the target
+                if Rails::VERSION::MAJOR <= 4
+                  pk_column.cast_type.limit
+                else
+                  pk_column.limit
+                end
+              else
+                8
+              end
+
             { limit: pk_limit }
           else
             {}

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -196,7 +196,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     up, down = Generators::DeclareSchema::Migration::Migrator.run
     expect(up).to eq(<<~EOS.strip)
-      add_column :adverts, :notes, :text, null: false
+      add_column :adverts, :notes, :text, null: false, limit: 4294967295
       add_column :adverts, :description, :text, null: false, limit: 255
     EOS
 
@@ -238,7 +238,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     up, down = Generators::DeclareSchema::Migration::Migrator.run
-    expect(up).to eq("change_column :adverts, :description, :text, null: false")
+    expect(up).to eq("change_column :adverts, :description, :text, limit: 4294967295, null: false")
     expect(down).to eq("change_column :adverts, :description, :text")
 
     # TODO TECH-4814: The above test should have this output:
@@ -253,7 +253,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     up, down = Generators::DeclareSchema::Migration::Migrator.run
-    expect(up).to eq("change_column :adverts, :description, :text, null: false")
+    expect(up).to eq("change_column :adverts, :description, :text, limit: 4294967295, null: false")
     expect(down).to eq("change_column :adverts, :description, :text")
     ::DeclareSchema::Model::FieldSpec::instance_variable_set(:@mysql_text_limits, false)
 

data/spec/lib/generators/declare_schema/migration/migrator_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails'
+require 'rails/generators'
+
+module Generators
+  module DeclareSchema
+    module Migration
+      RSpec.describe Migrator do
+        before do
+          ActiveRecord::Base.connection.tables
+        end
+
+        subject { described_class.new }
+
+        describe 'format_options' do
+          let(:mysql_longtext_limit) { 0xffff_ffff }
+
+          context 'MySQL' do
+            before do
+              expect(::DeclareSchema::Model::FieldSpec).to receive(:mysql_text_limits?).and_return(true)
+            end
+
+            it 'returns text limits' do
+              expect(subject.format_options({ limit: mysql_longtext_limit }, :text)).to eq(["limit: #{mysql_longtext_limit}"])
+            end
+          end
+
+          context 'non-MySQL' do
+            before do
+              expect(::DeclareSchema::Model::FieldSpec).to receive(:mysql_text_limits?).and_return(false)
+            end
+
+            it 'returns text limits' do
+              expect(subject.format_options({ limit: mysql_longtext_limit }, :text)).to eq([])
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -77,6 +77,7 @@ files:
 - spec/lib/declare_schema/interactive_primary_key_spec.rb
 - spec/lib/declare_schema/migration_generator_spec.rb
 - spec/lib/declare_schema/prepare_testapp.rb
+- spec/lib/generators/declare_schema/migration/migrator_spec.rb
 - spec/spec_helper.rb
 - test_responses.txt
 homepage: https://github.com/Invoca/declare_schema