diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-08 00:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 00:21:55 +0200 |
| commit | df82963ea4fda69571ae27abef4239d4b755eb2f (patch) | |
| tree | 7b49b6927f676723bf0f34e7e9c2e561553ec167 /db | |
| parent | d30dd5b1dbbc8e72cd7aefe5ee39684e068b7118 (diff) | |
| parent | fbf097f7e159e4fabe39bd36b9bc480b3f8b4058 (diff) | |
Merge pull request #1532 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20210507001928_remove_hub_url_from_accounts.rb | 12 | ||||
| -rw-r--r-- | db/schema.rb | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/db/post_migrate/20210507001928_remove_hub_url_from_accounts.rb b/db/post_migrate/20210507001928_remove_hub_url_from_accounts.rb new file mode 100644 index 000000000..83a1f5fcf --- /dev/null +++ b/db/post_migrate/20210507001928_remove_hub_url_from_accounts.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class RemoveHubURLFromAccounts < ActiveRecord::Migration[5.2] + def change + safety_assured do + remove_column :accounts, :secret, :string, null: false, default: '' + remove_column :accounts, :remote_url, :string, null: false, default: '' + remove_column :accounts, :salmon_url, :string, null: false, default: '' + remove_column :accounts, :hub_url, :string, null: false, default: '' + end + end +end diff --git a/db/schema.rb b/db/schema.rb index df6de139a..5cf5f665d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_05_05_174616) do +ActiveRecord::Schema.define(version: 2021_05_07_001928) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -136,12 +136,8 @@ ActiveRecord::Schema.define(version: 2021_05_05_174616) do create_table "accounts", id: :bigint, default: -> { "timestamp_id('accounts'::text)" }, force: :cascade do |t| t.string "username", default: "", null: false t.string "domain" - t.string "secret", default: "", null: false t.text "private_key" t.text "public_key", default: "", null: false - t.string "remote_url", default: "", null: false - t.string "salmon_url", default: "", null: false - t.string "hub_url", default: "", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.text "note", default: "", null: false |