fix: Specify external db with non-standard port (#2711)

POSTGRES_PORT was not taking effect if provided separately
instead of using DATABASE_URL. This adds support for using
databases running on non-standard ports.

#1145
#1147

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
This commit is contained in:
Vishnu Narayanan
2021-07-28 19:36:51 +05:30
committed by GitHub
parent 7662fdce47
commit 223385d134
6 changed files with 13 additions and 7 deletions

View File

@@ -21,7 +21,8 @@ class Account < ApplicationRecord
include Featurable
DEFAULT_QUERY_SETTING = {
flag_query_mode: :bit_operator
flag_query_mode: :bit_operator,
check_for_column: false
}.freeze
ACCOUNT_SETTINGS_FLAGS = {

View File

@@ -39,7 +39,9 @@ class Channel::WebWidget < ApplicationRecord
has_flags 1 => :attachments,
2 => :emoji_picker,
:column => 'feature_flags'
:column => 'feature_flags',
:check_for_column => false
enum reply_time: { in_a_few_minutes: 0, in_a_few_hours: 1, in_a_day: 2 }
def name

View File

@@ -2,7 +2,8 @@ module Featurable
extend ActiveSupport::Concern
QUERY_MODE = {
flag_query_mode: :bit_operator
flag_query_mode: :bit_operator,
check_for_column: false
}.freeze
FEATURE_LIST = YAML.safe_load(File.read(Rails.root.join('config/features.yml'))).freeze

View File

@@ -23,7 +23,8 @@ class NotificationSetting < ApplicationRecord
belongs_to :user
DEFAULT_QUERY_SETTING = {
flag_query_mode: :bit_operator
flag_query_mode: :bit_operator,
check_for_column: false
}.freeze
EMAIL_NOTIFICATION_FLAGS = ::Notification::NOTIFICATION_TYPES.transform_keys { |key| "email_#{key}".to_sym }.invert.freeze