Skip to content

Commit 4ccb6f6

Browse files
committed
Revert "Rename user column to action_user for MySQL"
This reverts commit e7c9903.
1 parent e7c9903 commit 4ccb6f6

File tree

5 files changed

+25
-27
lines changed

5 files changed

+25
-27
lines changed

app/actions/process_update.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def update(process, message, strategy_class)
3030
process.skip_process_version_update = true
3131
end
3232

33-
process.command = strategy.updated_command if message.requested?(:command)
34-
process.user = message.user if message.requested?(:user)
33+
process.command = strategy.updated_command if message.requested?(:command)
34+
process.user = message.user if message.requested?(:user)
3535
process.health_check_timeout = message.health_check_timeout if message.requested?(:health_check_timeout)
3636

3737
process.health_check_invocation_timeout = message.health_check_invocation_timeout if message.requested?(:health_check_invocation_timeout)

app/models/runtime/process_model.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ def non_docker_type
174174

175175
alias_method :diego?, :diego
176176

177-
alias_attribute :user, :action_user # user is a reserved column name in MySQL
178-
179177
def revisions_enabled?
180178
app.revisions_enabled
181179
end
@@ -396,7 +394,7 @@ def started_command
396394
end
397395

398396
def run_action_user
399-
return action_user if action_user.present?
397+
return user if user.present?
400398

401399
docker? ? docker_run_action_user : DEFAULT_USER
402400
end

db/migrations/20250610212414_add_action_user_to_processes.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Sequel.migration do
2+
up do
3+
alter_table :processes do
4+
add_column :user, String, null: true, default: nil, size: 255, if_not_exists: true
5+
end
6+
end
7+
8+
down do
9+
alter_table :processes do
10+
drop_column :user if @db.schema(:processes).map(&:first).include?(:user)
11+
end
12+
end
13+
end

spec/migrations/20250610212414_add_user_to_processes_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33

44
RSpec.describe 'migration to add user column to processes table', isolation: :truncation, type: :migration do
55
include_context 'migration' do
6-
let(:migration_filename) { '20250610212414_add_action_user_to_processes.rb' }
6+
let(:migration_filename) { '20250610212414_add_user_to_processes.rb' }
77
end
88

99
describe 'processes table' do
1010
it 'adds a column `user`' do
11-
expect(db[:processes].columns).not_to include(:action_user)
11+
expect(db[:processes].columns).not_to include(:user)
1212
expect { Sequel::Migrator.run(db, migrations_path, target: current_migration_index, allow_missing_migration_files: true) }.not_to raise_error
13-
expect(db[:processes].columns).to include(:action_user)
13+
expect(db[:processes].columns).to include(:user)
1414
end
1515

1616
describe 'idempotency of up' do
1717
context '`user` column already exists' do
1818
before do
19-
db.add_column :processes, :action_user, String, size: 255
19+
db.add_column :processes, :user, String, size: 255
2020
end
2121

2222
it 'does not fail' do
23-
expect(db[:processes].columns).to include(:action_user)
23+
expect(db[:processes].columns).to include(:user)
2424
expect { Sequel::Migrator.run(db, migrations_path, target: current_migration_index, allow_missing_migration_files: true) }.not_to raise_error
2525
end
2626
end
@@ -33,20 +33,20 @@
3333
end
3434

3535
it 'continues to remove the `user_guid` column' do
36-
expect(db[:processes].columns).to include(:action_user)
36+
expect(db[:processes].columns).to include(:user)
3737
expect { Sequel::Migrator.run(db, migrations_path, target: current_migration_index - 1, allow_missing_migration_files: true) }.not_to raise_error
38-
expect(db[:processes].columns).not_to include(:action_user)
38+
expect(db[:processes].columns).not_to include(:user)
3939
end
4040
end
4141

4242
context 'column does not exist' do
4343
before do
4444
Sequel::Migrator.run(db, migrations_path, target: current_migration_index, allow_missing_migration_files: true)
45-
db.drop_column :processes, :action_user
45+
db.drop_column :processes, :user
4646
end
4747

4848
it 'does not fail' do
49-
expect(db[:processes].columns).not_to include(:action_user)
49+
expect(db[:processes].columns).not_to include(:user)
5050
expect { Sequel::Migrator.run(db, migrations_path, target: current_migration_index - 1, allow_missing_migration_files: true) }.not_to raise_error
5151
end
5252
end

0 commit comments

Comments
 (0)