This repository was archived by the owner on Oct 28, 2020. It is now read-only.

Commit 582cdc7

author

v.promzelev

committed

fixup error with unsupported types of pk

1 parent 5ddb047 commit 582cdc7Copy full SHA for 582cdc7

File tree

+31

-0

lines changed

+31

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ def analyse!`
`29`	`29`	`pk = model.columns.select { \|c\| c.name == model.primary_key }.first`
`30`	`30`	`max = MAX_VALUE.fetch(pk.sql_type) do \|type\|`
`31`	`31`	`@logger.warn "Model #{model} has primary_key #{model.primary_key} with unsupported type #{type}"`
	`32`	`+ nil`
`32`	`33`	`end`
	`34`	`+ next unless max`
`33`	`35`	`if overflow_soon?(max, model)`
`34`	`36`	`overflowed_tables << [table, model.last.public_send(pk.name), max]`
`35`	`37`	`end`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,22 @@`
`19`	`19`	`it { expect { subject.analyse! }.not_to raise_error }`
`20`	`20`	`end`
`21`	`21`
	`22`	`+ context 'unsupported type of primary key' do`
	`23`	`+ let(:today) { Time.now }`
	`24`	`+ let(:logger) { Logger.new('/dev/null') }`
	`25`	`+ before do`
	`26`	`+ (1..7).each do \|t\|`
	`27`	`+ record = TestStringModel.new(created_at: today - day * t, updated_at: today - day * t)`
	`28`	`+ record.id = "id#{t}"`
	`29`	`+ record.save!`
	`30`	`+ end`
	`31`	`+ end`
	`32`	`+`
	`33`	`+ subject { described_class.new(models: [TestStringModel], days_count: 10, logger: logger) }`
	`34`	`+`
	`35`	`+ it { expect { subject.analyse! }.not_to raise_error }`
	`36`	`+ end`
	`37`	`+`
`22`	`38`	`context 'not empty table' do`
`23`	`39`	`let(:today) { Time.now }`
`24`	`40`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`require 'bundler/setup'`
`2`	`2`	`require 'activerecord/overflow_signalizer'`
`3`	`3`	`require 'byebug'`
	`4`	`+require 'logger'`
`4`	`5`	`require 'active_record'`
`5`	`6`
`6`	`7`	`RSpec.configure do \|config\|`
`@@ -35,3 +36,15 @@ class TestBigIntModel < ActiveRecord::Base`
`35`	`36`	`end`
`36`	`37`	`TestBigIntModel.connection.execute(%Q{ ALTER TABLE "bigint_test" ADD PRIMARY KEY ("id"); })`
`37`	`38`	`TestBigIntModel.reset_column_information`
	`39`	`+`
	`40`	`+class TestStringModel < ActiveRecord::Base`
	`41`	`+ establish_connection YAML.load_file(DATABASE_CONFIG_PATH)`
	`42`	`+ self.table_name = 'string_test'`
	`43`	`+end`
	`44`	`+`
	`45`	`+TestBigIntModel.connection.create_table(:string_test, id: false, force: true) do \|t\|`
	`46`	`+ t.column :id, :string, null: false`
	`47`	`+ t.timestamps`
	`48`	`+end`
	`49`	`+TestBigIntModel.connection.execute(%Q{ ALTER TABLE "string_test" ADD PRIMARY KEY ("id"); })`
	`50`	`+TestBigIntModel.reset_column_information`

Comments

(0)