From 7665aad002ef066fc31fa9497225d2668641c769 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 22 Feb 2010 13:27:17 -0800 Subject: * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it --- OpenSim/Data/MSSQL/MSSQLAssetData.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim/Data/MSSQL/MSSQLAssetData.cs') diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 1ce4abf..ee149ce 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -135,7 +135,8 @@ namespace OpenSim.Data.MSSQL AssetBase asset = new AssetBase( new UUID((Guid)reader["id"]), (string)reader["name"], - Convert.ToSByte(reader["assetType"]) + Convert.ToSByte(reader["assetType"]), + UUID.Zero ); // Region Main asset.Description = (string)reader["description"]; -- cgit v1.1 From df76e95aa2dc9f3f3a0c546761b7624adc183ed0 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Mon, 22 Feb 2010 14:18:59 -0800 Subject: Changed asset CreatorID to a string --- OpenSim/Data/MSSQL/MSSQLAssetData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Data/MSSQL/MSSQLAssetData.cs') diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index ee149ce..437c09c 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -136,7 +136,7 @@ namespace OpenSim.Data.MSSQL new UUID((Guid)reader["id"]), (string)reader["name"], Convert.ToSByte(reader["assetType"]), - UUID.Zero + UUID.Zero.ToString() ); // Region Main asset.Description = (string)reader["description"]; -- cgit v1.1 From 2fa5694ec9857f208b6fe4d0890fd2ab8ac1b8bf Mon Sep 17 00:00:00 2001 From: StrawberryFride Date: Wed, 24 Feb 2010 16:42:39 +0000 Subject: MSSQL Additions for Presence Refactor branch. Most functionality tested and works, some outstanding issues around login location and border crossings on y axis. Signed-off-by: Melanie --- OpenSim/Data/MSSQL/MSSQLAssetData.cs | 54 +++++++++++++++--------------------- 1 file changed, 22 insertions(+), 32 deletions(-) (limited to 'OpenSim/Data/MSSQL/MSSQLAssetData.cs') diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 437c09c..b1faf0b 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -49,6 +49,7 @@ namespace OpenSim.Data.MSSQL /// Database manager /// private MSSQLManager m_database; + private string m_connectionString; #region IPlugin Members @@ -75,23 +76,8 @@ namespace OpenSim.Data.MSSQL { m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks; - if (!string.IsNullOrEmpty(connectionString)) - { - m_database = new MSSQLManager(connectionString); - } - else - { - IniFile gridDataMSSqlFile = new IniFile("mssql_connection.ini"); - string settingDataSource = gridDataMSSqlFile.ParseFileReadValue("data_source"); - string settingInitialCatalog = gridDataMSSqlFile.ParseFileReadValue("initial_catalog"); - string settingPersistSecurityInfo = gridDataMSSqlFile.ParseFileReadValue("persist_security_info"); - string settingUserId = gridDataMSSqlFile.ParseFileReadValue("user_id"); - string settingPassword = gridDataMSSqlFile.ParseFileReadValue("password"); - - m_database = - new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId, - settingPassword); - } + m_database = new MSSQLManager(connectionString); + m_connectionString = connectionString; //New migration to check for DB changes m_database.CheckMigration(_migrationStore); @@ -125,18 +111,19 @@ namespace OpenSim.Data.MSSQL override public AssetBase GetAsset(UUID assetID) { string sql = "SELECT * FROM assets WHERE id = @id"; - using (AutoClosingSqlCommand command = m_database.Query(sql)) + using (SqlConnection conn = new SqlConnection(m_connectionString)) + using (SqlCommand cmd = new SqlCommand(sql, conn)) { - command.Parameters.Add(m_database.CreateParameter("id", assetID)); - using (SqlDataReader reader = command.ExecuteReader()) + cmd.Parameters.Add(m_database.CreateParameter("id", assetID)); + conn.Open(); + using (SqlDataReader reader = cmd.ExecuteReader()) { if (reader.Read()) { AssetBase asset = new AssetBase( new UUID((Guid)reader["id"]), (string)reader["name"], - Convert.ToSByte(reader["assetType"]), - UUID.Zero.ToString() + Convert.ToSByte(reader["assetType"]) ); // Region Main asset.Description = (string)reader["description"]; @@ -191,7 +178,8 @@ namespace OpenSim.Data.MSSQL m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add"); } - using (AutoClosingSqlCommand command = m_database.Query(sql)) + using (SqlConnection conn = new SqlConnection(m_connectionString)) + using (SqlCommand command = new SqlCommand(sql, conn)) { int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000); command.Parameters.Add(m_database.CreateParameter("id", asset.FullID)); @@ -203,7 +191,7 @@ namespace OpenSim.Data.MSSQL command.Parameters.Add(m_database.CreateParameter("access_time", now)); command.Parameters.Add(m_database.CreateParameter("create_time", now)); command.Parameters.Add(m_database.CreateParameter("data", asset.Data)); - + conn.Open(); try { command.ExecuteNonQuery(); @@ -239,7 +227,8 @@ namespace OpenSim.Data.MSSQL m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on update"); } - using (AutoClosingSqlCommand command = m_database.Query(sql)) + using (SqlConnection conn = new SqlConnection(m_connectionString)) + using (SqlCommand command = new SqlCommand(sql, conn)) { command.Parameters.Add(m_database.CreateParameter("id", asset.FullID)); command.Parameters.Add(m_database.CreateParameter("name", assetName)); @@ -249,7 +238,7 @@ namespace OpenSim.Data.MSSQL command.Parameters.Add(m_database.CreateParameter("temporary", asset.Temporary)); command.Parameters.Add(m_database.CreateParameter("data", asset.Data)); command.Parameters.Add(m_database.CreateParameter("@keyId", asset.FullID)); - + conn.Open(); try { command.ExecuteNonQuery(); @@ -308,13 +297,14 @@ namespace OpenSim.Data.MSSQL string sql = @"SELECT (name,description,assetType,temporary,id), Row = ROW_NUMBER() OVER (ORDER BY (some column to order by)) WHERE Row >= @Start AND Row < @Start + @Count"; - - using (AutoClosingSqlCommand command = m_database.Query(sql)) - { - command.Parameters.Add(m_database.CreateParameter("start", start)); - command.Parameters.Add(m_database.CreateParameter("count", count)); - using (SqlDataReader reader = command.ExecuteReader()) + using (SqlConnection conn = new SqlConnection(m_connectionString)) + using (SqlCommand cmd = new SqlCommand(sql, conn)) + { + cmd.Parameters.Add(m_database.CreateParameter("start", start)); + cmd.Parameters.Add(m_database.CreateParameter("count", count)); + conn.Open(); + using (SqlDataReader reader = cmd.ExecuteReader()) { while (reader.Read()) { -- cgit v1.1 From 92029dc171b466f4bdaf0a882426f4202f3e6162 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 24 Feb 2010 16:00:06 +0000 Subject: Remove some obsolete files from MSSQL. Fix a missing constructor arg that was introdiced by the latest jhurlipatch --- OpenSim/Data/MSSQL/MSSQLAssetData.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim/Data/MSSQL/MSSQLAssetData.cs') diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index b1faf0b..d6ea262 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -123,7 +123,8 @@ namespace OpenSim.Data.MSSQL AssetBase asset = new AssetBase( new UUID((Guid)reader["id"]), (string)reader["name"], - Convert.ToSByte(reader["assetType"]) + Convert.ToSByte(reader["assetType"]), + String.Empty ); // Region Main asset.Description = (string)reader["description"]; -- cgit v1.1