Use ILIKE where applicable
This commit is contained in:
@@ -61,7 +61,7 @@ namespace OpenSim.Data.PGSQL
|
||||
|
||||
public GridUserData[] GetAll(string userID)
|
||||
{
|
||||
return base.Get(String.Format("\"UserID\" LIKE '{0}%'", userID));
|
||||
return base.Get(String.Format("\"UserID\" ILIKE '{0}%'", userID));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace OpenSim.Data.PGSQL
|
||||
}
|
||||
else
|
||||
{
|
||||
pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%')";
|
||||
pattern = " \"ShowInList\" = 1 AND \"Name\" ILIKE '%" + pattern + "%'";
|
||||
|
||||
return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern));
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace OpenSim.Data.PGSQL
|
||||
|
||||
public List<RegionData> Get(string regionName, UUID scopeID)
|
||||
{
|
||||
string sql = "select * from "+m_Realm+" where lower(\"regionName\") like lower(:regionName) ";
|
||||
string sql = "select * from "+m_Realm+" where \"regionName\" ILIKE :regionName ";
|
||||
if (!scopeID.IsZero())
|
||||
sql += " and \"ScopeID\" = :scopeID";
|
||||
sql += " order by lower(\"regionName\")";
|
||||
|
||||
@@ -298,14 +298,14 @@ namespace OpenSim.Data.PGSQL
|
||||
{
|
||||
if (words.Length == 1)
|
||||
{
|
||||
sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (LOWER(""FirstName"" COLLATE ""en_US.utf8"") like LOWER(:search) or LOWER(""LastName"" COLLATE ""en_US.utf8"") like LOWER(:search))", m_Realm);
|
||||
sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" COLLATE ""en_US.utf8"" ILIKE :search or ""LastName"" COLLATE ""en_US.utf8"" ILIKE :search)", m_Realm);
|
||||
cmd.Parameters.Add(m_database.CreateParameter("ScopeID", scopeID));
|
||||
cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", UUID.Zero));
|
||||
cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%"));
|
||||
}
|
||||
else
|
||||
{
|
||||
sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (LOWER(""FirstName"" COLLATE ""en_US.utf8"") like LOWER(:searchFirst) or LOWER(""LastName"" COLLATE ""en_US.utf8"") like LOWER(:searchLast))", m_Realm);
|
||||
sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" COLLATE ""en_US.utf8"" ILIKE :searchFirst or ""LastName"" COLLATE ""en_US.utf8"" ILIKE :searchLast)", m_Realm);
|
||||
cmd.Parameters.Add(m_database.CreateParameter("searchFirst", "%" + words[0] + "%"));
|
||||
cmd.Parameters.Add(m_database.CreateParameter("searchLast", "%" + words[1] + "%"));
|
||||
cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", UUID.Zero));
|
||||
|
||||
Reference in New Issue
Block a user