about summary refs log tree commit diff
path: root/db
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-06 22:59:07 +0100
committerGitHub <noreply@github.com>2019-03-06 22:59:07 +0100
commitda8ce25fa1c5f1ebd9c314c5a438b0e77f8d720c (patch)
tree170efea708205d3fc4fd9b39098051ed2b68e917 /db
parent1bb23100b1059879a743302253eafc8317daf215 (diff)
parent6e295beab26089595b0ca067beb8a47cb11f8e3e (diff)
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20190306145741_add_lock_version_to_polls.rb6
-rw-r--r--db/schema.rb3
2 files changed, 8 insertions, 1 deletions
diff --git a/db/migrate/20190306145741_add_lock_version_to_polls.rb b/db/migrate/20190306145741_add_lock_version_to_polls.rb
new file mode 100644
index 000000000..cf506404d
--- /dev/null
+++ b/db/migrate/20190306145741_add_lock_version_to_polls.rb
@@ -0,0 +1,6 @@
+class AddLockVersionToPolls < ActiveRecord::Migration[5.2]
+  def change
+    add_column :polls, :lock_version, :integer, null: false, default: 0
+  end
+end
+
diff --git a/db/schema.rb b/db/schema.rb
index 48c00511b..858cd1e9b 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_03_04_152020) do
+ActiveRecord::Schema.define(version: 2019_03_06_145741) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -475,6 +475,7 @@ ActiveRecord::Schema.define(version: 2019_03_04_152020) do
     t.datetime "last_fetched_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "lock_version", default: 0, null: false
     t.index ["account_id"], name: "index_polls_on_account_id"
     t.index ["status_id"], name: "index_polls_on_status_id"
   end