Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

6 files changed, 27 insertions, 3 deletions

diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 6ee5995..906ba6c 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Data
     {
         UserAccountData[] Get(string[] fields, string[] values);
         bool Store(UserAccountData data);
+        bool Delete(string field, string val);
         UserAccountData[] GetUsers(UUID scopeID, string query);
     }
 }
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 4622e23..68e25ef 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -146,6 +146,8 @@ namespace OpenSim.Data
                 {
                     m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
                     m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
+                    cmd.CommandText = "ROLLBACK;";
+                    cmd.ExecuteNonQuery();
                 }
 
                 if (version == 0)
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index fc2c5d5..9eb94e6 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -135,5 +135,26 @@ namespace OpenSim.Data.Null
             return result;
         }
 
+        public bool Delete(string field, string val)
+        {
+            // Only delete by PrincipalID
+            if (field.Equals("PrincipalID"))
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(val, out uuid) && m_DataByUUID.ContainsKey(uuid))
+                {
+                    UserAccountData account = m_DataByUUID[uuid];
+                    m_DataByUUID.Remove(uuid);
+                    if (m_DataByName.ContainsKey(account.FirstName + " " + account.LastName))
+                        m_DataByName.Remove(account.FirstName + " " + account.LastName);
+                    if (account.Data.ContainsKey("Email") && account.Data["Email"] != string.Empty && m_DataByEmail.ContainsKey(account.Data["Email"]))
+                        m_DataByEmail.Remove(account.Data["Email"]);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Data/SQLite/Resources/001_UserAccount.sql b/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
index f9bf24c..c38d9a7 100644
--- a/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
+++ b/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
@@ -2,7 +2,7 @@
 
 -- useraccounts table
 CREATE TABLE UserAccounts (
-    PrincipalID CHAR(36) NOT NULL,
+    PrincipalID CHAR(36)  primary key,
     ScopeID CHAR(36) NOT NULL,
     FirstName VARCHAR(64) NOT NULL,
     LastName VARCHAR(64) NOT NULL,
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 2c28375..aa10734 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Data.SQLite
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now, 'localtime', '+" + lifetime.ToString() + 
+            SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
                 " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')");
 
             if (ExecuteNonQuery(cmd, m_Connection) > 0)
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index 50e8c23..67cf716 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite
 
             if (words.Length == 1)
             {
-                cmd.CommandText = String.Format("select * from {0} where ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
                     m_Realm, scopeID.ToString(), words[0]);
             }
             else