MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and InventoryStore

1 files changed, 11 insertions, 7 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index e7c8dc5..7feec91 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -218,23 +218,27 @@ namespace OpenSim.Data.MSSQL
             if (words.Length > 2)
                 return new UserAccountData[0];
 
+            string sql = "";
+
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand())
             {
                 if (words.Length == 1)
                 {
-                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @search or [LastName] like @search)", m_Realm);
+                    sql = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @search or [LastName] like @search)", m_Realm);
                     cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                     cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
                 }
                 else
                 {
-                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @searchFirst or [LastName] like @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()));
+                    sql = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @searchFirst or [LastName] like @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.Connection = conn;
+                cmd.CommandText = sql;
+                conn.Open();
                 return DoQuery(cmd);
             }
         }