From abfc5ce23f680387ceaf8819045afd4802dca52a Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Tue, 12 Apr 2022 12:28:25 +0200 Subject: [PATCH] Rename Token#name to Token#description --- src/api/app/models/token.rb | 6 +++--- src/api/app/models/token/rebuild.rb | 2 +- src/api/app/models/token/release.rb | 2 +- src/api/app/models/token/rss.rb | 2 +- src/api/app/models/token/service.rb | 2 +- src/api/app/models/token/workflow.rb | 2 +- ...0412090435_rename_name_to_description_in_tokens.rb | 11 +++++++++++ src/api/db/schema.rb | 6 +++++- 8 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/api/db/migrate/20220412090435_rename_name_to_description_in_tokens.rb diff --git a/src/api/app/models/token.rb b/src/api/app/models/token.rb index 89abfacdc06..2daed7efc62 100644 --- a/src/api/app/models/token.rb +++ b/src/api/app/models/token.rb @@ -8,10 +8,10 @@ class Token < ApplicationRecord has_secure_token :string before_validation do - self.name ||= '' + self.description ||= '' end - validates :name, length: { maximum: 64 } + validates :description, length: { maximum: 64 } validates :string, uniqueness: { case_sensitive: false } validates :scm_token, absence: true, if: -> { type != 'Token::Workflow' } @@ -63,7 +63,7 @@ def set_triggered_at # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/app/models/token/rebuild.rb b/src/api/app/models/token/rebuild.rb index 47d661c09c4..4270c18b343 100644 --- a/src/api/app/models/token/rebuild.rb +++ b/src/api/app/models/token/rebuild.rb @@ -18,7 +18,7 @@ def package_find_options # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/app/models/token/release.rb b/src/api/app/models/token/release.rb index addff89801e..79ca41893e9 100644 --- a/src/api/app/models/token/release.rb +++ b/src/api/app/models/token/release.rb @@ -32,7 +32,7 @@ def package_find_options # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/app/models/token/rss.rb b/src/api/app/models/token/rss.rb index f27db698fe7..fe7b1811ebc 100644 --- a/src/api/app/models/token/rss.rb +++ b/src/api/app/models/token/rss.rb @@ -6,7 +6,7 @@ class Token::Rss < Token # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/app/models/token/service.rb b/src/api/app/models/token/service.rb index 81df7258c33..22b26577fd8 100644 --- a/src/api/app/models/token/service.rb +++ b/src/api/app/models/token/service.rb @@ -16,7 +16,7 @@ def package_find_options # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/app/models/token/workflow.rb b/src/api/app/models/token/workflow.rb index 4a3c4efa343..434578d3b7e 100644 --- a/src/api/app/models/token/workflow.rb +++ b/src/api/app/models/token/workflow.rb @@ -50,7 +50,7 @@ def validation_errors # Table name: tokens # # id :integer not null, primary key -# name :string(64) default("") +# description :string(64) default("") # scm_token :string(255) indexed # string :string(255) indexed # triggered_at :datetime diff --git a/src/api/db/migrate/20220412090435_rename_name_to_description_in_tokens.rb b/src/api/db/migrate/20220412090435_rename_name_to_description_in_tokens.rb new file mode 100644 index 00000000000..e4cf18fd460 --- /dev/null +++ b/src/api/db/migrate/20220412090435_rename_name_to_description_in_tokens.rb @@ -0,0 +1,11 @@ +class RenameNameToDescriptionInTokens < ActiveRecord::Migration[6.1] + def up + # rename column is safe in mysql 5.6 and beyond + # check https://stefan.magnuson.co/posts/2020-04-18-zero-downtime-migrations-with-rails-and-mysql/ + safety_assured { rename_column :tokens, :name, :description } + end + + def down + safety_assured { rename_column :tokens, :description, :name } + end +end diff --git a/src/api/db/schema.rb b/src/api/db/schema.rb index 367d9ce9d14..6ec15bf5b1b 100644 --- a/src/api/db/schema.rb +++ b/src/api/db/schema.rb @@ -10,7 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< HEAD ActiveRecord::Schema.define(version: 2022_04_13_223300) do +======= +ActiveRecord::Schema.define(version: 2022_04_12_090435) do +>>>>>>> d53ec94603 (Rename Token#name to Token#description) create_table "architectures", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", options: "ENGINE=InnoDB ROW_FORMAT=DYNAMIC", force: :cascade do |t| t.string "name", null: false, collation: "utf8_general_ci" @@ -1012,7 +1016,7 @@ t.integer "package_id" t.string "type", collation: "utf8_unicode_ci" t.string "scm_token" - t.string "name", limit: 64, default: "" + t.string "description", limit: 64 t.datetime "triggered_at" t.index ["package_id"], name: "package_id" t.index ["scm_token"], name: "index_tokens_on_scm_token"