Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

1 files changed, 39 insertions, 43 deletions

diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index cf8139a..50e8c23 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -26,60 +26,56 @@
  */
 
 using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
 
-namespace OpenSim.Data.MySQL.Tests
+namespace OpenSim.Data.SQLite
 {
-    [TestFixture, DatabaseTest]
-    public class MySQLUserTest : BasicUserTest
+    public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public MySQLManager database;
-        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-        
-        [TestFixtureSetUp]
-        public void Init()
+        public SQLiteUserAccountData(string connectionString, string realm)
+                : base(connectionString, realm, "UserAccount")
         {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                database = new MySQLManager(connect);
-                db = new MySQLUserData();
-                db.Initialise(connect);
-            } 
-            catch (Exception e)
-            {
-                m_log.Error("Exception {0}", e);
-                Assert.Ignore();
-            }
         }
 
-        [TestFixtureTearDown]
-        public void Cleanup()
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
         {
-            if (db != null)
+            string[] words = query.Split(new char[] {' '});
+
+            for (int i = 0 ; i < words.Length ; i++)
             {
-                db.Dispose();
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
             }
-            // if a new table is added, it has to be dropped here
-            if (database != null)
+
+            if (words.Length == 0)
+                return new UserAccountData[0];
+
+            if (words.Length > 2)
+                return new UserAccountData[0];
+
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (words.Length == 1)
             {
-                database.ExecuteSql("drop table migrations");
-                database.ExecuteSql("drop table users");
-                database.ExecuteSql("drop table userfriends");
-                database.ExecuteSql("drop table agents");
-                database.ExecuteSql("drop table avatarappearance");
-                database.ExecuteSql("drop table avatarattachments");
+                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
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    m_Realm, scopeID.ToString(), words[0], words[1]);
+            }
+
+            return DoQuery(cmd);
         }
     }
 }