mirror of
https://github.com/discourse/discourse.git
synced 2025-03-20 09:35:40 +08:00
DEV: Don't create unnecessary scope methods (#15104)
Skipping methods we don't use gives us mem/perf gains (minuscule but still), but more importantly fixes warnings about `Poll#open` (created by `enum :status`) conflicting with some internal AR method. 😃
This commit is contained in:
parent
4d3eb3f1ac
commit
2971d03307
@ -6,7 +6,7 @@ class DirectoryColumn < ActiveRecord::Base
|
|||||||
self.ignored_columns = ["automatic"]
|
self.ignored_columns = ["automatic"]
|
||||||
self.inheritance_column = nil
|
self.inheritance_column = nil
|
||||||
|
|
||||||
enum type: { automatic: 0, user_field: 1, plugin: 2 }
|
enum type: { automatic: 0, user_field: 1, plugin: 2 }, _scopes: false
|
||||||
|
|
||||||
def self.automatic_column_names
|
def self.automatic_column_names
|
||||||
@automatic_column_names ||= [:likes_received,
|
@automatic_column_names ||= [:likes_received,
|
||||||
|
@ -11,7 +11,7 @@ class UserOption < ActiveRecord::Base
|
|||||||
|
|
||||||
after_save :update_tracked_topics
|
after_save :update_tracked_topics
|
||||||
|
|
||||||
enum default_calendar: { none_selected: 0, ics: 1, google: 2 }
|
enum default_calendar: { none_selected: 0, ics: 1, google: 2 }, _scopes: false
|
||||||
|
|
||||||
def self.ensure_consistency!
|
def self.ensure_consistency!
|
||||||
sql = <<~SQL
|
sql = <<~SQL
|
||||||
|
@ -13,29 +13,29 @@ class Poll < ActiveRecord::Base
|
|||||||
regular: 0,
|
regular: 0,
|
||||||
multiple: 1,
|
multiple: 1,
|
||||||
number: 2,
|
number: 2,
|
||||||
}
|
}, _scopes: false
|
||||||
|
|
||||||
enum status: {
|
enum status: {
|
||||||
open: 0,
|
open: 0,
|
||||||
closed: 1,
|
closed: 1,
|
||||||
}
|
}, _scopes: false
|
||||||
|
|
||||||
enum results: {
|
enum results: {
|
||||||
always: 0,
|
always: 0,
|
||||||
on_vote: 1,
|
on_vote: 1,
|
||||||
on_close: 2,
|
on_close: 2,
|
||||||
staff_only: 3,
|
staff_only: 3,
|
||||||
}
|
}, _scopes: false
|
||||||
|
|
||||||
enum visibility: {
|
enum visibility: {
|
||||||
secret: 0,
|
secret: 0,
|
||||||
everyone: 1,
|
everyone: 1,
|
||||||
}
|
}, _scopes: false
|
||||||
|
|
||||||
enum chart_type: {
|
enum chart_type: {
|
||||||
bar: 0,
|
bar: 0,
|
||||||
pie: 1
|
pie: 1
|
||||||
}
|
}, _scopes: false
|
||||||
|
|
||||||
validates :min, numericality: { allow_nil: true, only_integer: true, greater_than_or_equal_to: 0 }
|
validates :min, numericality: { allow_nil: true, only_integer: true, greater_than_or_equal_to: 0 }
|
||||||
validates :max, numericality: { allow_nil: true, only_integer: true, greater_than: 0 }
|
validates :max, numericality: { allow_nil: true, only_integer: true, greater_than: 0 }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user