Skip to content

Commit b193583

Browse files
committed
bigint migration - events table - step 1
1 parent f629077 commit b193583

9 files changed

Lines changed: 226 additions & 2 deletions

.rubocop_cc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ Rails/DangerousColumnNames: # Disabled, in comparison to active_record we need t
136136
Rails/SkipsModelValidations: # We don`t want any model at all in migrations and migration specs
137137
Enabled: true
138138
Exclude:
139-
- db/migrations/*
140-
- spec/migrations/*
139+
- db/migrations/**/*
140+
- spec/migrations/**/*
141141

142142
#### ENABLED SECTION
143143
Gemspec/DeprecatedAttributeAssignment:

db/helpers/bigint_migration.rb

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
require 'tasks/rake_config'
2+
3+
# helpers
4+
def opt_out?
5+
opt_out = RakeConfig.config.get(:skip_bigint_id_migration)
6+
opt_out.nil? ? false : opt_out
7+
rescue VCAP::CloudController::Config::InvalidConfigPath
8+
false
9+
end
10+
11+
# DSL
12+
def empty?(table)
13+
raise unless is_a?(Sequel::Database)
14+
15+
self[table].count == 0
16+
end
17+
18+
def change_pk_to_bigint(table)
19+
raise unless is_a?(Sequel::Database)
20+
21+
set_column_type(table, :id, :Bignum) if column_type(self, table, :id) != BIGINT_TYPE
22+
end
23+
24+
def add_bigint_column(table)
25+
raise unless is_a?(Sequel::Database)
26+
27+
add_column(table, :id_bigint, :Bignum, if_not_exists: true)
28+
end
29+
30+
def revert_pk_to_integer(table)
31+
raise unless is_a?(Sequel::Database)
32+
33+
set_column_type(table, :id, :integer) if column_type(self, table, :id) == BIGINT_TYPE
34+
end
35+
36+
def drop_bigint_column(table)
37+
raise unless is_a?(Sequel::Database)
38+
39+
drop_column(table, :id_bigint, if_exists: true)
40+
end
41+
42+
# internal constants
43+
BIGINT_TYPE = 'bigint'.freeze
44+
45+
# internal helpers
46+
def column_type(db, table, column)
47+
db.schema(table).find { |col, _| col == column }&.dig(1, :db_type)
48+
end
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
require File.expand_path('../helpers/bigint_migration', __dir__)
2+
3+
Sequel.migration do
4+
up do
5+
unless opt_out?
6+
if empty?(:events)
7+
change_pk_to_bigint(:events)
8+
else
9+
add_bigint_column(:events)
10+
end
11+
end
12+
end
13+
14+
down do
15+
revert_pk_to_integer(:events)
16+
drop_bigint_column(:events)
17+
end
18+
end

lib/cloud_controller/config_schemas/base/api_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ class ApiSchema < VCAP::Config
9999
optional(:max_migration_statement_runtime_in_seconds) => Integer,
100100
optional(:migration_psql_concurrent_statement_timeout_in_seconds) => Integer,
101101
optional(:migration_psql_worker_memory_kb) => Integer,
102+
optional(:skip_bigint_id_migration) => bool,
102103
db: {
103104
optional(:database) => Hash, # db connection hash for sequel
104105
max_connections: Integer, # max connections in the connection pool

lib/cloud_controller/config_schemas/base/migrate_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class MigrateSchema < VCAP::Config
1010
optional(:max_migration_statement_runtime_in_seconds) => Integer,
1111
optional(:migration_psql_concurrent_statement_timeout_in_seconds) => Integer,
1212
optional(:migration_psql_worker_memory_kb) => Integer,
13+
optional(:skip_bigint_id_migration) => bool,
1314

1415
db: {
1516
optional(:database) => Hash, # db connection hash for sequel
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
require 'spec_helper'
2+
require 'migrations/helpers/bigint_migration_step1_shared_context'
3+
4+
RSpec.describe 'bigint migration - events table - step1', isolation: :truncation, type: :migration do
5+
include_context 'bigint migration step1' do
6+
let(:migration_filename) { '20250327142351_bigint_migration_events_step1.rb' }
7+
let(:table) { :events }
8+
let(:insert_hash) do
9+
{
10+
guid: 'guid', timestamp: Time.now.utc, type: 'type',
11+
actor: 'actor', actor_type: 'actor_type',
12+
actee: 'actee', actee_type: 'actee_type'
13+
}
14+
end
15+
end
16+
end
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
require 'spec_helper'
2+
require_relative '../../db/helpers/bigint_migration'
3+
4+
RSpec.describe 'bigint migration helpers', isolation: :truncation, type: :migration do
5+
let(:fake_config) { double }
6+
let(:skip_bigint_id_migration) { nil }
7+
8+
before do
9+
allow_any_instance_of(VCAP::CloudController::Config).to receive(:get).with(:skip_bigint_id_migration).and_return(skip_bigint_id_migration)
10+
end
11+
12+
describe '#opt_out?' do
13+
context 'when skip_bigint_id_migration is false' do
14+
let(:skip_bigint_id_migration) { false }
15+
16+
it 'returns false' do
17+
expect(opt_out?).to be(false)
18+
end
19+
end
20+
21+
context 'when skip_bigint_id_migration is true' do
22+
let(:skip_bigint_id_migration) { true }
23+
24+
it 'returns true' do
25+
expect(opt_out?).to be(true)
26+
end
27+
end
28+
29+
context 'when skip_bigint_id_migration is nil' do
30+
let(:skip_bigint_id_migration) { nil }
31+
32+
it 'returns false' do
33+
expect(opt_out?).to be(false)
34+
end
35+
end
36+
37+
context 'when raising InvalidConfigPath error' do
38+
before do
39+
allow_any_instance_of(VCAP::CloudController::Config).to receive(:get).with(:skip_bigint_id_migration).and_raise(VCAP::CloudController::Config::InvalidConfigPath)
40+
end
41+
42+
it 'returns false' do
43+
expect(opt_out?).to be(false)
44+
end
45+
end
46+
end
47+
end
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
require 'migrations/helpers/migration_shared_context'
2+
3+
RSpec.shared_context 'bigint migration step1' do
4+
subject(:run_migration) { Sequel::Migrator.run(db, migrations_path, target: current_migration_index, allow_missing_migration_files: true) }
5+
6+
include_context 'migration'
7+
8+
let(:skip_bigint_id_migration) { nil }
9+
10+
before do
11+
allow_any_instance_of(VCAP::CloudController::Config).to receive(:get).with(:skip_bigint_id_migration).and_return(skip_bigint_id_migration)
12+
end
13+
14+
describe 'up' do
15+
context 'when skip_bigint_id_migration is false' do
16+
let(:skip_bigint_id_migration) { false }
17+
18+
context 'when the table is empty' do
19+
before do
20+
db[table].delete
21+
end
22+
23+
it "changes the id column's type to bigint" do
24+
expect(db).to have_table_with_column_and_type(table, :id, 'integer')
25+
26+
run_migration
27+
28+
expect(db).to have_table_with_column_and_type(table, :id, 'bigint')
29+
end
30+
31+
it 'does not add the id_bigint column' do
32+
expect(db).not_to have_table_with_column(table, :id_bigint)
33+
34+
run_migration
35+
36+
expect(db).not_to have_table_with_column(table, :id_bigint)
37+
end
38+
end
39+
40+
context 'when the table is not empty' do
41+
before do
42+
db[table].insert(insert_hash)
43+
end
44+
45+
it "does not change the id column's type" do
46+
expect(db).to have_table_with_column_and_type(table, :id, 'integer')
47+
48+
run_migration
49+
50+
expect(db).to have_table_with_column_and_type(table, :id, 'integer')
51+
end
52+
53+
it 'adds the id_bigint column' do
54+
expect(db).not_to have_table_with_column(table, :id_bigint)
55+
56+
run_migration
57+
58+
expect(db).to have_table_with_column_and_type(table, :id_bigint, 'bigint')
59+
end
60+
end
61+
end
62+
63+
context 'when skip_bigint_id_migration is true' do
64+
let(:skip_bigint_id_migration) { true }
65+
66+
it "neither changes the id column's type, nor adds the id_bigint column" do
67+
expect(db).to have_table_with_column_and_type(table, :id, 'integer')
68+
expect(db).not_to have_table_with_column(table, :id_bigint)
69+
70+
run_migration
71+
72+
expect(db).to have_table_with_column_and_type(table, :id, 'integer')
73+
expect(db).not_to have_table_with_column(table, :id_bigint)
74+
end
75+
end
76+
end
77+
78+
# down
79+
end

spec/migrations/helpers/matchers.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,17 @@
1515
!options.delete(:name).nil? && (options - %i[if_exists concurrently]).empty?
1616
end
1717
end
18+
19+
RSpec::Matchers.define :have_table_with_column do |table, column|
20+
match do |db|
21+
db[table].columns.include?(column)
22+
end
23+
end
24+
25+
RSpec::Matchers.define :have_table_with_column_and_type do |table, column, type|
26+
match do |db|
27+
expect(db).to have_table_with_column(table, column)
28+
29+
db.schema(table).find { |col, _| col == column }&.dig(1, :db_type) == type
30+
end
31+
end

0 commit comments

Comments
 (0)