OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Give the new user tables the once-over. Strip the current set of methods 

from IUserAccountService, we need to define what goes in there. Change
the handler to the generic handler. Adjust migrations, add index
slimupdates
Melanie 2009-12-29 18:31:27 +00:00
parent e9df86a6d6
commit 18ca978b81
5 changed files with 20 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/IUserAccountData.cs
View File

@ -36,6 +36,8 @@ namespace OpenSim.Data
{ {
public UUID PrincipalID; public UUID PrincipalID;
public UUID ScopeID; public UUID ScopeID;
public string FirstName;
public string LastName;
public Dictionary<string, object> Data; public Dictionary<string, object> Data;
} }
@ -44,12 +46,6 @@ namespace OpenSim.Data
/// </summary> /// </summary>
public interface IUserAccountData public interface IUserAccountData
{ {
UserAccountData Get(UUID principalID, UUID ScopeID);
List<UserAccountData> Query(UUID principalID, UUID ScopeID, string query);
bool Store(UserAccountData data); bool Store(UserAccountData data);
bool SetDataItem(UUID principalID, string item, string value);
} }
} }

139
OpenSim/Data/MySQL/MySQLUserAccountData.cs
View File

@ -35,146 +35,11 @@ using MySql.Data.MySqlClient;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
{ {
public class MySqlUserAccountData : MySqlFramework, IUserAccountData public class MySqlUserAccountData : MySQLGenericTableHandler<UserAccountData>, IUserAccountData
{ {
private string m_Realm;
private List<string> m_ColumnNames = null;
// private int m_LastExpire = 0;
public MySqlUserAccountData(string connectionString, string realm) public MySqlUserAccountData(string connectionString, string realm)
: base(connectionString) : base(connectionString, realm, "UserAccount")
{ {
m_Realm = realm;
Migration m = new Migration(m_Connection, GetType().Assembly, "UserStore");
m.Update();
}
public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
{
return null;
}
public UserAccountData Get(UUID principalID, UUID scopeID)
{
UserAccountData ret = new UserAccountData();
ret.Data = new Dictionary<string, object>();
string command = "select * from `"+m_Realm+"` where UUID = ?principalID";
if (scopeID != UUID.Zero)
command += " and ScopeID = ?scopeID";
MySqlCommand cmd = new MySqlCommand(command);
cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
IDataReader result = ExecuteReader(cmd);
if (result.Read())
{
ret.PrincipalID = principalID;
UUID scope;
UUID.TryParse(result["ScopeID"].ToString(), out scope);
ret.ScopeID = scope;
if (m_ColumnNames == null)
{
m_ColumnNames = new List<string>();
DataTable schemaTable = result.GetSchemaTable();
foreach (DataRow row in schemaTable.Rows)
m_ColumnNames.Add(row["ColumnName"].ToString());
}
foreach (string s in m_ColumnNames)
{
if (s == "UUID")
continue;
if (s == "ScopeID")
continue;
ret.Data[s] = result[s].ToString();
}
result.Close();
CloseReaderCommand(cmd);
return ret;
}
result.Close();
CloseReaderCommand(cmd);
return null;
}
public bool Store(UserAccountData data)
{
if (data.Data.ContainsKey("UUID"))
data.Data.Remove("UUID");
if (data.Data.ContainsKey("ScopeID"))
data.Data.Remove("ScopeID");
string[] fields = new List<string>(data.Data.Keys).ToArray();
MySqlCommand cmd = new MySqlCommand();
string update = "update `"+m_Realm+"` set ";
bool first = true;
foreach (string field in fields)
{
if (!first)
update += ", ";
update += "`" + field + "` = ?"+field;
first = false;
cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
}
update += " where UUID = ?principalID";
if (data.ScopeID != UUID.Zero)
update += " and ScopeID = ?scopeID";
cmd.CommandText = update;
cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
if (ExecuteNonQuery(cmd) < 1)
{
string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
String.Join("`, `", fields) +
"`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
cmd.CommandText = insert;
if (ExecuteNonQuery(cmd) < 1)
{
cmd.Dispose();
return false;
}
}
cmd.Dispose();
return true;
}
public bool SetDataItem(UUID principalID, string item, string value)
{
MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
"` set `" + item + "` = ?" + item + " where UUID = ?UUID");
cmd.Parameters.AddWithValue("?"+item, value);
cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
if (ExecuteNonQuery(cmd) > 0)
return true;
return false;
} }
} }
} }

4
OpenSim/Data/MySQL/Resources/001_UserAccount.sql
View File

@ -1,7 +1,7 @@
BEGIN; BEGIN;
CREATE TABLE `useraccount` ( CREATE TABLE `UserAccounts` (
`UserID` CHAR(36) NOT NULL, `PrincipalID` CHAR(36) NOT NULL,
`ScopeID` CHAR(36) NOT NULL, `ScopeID` CHAR(36) NOT NULL,
`FirstName` VARCHAR(64) NOT NULL, `FirstName` VARCHAR(64) NOT NULL,
`LastName` VARCHAR(64) NOT NULL, `LastName` VARCHAR(64) NOT NULL,

5
OpenSim/Data/MySQL/Resources/002_UserAccount.sql Normal file
View File

@ -0,0 +1,5 @@
BEGIN;
INSERT INTO UserAccounts (UserID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT `UUID` AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, username AS FirstName, lastname AS LastName, email as Email, CONCAT('AssetServerURI=', userAssetURI, ' InventoryServerURI=', userInventoryURI, ' GatewayURI= HomeURI=') AS ServiceURLs, created as Created FROM users;
COMMIT;

9
OpenSim/Data/MySQL/Resources/003_UserAccount.sql Normal file
View File

@ -0,0 +1,9 @@
BEGIN;
CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
CREATE INDEX Email ON UserAccounts(Email);
CREATE INDEX FirstName ON UserAccounts(FirstName);
CREATE INDEX LastName ON UserAccounts(LastName);
CREATE INDEX Name ON UserAccounts(FirstName,LastName);
COMMIT;