ridgepole 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a762662665b42c22bb32b659ae668644d13f41b41df82e69769c9c1a3a734f5f
-  data.tar.gz: dae6ee8668accb92507a2b35874d59178d250ae8a0ede0eb7e802a17a4f19635
+  metadata.gz: 3453e48af2d76cbb35301fcc70d7177f0016c47f4279593b6adbf269190d0b01
+  data.tar.gz: e4e61ed5bbbfae92a0660244a4e021fc387d945ccd5e85971d20c1ff184dc79f
 SHA512:
-  metadata.gz: 8ed8b55d0b0acfa7126d53f97ac76b228138369ec3b5c6351bdaf0806565d0cf8cc5c8ac2b0928f9329c07aba08edfff311e6340fec42e78e627eb228f72b6b3
-  data.tar.gz: 4c46611a9eae8bfa9461087e12847a12a62539e132ac01ace71ac3a336a48fcb17437583c7f71af5a922f7839c31b76736be544c945b75ebedd4e2d52d753ca5
+  metadata.gz: aa213105207d7a0a73adae7254885966fb06b0e0cc22cec7e2e44f7bd2082f7a6b10b2e7d8b5c5822c57b333447cd8ebb591db691b95a541f1493adcf3d46153
+  data.tar.gz: 3e1a1c8bbcde1f7d313df1a151d5ca3096e1bba911a099cc4e8969b877941dd85061d2c3d18c17afff976c5119d3cc00f9c9966f9037af5365d8d5b0c87243c0

data/README.md

@@ -139,6 +139,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support `t.foreign_key` ([pull#348](https://github.com/winebarrel/ridgepole/pull/348))
 * `>= 0.9.2`
   * Support `t.column index option` ([pull#353](https://github.com/winebarrel/ridgepole/pull/353))
+* `>= 0.9.3`
+  * Fix `limit` option for `t.integer` ([pull#354](https://github.com/winebarrel/ridgepole/pull/453))
 </details>
 
 **Notice**

data/lib/ridgepole/diff.rb

@@ -399,9 +399,13 @@ module Ridgepole
       if Ridgepole::ConnectionAdapters.mysql?
         opts[:unsigned] = false unless opts.key?(:unsigned)
 
-        if (attrs[:type] == :integer) && (opts[:limit] == Ridgepole::DefaultsLimit.default_limit(:bigint, @options))
-          attrs[:type] = :bigint
-          opts.delete(:limit)
+        if attrs[:type] == :integer && opts[:limit]
+          min = Ridgepole::DefaultsLimit.default_limit(:integer, @options)
+          max = Ridgepole::DefaultsLimit.default_limit(:bigint, @options)
+          if min < opts[:limit] && opts[:limit] <= max
+            attrs[:type] = :bigint
+            opts.delete(:limit)
+          end
         end
 
         if opts[:size] && (attrs[:type] == :text || attrs[:type] == :blob || attrs[:type] == :binary)

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/spec/mysql/migrate/migrate_change_column7_spec.rb

@@ -5,7 +5,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:dsl) do
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no", limit: 8, null: false
+          t.integer "emp_no_int", limit: 4, null: false
+          t.integer "emp_no_bigint5", limit: 5, null: false
+          t.integer "emp_no_bigint6", limit: 6, null: false
+          t.integer "emp_no_bigint7", limit: 7, null: false
+          t.integer "emp_no_bigint8", limit: 8, null: false
           t.float   "salary", <%= i cond('< 5.2.0.beta2', limit: 24) %>, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
@@ -17,7 +21,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(subject.dump).to match_ruby dsl.sub(/t.integer "emp_no", limit: 8/, 't.bigint "emp_no"')
+      expect(subject.dump).to match_ruby dsl
+        .sub(/t.integer "emp_no_int", limit: 4/, 't.integer "emp_no_int"')
+        .sub(/t.integer "emp_no_bigint5", limit: 5/, 't.bigint "emp_no_bigint5"')
+        .sub(/t.integer "emp_no_bigint6", limit: 6/, 't.bigint "emp_no_bigint6"')
+        .sub(/t.integer "emp_no_bigint7", limit: 7/, 't.bigint "emp_no_bigint7"')
+        .sub(/t.integer "emp_no_bigint8", limit: 8/, 't.bigint "emp_no_bigint8"')
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord