summaryrefslogtreecommitdiffstats
path: root/db
diff options
context:
space:
mode:
authoraus-social <42644106+aus-social@users.noreply.github.com>2018-10-04 20:36:53 +1000
committerEugen Rochko <eugen@zeonfederated.com>2018-10-04 12:36:53 +0200
commit1f98eae1cf916a18007a26e1740b0e65aa7ff752 (patch)
tree9d4a8811cbf8ac39a3c8e4923dd5f18c2563959f /db
parent928102284a4e77e5f0ab340f4516749d665c2d67 (diff)
Lint pass (#8876)
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160306172223_create_doorkeeper_tables.rb4
-rw-r--r--db/migrate/20161006213403_rails_settings_migration.rb2
-rw-r--r--db/migrate/20170606113804_change_tag_search_index_to_btree.rb1
-rw-r--r--db/migrate/20170716191202_add_hide_notifications_to_mute.rb2
-rw-r--r--db/migrate/20170920032311_fix_reblogs_in_feeds.rb2
-rw-r--r--db/migrate/20171028221157_add_reblogs_to_follows.rb2
-rw-r--r--db/schema.rb1
7 files changed, 6 insertions, 8 deletions
diff --git a/db/migrate/20160306172223_create_doorkeeper_tables.rb b/db/migrate/20160306172223_create_doorkeeper_tables.rb
index 9e173a43f32..462343e888c 100644
--- a/db/migrate/20160306172223_create_doorkeeper_tables.rb
+++ b/db/migrate/20160306172223_create_doorkeeper_tables.rb
@@ -34,12 +34,12 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
# https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
#
# t.text :token, null: false
- t.string :token, null: false
+ t.string :token, null: false
t.string :refresh_token
t.integer :expires_in
t.datetime :revoked_at
- t.datetime :created_at, null: false
+ t.datetime :created_at, null: false
t.string :scopes
end
diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 3b2e637fc7c..42875d7cbda 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -7,7 +7,7 @@ end
class RailsSettingsMigration < MIGRATION_BASE_CLASS
def self.up
create_table :settings do |t|
- t.string :var, :null => false
+ t.string :var, :null => false
t.text :value
t.references :target, :null => false, :polymorphic => true
t.timestamps :null => true
diff --git a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
index 5248e172026..979df2e7442 100644
--- a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
+++ b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
@@ -1,5 +1,4 @@
class ChangeTagSearchIndexToBtree < ActiveRecord::Migration[5.1]
-
def up
remove_index :tags, name: :hashtag_search_index
execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
diff --git a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
index 0410938c9b8..a498396b75e 100644
--- a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
+++ b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
@@ -8,7 +8,7 @@ class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
def up
add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
end
-
+
def down
remove_column :mutes, :hide_notifications
end
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
index 439c5fca08b..5654bf6f877 100644
--- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
+++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
@@ -28,7 +28,7 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
-- So, first, we iterate over the user's feed to find any reblogs.
local items = redis.call('zrange', timeline_key, 0, -1, 'withscores')
-
+
for i = 1, #items, 2 do
local reblogged_id = items[i]
local reblogging_id = items[i + 1]
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
index 4b5d5b7ff36..3b2e46ed8a6 100644
--- a/db/migrate/20171028221157_add_reblogs_to_follows.rb
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -11,7 +11,7 @@ class AddReblogsToFollows < ActiveRecord::Migration[5.1]
add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
end
end
-
+
def down
remove_column :follows, :show_reblogs
remove_column :follow_requests, :show_reblogs
diff --git a/db/schema.rb b/db/schema.rb
index f3b06f7c0c6..577296a6ae9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,6 @@
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2018_08_20_232245) do
-
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"