From 94250b6836ab76376b6db8848f8f7db63a519847 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 16 Oct 2014 17:53:45 -0400 Subject: Fix some typecasting in PgSQL Groups adapter --- OpenSim/Data/PGSQL/PGSQLUserAccountData.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs index 00f01cb..0a68b23 100644 --- a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs +++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs @@ -298,22 +298,26 @@ namespace OpenSim.Data.PGSQL return new UserAccountData[0]; string sql = ""; + UUID scope_id; + UUID.TryParse(scopeID.ToString(), out scope_id); using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString)) using (NpgsqlCommand cmd = new NpgsqlCommand()) { if (words.Length == 1) { - sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm); - cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID)); + sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm); + cmd.Parameters.Add(m_database.CreateParameter("scopeID", (UUID)scope_id)); + cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", (UUID)UUID.Zero)); cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%")); } else { - sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :searchFirst or ""LastName"" ilike :searchLast)", m_Realm); + sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" ilike :searchFirst or ""LastName"" 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("ScopeID", scopeID.ToString())); + cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", (UUID)UUID.Zero)); + cmd.Parameters.Add(m_database.CreateParameter("ScopeID", (UUID)scope_id)); } cmd.Connection = conn; cmd.CommandText = sql; -- cgit v1.1