ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Moved insertRegionRow into MSSQLGridData

Browse Source 
* Split table test and creation into table by table
* Debugged table creation Sql
* Added missing CreateUserFriendsTable.sql
This commit is contained in:
lbsa71
2008-02-13 20:08:46 +00:00
parent d9e01bf453
commit 15c6788dc7
5 changed files with 193 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
View File

@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// <summary>
/// A database interface class to a user profile storage system
/// </summary>
internal class MSSQLUserData : IUserData
public class MSSQLUserData : IUserData
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -86,37 +86,41 @@ namespace OpenSim.Framework.Data.MSSQL
new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
settingPassword);
if (!TestTables())
{
database.ExecuteResourceSql("Mssql-agents.sql");
database.ExecuteResourceSql("Mssql-users.sql");
database.ExecuteResourceSql("Mssql-userfriends.sql");
}
TestTables();
}
private bool TestTables()
{
IDbCommand cmd = database.Query("select top 1 webLoginKey from "+m_usersTableName, new Dictionary<string, string>());
IDbCommand cmd;
cmd = database.Query("select top 1 * from " + m_usersTableName, new Dictionary<string, string>());
try
{
cmd.ExecuteNonQuery();
cmd.Dispose();
}
catch
{
database.Query("alter table "+m_usersTableName+" add column [webLoginKey] varchar(36) default NULL", new Dictionary<string, string>());
database.ExecuteResourceSql("Mssql-users.sql");
}
cmd = database.Query("select top 1 * from " + m_agentsTableName, new Dictionary<string, string>());
try
{
cmd.ExecuteNonQuery();
cmd.Dispose();
}
catch
{
database.ExecuteResourceSql("Mssql-agents.sql");
}
cmd = database.Query("select top 1 * from "+m_usersTableName, new Dictionary<string, string>());
cmd = database.Query("select top 1 * from " + m_userFriendsTableName, new Dictionary<string, string>());
try
{
cmd.ExecuteNonQuery();
}
catch
{
return false;
database.ExecuteResourceSql("CreateUserFriendsTable.sql");
}
return true;
@@ -180,6 +184,7 @@ namespace OpenSim.Framework.Data.MSSQL
"VALUES " +
"(@ownerID,@friendID,@friendPerms,@datetimestamp)",
param);
adder.ExecuteNonQuery();
adder =