about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-06 20:57:52 +0200
committerGitHub <noreply@github.com>2017-09-06 20:57:52 +0200
commit11bddd31ce33b654ef72b00221715e6026486e7c (patch)
treeb848fa7a45bc825dfb6accf5f937a14bc73df8af
parentdd5cb5085c35516163c7cce1289c4bd81c936a28 (diff)
Fix locking migration on statuses table. Nullable column and NO default value (#4825)
-rw-r--r--app/models/status.rb2
-rw-r--r--db/migrate/20170905165803_add_local_to_statuses.rb2
-rw-r--r--db/schema.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 53eff0377..fdc230d8f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -22,7 +22,7 @@
 #  reblogs_count          :integer          default(0), not null
 #  language               :string
 #  conversation_id        :integer
-#  local                  :boolean          default(FALSE)
+#  local                  :boolean
 #
 
 class Status < ApplicationRecord
diff --git a/db/migrate/20170905165803_add_local_to_statuses.rb b/db/migrate/20170905165803_add_local_to_statuses.rb
index e89a0469d..fb4e7019d 100644
--- a/db/migrate/20170905165803_add_local_to_statuses.rb
+++ b/db/migrate/20170905165803_add_local_to_statuses.rb
@@ -1,5 +1,5 @@
 class AddLocalToStatuses < ActiveRecord::Migration[5.1]
   def change
-    add_column :statuses, :local, :boolean, null: true, default: false
+    add_column :statuses, :local, :boolean, null: true, default: nil
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 21bde2086..d8af0a1f8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -315,7 +315,7 @@ ActiveRecord::Schema.define(version: 20170905165803) do
     t.integer "reblogs_count", default: 0, null: false
     t.string "language"
     t.bigint "conversation_id"
-    t.boolean "local", default: false
+    t.boolean "local"
     t.index ["account_id", "id"], name: "index_statuses_on_account_id_id"
     t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"