aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MSSQL
diff options
context:
space:
mode:
authorlbsa712008-03-28 14:54:20 +0000
committerlbsa712008-03-28 14:54:20 +0000
commit8c901e93474af5fcd17a7f37acd711622c5286e0 (patch)
tree732b8db3dd2480d7cdeed49f4d086194e529ba6f /OpenSim/Framework/Data.MSSQL
parentApplied patch from mantis# 825, thanks A_Biondi (diff)
downloadopensim-SC-8c901e93474af5fcd17a7f37acd711622c5286e0.zip
opensim-SC-8c901e93474af5fcd17a7f37acd711622c5286e0.tar.gz
opensim-SC-8c901e93474af5fcd17a7f37acd711622c5286e0.tar.bz2
opensim-SC-8c901e93474af5fcd17a7f37acd711622c5286e0.tar.xz
* Introduced common abstract AssetDataBase implementing IAssetProvider
* changed the semantics of SQLiteBase to SQLiteUtils * Added abstract placeholder files for the other db providers
Diffstat (limited to 'OpenSim/Framework/Data.MSSQL')
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
index b8d57a7..059bb5e 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Framework.Data.MSSQL
36{ 36{
37 internal class MSSQLAssetData : IAssetProvider 37 internal class MSSQLAssetData : AssetDataBase
38 { 38 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
40 40
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Data.MSSQL
66 UpgradeAssetsTable(tableList["assets"]); 66 UpgradeAssetsTable(tableList["assets"]);
67 } 67 }
68 68
69 public AssetBase FetchAsset(LLUUID assetID) 69 override public AssetBase FetchAsset(LLUUID assetID)
70 { 70 {
71 AssetBase asset = null; 71 AssetBase asset = null;
72 72
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Data.MSSQL
83 return asset; 83 return asset;
84 } 84 }
85 85
86 public void CreateAsset(AssetBase asset) 86 override public void CreateAsset(AssetBase asset)
87 { 87 {
88 if (ExistsAsset((LLUUID) asset.FullID)) 88 if (ExistsAsset((LLUUID) asset.FullID))
89 { 89 {
@@ -129,7 +129,7 @@ namespace OpenSim.Framework.Data.MSSQL
129 } 129 }
130 130
131 131
132 public void UpdateAsset(AssetBase asset) 132 override public void UpdateAsset(AssetBase asset)
133 { 133 {
134 SqlCommand command = new SqlCommand("UPDATE assets set id = @id, " + 134 SqlCommand command = new SqlCommand("UPDATE assets set id = @id, " +
135 "name = @name, " + 135 "name = @name, " +
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Data.MSSQL
169 } 169 }
170 } 170 }
171 171
172 public bool ExistsAsset(LLUUID uuid) 172 override public bool ExistsAsset(LLUUID uuid)
173 { 173 {
174 if (FetchAsset(uuid) != null) 174 if (FetchAsset(uuid) != null)
175 { 175 {
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Data.MSSQL
181 /// <summary> 181 /// <summary>
182 /// All writes are immediately commited to the database, so this is a no-op 182 /// All writes are immediately commited to the database, so this is a no-op
183 /// </summary> 183 /// </summary>
184 public void CommitAssets() 184 override public void CommitAssets()
185 { 185 {
186 } 186 }
187 187
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Data.MSSQL
189 189
190 #region IPlugin Members 190 #region IPlugin Members
191 191
192 public void Initialise() 192 override public void Initialise()
193 { 193 {
194 IniFile GridDataMySqlFile = new IniFile("mssql_connection.ini"); 194 IniFile GridDataMySqlFile = new IniFile("mssql_connection.ini");
195 string settingDataSource = GridDataMySqlFile.ParseFileReadValue("data_source"); 195 string settingDataSource = GridDataMySqlFile.ParseFileReadValue("data_source");
@@ -205,13 +205,13 @@ namespace OpenSim.Framework.Data.MSSQL
205 TestTables(); 205 TestTables();
206 } 206 }
207 207
208 public string Version 208 override public string Version
209 { 209 {
210// get { return database.getVersion(); } 210// get { return database.getVersion(); }
211 get { return database.getVersion(); } 211 get { return database.getVersion(); }
212 } 212 }
213 213
214 public string Name 214 override public string Name
215 { 215 {
216 get { return "MSSQL Asset storage engine"; } 216 get { return "MSSQL Asset storage engine"; }
217 } 217 }