diff options
author | UbitUmarov | 2019-10-13 18:52:33 +0100 |
---|---|---|
committer | UbitUmarov | 2019-10-13 18:52:33 +0100 |
commit | 5bbaea50e46bda3524f5df929d974883a06dbeaa (patch) | |
tree | ba4d8b3c3252aade2473d59a123aa750fc8f1425 | |
parent | mantis 8598: filter dead groups from group search. honor querystart request. ... (diff) | |
download | opensim-SC-5bbaea50e46bda3524f5df929d974883a06dbeaa.zip opensim-SC-5bbaea50e46bda3524f5df929d974883a06dbeaa.tar.gz opensim-SC-5bbaea50e46bda3524f5df929d974883a06dbeaa.tar.bz2 opensim-SC-5bbaea50e46bda3524f5df929d974883a06dbeaa.tar.xz |
groups v2: remove wrong filters on DB search
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGroupsData.cs | 2 | ||||
-rwxr-xr-x | 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 4e73ee7..77cb2f4 100644 --- a/OpenSim/Data/MySQL/MySQLGroupsData.cs +++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Data.MySQL | |||
90 | else | 90 | else |
91 | pattern = string.Format("Name LIKE '%{0}%'", MySqlHelper.EscapeString(pattern)); | 91 | pattern = string.Format("Name LIKE '%{0}%'", MySqlHelper.EscapeString(pattern)); |
92 | 92 | ||
93 | return m_Groups.Get(string.Format("ShowInList=1 AND ({0}) ORDER BY Name LIMIT 100", pattern)); | 93 | return m_Groups.Get(string.Format("ShowInList=1 AND ({0})", pattern)); |
94 | } | 94 | } |
95 | 95 | ||
96 | public bool DeleteGroup(UUID groupID) | 96 | public bool DeleteGroup(UUID groupID) |
diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs index f398256..04e2f69 100755 --- a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs +++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs | |||
@@ -86,13 +86,13 @@ namespace OpenSim.Data.PGSQL | |||
86 | 86 | ||
87 | if (string.IsNullOrEmpty(pattern)) // True for where clause | 87 | if (string.IsNullOrEmpty(pattern)) // True for where clause |
88 | { | 88 | { |
89 | pattern = " 1 ORDER BY lower(\"Name\") LIMIT 100"; | 89 | pattern = "1"; |
90 | 90 | ||
91 | return m_Groups.Get(pattern); | 91 | return m_Groups.Get(pattern); |
92 | } | 92 | } |
93 | else | 93 | else |
94 | { | 94 | { |
95 | pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100"; | 95 | pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%')"; |
96 | 96 | ||
97 | return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern)); | 97 | return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern)); |
98 | } | 98 | } |