Skip to content

Commit

Permalink
Make all LIKE queries case insensitive (#2402)
Browse files Browse the repository at this point in the history
  • Loading branch information
farhatahmad authored Jan 5, 2021
1 parent 752b192 commit 6be629a
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 52 deletions.
41 changes: 41 additions & 0 deletions app/models/concerns/queries.rb
Original file line number Diff line number Diff line change
@@ -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
41 changes: 19 additions & 22 deletions app/models/room.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,33 @@ class Room < ApplicationRecord

has_one_attached :presentation

def self.admins_search(string)
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
# Postgres requires created_at to be cast to a string
created_at_query = if active_database == "postgresql"
"created_at::text"
else
"created_at"
end
class << self
include Queries

search_query = "rooms.name LIKE :search OR rooms.uid LIKE :search OR users.email LIKE :search" \
" OR users.#{created_at_query} LIKE :search"
def admins_search(string)
like = like_text
search_query = "rooms.name #{like} :search OR rooms.uid #{like} :search OR users.email #{like} :search" \
" OR users.#{created_at_text} #{like} :search"

search_param = "%#{sanitize_sql_like(string)}%"
where(search_query, search: search_param)
end
search_param = "%#{sanitize_sql_like(string)}%"
where(search_query, search: search_param)
end

def self.admins_order(column, direction, running_ids)
# Include the owner of the table
table = joins(:owner)
def admins_order(column, direction, running_ids)
# Include the owner of the table
table = joins(:owner)

# Rely on manual ordering if trying to sort by status
return order_by_status(table, running_ids) if column == "status"
# Rely on manual ordering if trying to sort by status
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("COALESCE(rooms.last_session,rooms.created_at) DESC") if column == "created_at"

return table.order(Arel.sql("rooms.#{column} #{direction}")) if table.column_names.include?(column)
return table.order(Arel.sql("rooms.#{column} #{direction}")) if table.column_names.include?(column)

return table.order(Arel.sql("#{column} #{direction}")) if column == "users.name"
return table.order(Arel.sql("#{column} #{direction}")) if column == "users.name"

table
table
end
end

# Determines if a user owns a room.
Expand Down
59 changes: 29 additions & 30 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class User < ApplicationRecord

class << self
include AuthValues
include Queries

# Generates a user from omniauth.
def from_omniauth(auth)
Expand All @@ -69,48 +70,46 @@ def from_omniauth(auth)
u.save!
end
end
end

def self.admins_search(string)
return all if string.blank?
def admins_search(string)
return all if string.blank?

active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
# Postgres requires created_at to be cast to a string
created_at_query = if active_database == "postgresql"
"created_at::text"
else
"created_at"
like = like_text # Get the correct like clause to use based on db adapter

search_query = "users.name #{like} :search OR email #{like} :search OR username #{like} :search" \
" OR users.#{created_at_text} #{like} :search OR users.provider #{like} :search" \
" OR roles.name #{like} :search"

search_param = "%#{sanitize_sql_like(string)}%"
where(search_query, search: search_param)
end

search_query = "users.name LIKE :search OR email LIKE :search OR username LIKE :search" \
" OR users.#{created_at_query} LIKE :search OR users.provider LIKE :search" \
" OR roles.name LIKE :search"
def admins_order(column, direction)
# Arel.sql to avoid sql injection
order(Arel.sql("users.#{column} #{direction}"))
end

search_param = "%#{sanitize_sql_like(string)}%"
where(search_query, search: search_param)
end
def shared_list_search(string)
return all if string.blank?

def self.admins_order(column, direction)
# Arel.sql to avoid sql injection
order(Arel.sql("users.#{column} #{direction}"))
end
like = like_text # Get the correct like clause to use based on db adapter

def self.shared_list_search(string)
return all if string.blank?
search_query = "users.name #{like} :search OR users.uid #{like} :search"

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)}%"
where(search_query, search: search_param)
end
def merge_list_search(string)
return all if string.blank?

def self.merge_list_search(string)
return all if string.blank?
like = like_text # Get the correct like clause to use based on db adapter

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)}%"
where(search_query, search: search_param)
search_param = "%#{sanitize_sql_like(string)}%"
where(search_query, search: search_param)
end
end

# Returns a list of rooms ordered by last session (with nil rooms last)
Expand Down

0 comments on commit 6be629a

Please sign in to comment.