diff options
author | ThibG <thib@sitedethib.com> | 2019-11-07 13:41:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-07 13:41:56 +0100 |
commit | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (patch) | |
tree | 0d3596a944cd4ddc27c8c3989f039f640730f70c /db | |
parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
parent | f63dad52943c757489975e0c39e771b6bc96e5ba (diff) |
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191031163205_change_list_account_follow_nullable.rb | 5 | ||||
-rw-r--r-- | db/schema.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/db/migrate/20191031163205_change_list_account_follow_nullable.rb b/db/migrate/20191031163205_change_list_account_follow_nullable.rb new file mode 100644 index 000000000..ff8911546 --- /dev/null +++ b/db/migrate/20191031163205_change_list_account_follow_nullable.rb @@ -0,0 +1,5 @@ +class ChangeListAccountFollowNullable < ActiveRecord::Migration[5.1] + def change + change_column_null :list_accounts, :follow_id, true + end +end diff --git a/db/schema.rb b/db/schema.rb index eb86a9f68..946f2c5e6 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: 2019_10_07_013357) do +ActiveRecord::Schema.define(version: 2019_10_31_163205) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -383,7 +383,7 @@ ActiveRecord::Schema.define(version: 2019_10_07_013357) do create_table "list_accounts", force: :cascade do |t| t.bigint "list_id", null: false t.bigint "account_id", null: false - t.bigint "follow_id", null: false + t.bigint "follow_id" t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true t.index ["follow_id"], name: "index_list_accounts_on_follow_id" t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id" |