From 5bbaea50e46bda3524f5df929d974883a06dbeaa Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 13 Oct 2019 18:52:33 +0100 Subject: [PATCH] groups v2: remove wrong filters on DB search --- OpenSim/Data/MySQL/MySQLGroupsData.cs | 2 +- OpenSim/Data/PGSQL/PGSQLGroupsData.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs index 4e73ee7186..77cb2f4db4 100644 --- a/OpenSim/Data/MySQL/MySQLGroupsData.cs +++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs @@ -90,7 +90,7 @@ namespace OpenSim.Data.MySQL else pattern = string.Format("Name LIKE '%{0}%'", MySqlHelper.EscapeString(pattern)); - return m_Groups.Get(string.Format("ShowInList=1 AND ({0}) ORDER BY Name LIMIT 100", pattern)); + return m_Groups.Get(string.Format("ShowInList=1 AND ({0})", pattern)); } public bool DeleteGroup(UUID groupID) diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs index f398256863..04e2f69cd0 100755 --- a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs +++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs @@ -86,13 +86,13 @@ namespace OpenSim.Data.PGSQL if (string.IsNullOrEmpty(pattern)) // True for where clause { - pattern = " 1 ORDER BY lower(\"Name\") LIMIT 100"; + pattern = "1"; return m_Groups.Get(pattern); } else { - pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100"; + pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%')"; return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern)); }