forked from External/greenlight
Make all LIKE queries case insensitive (#2402)
This commit is contained in:
parent
752b192ef9
commit
6be629ae82
|
@ -0,0 +1,41 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
|
||||||
|
#
|
||||||
|
# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify it under the
|
||||||
|
# terms of the GNU Lesser General Public License as published by the Free Software
|
||||||
|
# Foundation; either version 3.0 of the License, or (at your option) any later
|
||||||
|
# version.
|
||||||
|
#
|
||||||
|
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public License along
|
||||||
|
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
module Queries
|
||||||
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
def created_at_text
|
||||||
|
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
|
||||||
|
# Postgres requires created_at to be cast to a string
|
||||||
|
if active_database == "postgresql"
|
||||||
|
"created_at::text"
|
||||||
|
else
|
||||||
|
"created_at"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def like_text
|
||||||
|
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
|
||||||
|
# Use postgres case insensitive like
|
||||||
|
if active_database == "postgresql"
|
||||||
|
"ILIKE"
|
||||||
|
else
|
||||||
|
"LIKE"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -32,36 +32,33 @@ class Room < ApplicationRecord
|
||||||
|
|
||||||
has_one_attached :presentation
|
has_one_attached :presentation
|
||||||
|
|
||||||
def self.admins_search(string)
|
class << self
|
||||||
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
|
include Queries
|
||||||
# Postgres requires created_at to be cast to a string
|
|
||||||
created_at_query = if active_database == "postgresql"
|
def admins_search(string)
|
||||||
"created_at::text"
|
like = like_text
|
||||||
else
|
search_query = "rooms.name #{like} :search OR rooms.uid #{like} :search OR users.email #{like} :search" \
|
||||||
"created_at"
|
" OR users.#{created_at_text} #{like} :search"
|
||||||
|
|
||||||
|
search_param = "%#{sanitize_sql_like(string)}%"
|
||||||
|
where(search_query, search: search_param)
|
||||||
end
|
end
|
||||||
|
|
||||||
search_query = "rooms.name LIKE :search OR rooms.uid LIKE :search OR users.email LIKE :search" \
|
def admins_order(column, direction, running_ids)
|
||||||
" OR users.#{created_at_query} LIKE :search"
|
# Include the owner of the table
|
||||||
|
table = joins(:owner)
|
||||||
|
|
||||||
search_param = "%#{sanitize_sql_like(string)}%"
|
# Rely on manual ordering if trying to sort by status
|
||||||
where(search_query, search: search_param)
|
return order_by_status(table, running_ids) if column == "status"
|
||||||
end
|
|
||||||
|
|
||||||
def self.admins_order(column, direction, running_ids)
|
return table.order("COALESCE(rooms.last_session,rooms.created_at) DESC") if column == "created_at"
|
||||||
# Include the owner of the table
|
|
||||||
table = joins(:owner)
|
|
||||||
|
|
||||||
# Rely on manual ordering if trying to sort by status
|
return table.order(Arel.sql("rooms.#{column} #{direction}")) if table.column_names.include?(column)
|
||||||
return order_by_status(table, running_ids) if column == "status"
|
|
||||||
|
|
||||||
return table.order("COALESCE(rooms.last_session,rooms.created_at) DESC") if column == "created_at"
|
return table.order(Arel.sql("#{column} #{direction}")) if column == "users.name"
|
||||||
|
|
||||||
return table.order(Arel.sql("rooms.#{column} #{direction}")) if table.column_names.include?(column)
|
table
|
||||||
|
end
|
||||||
return table.order(Arel.sql("#{column} #{direction}")) if column == "users.name"
|
|
||||||
|
|
||||||
table
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Determines if a user owns a room.
|
# Determines if a user owns a room.
|
||||||
|
|
|
@ -54,6 +54,7 @@ class User < ApplicationRecord
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
include AuthValues
|
include AuthValues
|
||||||
|
include Queries
|
||||||
|
|
||||||
# Generates a user from omniauth.
|
# Generates a user from omniauth.
|
||||||
def from_omniauth(auth)
|
def from_omniauth(auth)
|
||||||
|
@ -69,48 +70,46 @@ class User < ApplicationRecord
|
||||||
u.save!
|
u.save!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
def self.admins_search(string)
|
def admins_search(string)
|
||||||
return all if string.blank?
|
return all if string.blank?
|
||||||
|
|
||||||
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
|
like = like_text # Get the correct like clause to use based on db adapter
|
||||||
# Postgres requires created_at to be cast to a string
|
|
||||||
created_at_query = if active_database == "postgresql"
|
search_query = "users.name #{like} :search OR email #{like} :search OR username #{like} :search" \
|
||||||
"created_at::text"
|
" OR users.#{created_at_text} #{like} :search OR users.provider #{like} :search" \
|
||||||
else
|
" OR roles.name #{like} :search"
|
||||||
"created_at"
|
|
||||||
|
search_param = "%#{sanitize_sql_like(string)}%"
|
||||||
|
where(search_query, search: search_param)
|
||||||
end
|
end
|
||||||
|
|
||||||
search_query = "users.name LIKE :search OR email LIKE :search OR username LIKE :search" \
|
def admins_order(column, direction)
|
||||||
" OR users.#{created_at_query} LIKE :search OR users.provider LIKE :search" \
|
# Arel.sql to avoid sql injection
|
||||||
" OR roles.name LIKE :search"
|
order(Arel.sql("users.#{column} #{direction}"))
|
||||||
|
end
|
||||||
|
|
||||||
search_param = "%#{sanitize_sql_like(string)}%"
|
def shared_list_search(string)
|
||||||
where(search_query, search: search_param)
|
return all if string.blank?
|
||||||
end
|
|
||||||
|
|
||||||
def self.admins_order(column, direction)
|
like = like_text # Get the correct like clause to use based on db adapter
|
||||||
# Arel.sql to avoid sql injection
|
|
||||||
order(Arel.sql("users.#{column} #{direction}"))
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.shared_list_search(string)
|
search_query = "users.name #{like} :search OR users.uid #{like} :search"
|
||||||
return all if string.blank?
|
|
||||||
|
|
||||||
search_query = "users.name LIKE :search OR users.uid LIKE :search"
|
search_param = "%#{sanitize_sql_like(string)}%"
|
||||||
|
where(search_query, search: search_param)
|
||||||
|
end
|
||||||
|
|
||||||
search_param = "%#{sanitize_sql_like(string)}%"
|
def merge_list_search(string)
|
||||||
where(search_query, search: search_param)
|
return all if string.blank?
|
||||||
end
|
|
||||||
|
|
||||||
def self.merge_list_search(string)
|
like = like_text # Get the correct like clause to use based on db adapter
|
||||||
return all if string.blank?
|
|
||||||
|
|
||||||
search_query = "users.name LIKE :search OR users.email LIKE :search"
|
search_query = "users.name #{like} :search OR users.email #{like} :search"
|
||||||
|
|
||||||
search_param = "%#{sanitize_sql_like(string)}%"
|
search_param = "%#{sanitize_sql_like(string)}%"
|
||||||
where(search_query, search: search_param)
|
where(search_query, search: search_param)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns a list of rooms ordered by last session (with nil rooms last)
|
# Returns a list of rooms ordered by last session (with nil rooms last)
|
||||||
|
|
Loading…
Reference in New Issue