diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLInventoryData.cs (renamed from OpenSim/Data/MSSQL/MSSQLInventoryData.cs) | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs index 961593f..c999433 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs | |||
@@ -28,18 +28,18 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using log4net; | 32 | using log4net; |
34 | using OpenMetaverse; | 33 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using Npgsql; | ||
36 | 36 | ||
37 | namespace OpenSim.Data.MSSQL | 37 | namespace OpenSim.Data.PGSQL |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// A MSSQL interface for the inventory server | 40 | /// A PGSQL interface for the inventory server |
41 | /// </summary> | 41 | /// </summary> |
42 | public class MSSQLInventoryData : IInventoryDataPlugin | 42 | public class PGSQLInventoryData : IInventoryDataPlugin |
43 | { | 43 | { |
44 | private const string _migrationStore = "InventoryStore"; | 44 | private const string _migrationStore = "InventoryStore"; |
45 | 45 | ||
@@ -48,7 +48,7 @@ namespace OpenSim.Data.MSSQL | |||
48 | /// <summary> | 48 | /// <summary> |
49 | /// The database manager | 49 | /// The database manager |
50 | /// </summary> | 50 | /// </summary> |
51 | private MSSQLManager database; | 51 | private PGSQLManager database; |
52 | private string m_connectionString; | 52 | private string m_connectionString; |
53 | 53 | ||
54 | #region IPlugin members | 54 | #region IPlugin members |
@@ -56,19 +56,19 @@ namespace OpenSim.Data.MSSQL | |||
56 | [Obsolete("Cannot be default-initialized!")] | 56 | [Obsolete("Cannot be default-initialized!")] |
57 | public void Initialise() | 57 | public void Initialise() |
58 | { | 58 | { |
59 | m_log.Info("[MSSQLInventoryData]: " + Name + " cannot be default-initialized!"); | 59 | m_log.Info("[PGSQLInventoryData]: " + Name + " cannot be default-initialized!"); |
60 | throw new PluginNotInitialisedException(Name); | 60 | throw new PluginNotInitialisedException(Name); |
61 | } | 61 | } |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// Loads and initialises the MSSQL inventory storage interface | 64 | /// Loads and initialises the PGSQL inventory storage interface |
65 | /// </summary> | 65 | /// </summary> |
66 | /// <param name="connectionString">connect string</param> | 66 | /// <param name="connectionString">connect string</param> |
67 | /// <remarks>use mssql_connection.ini</remarks> | 67 | /// <remarks>use PGSQL_connection.ini</remarks> |
68 | public void Initialise(string connectionString) | 68 | public void Initialise(string connectionString) |
69 | { | 69 | { |
70 | m_connectionString = connectionString; | 70 | m_connectionString = connectionString; |
71 | database = new MSSQLManager(connectionString); | 71 | database = new PGSQLManager(connectionString); |
72 | 72 | ||
73 | //New migrations check of store | 73 | //New migrations check of store |
74 | database.CheckMigration(_migrationStore); | 74 | database.CheckMigration(_migrationStore); |
@@ -80,7 +80,7 @@ namespace OpenSim.Data.MSSQL | |||
80 | /// <returns>A string containing the name of the DB provider</returns> | 80 | /// <returns>A string containing the name of the DB provider</returns> |
81 | public string Name | 81 | public string Name |
82 | { | 82 | { |
83 | get { return "MSSQL Inventory Data Interface"; } | 83 | get { return "PGSQL Inventory Data Interface"; } |
84 | } | 84 | } |
85 | 85 | ||
86 | /// <summary> | 86 | /// <summary> |
@@ -158,13 +158,13 @@ namespace OpenSim.Data.MSSQL | |||
158 | /// <returns>A folder class</returns> | 158 | /// <returns>A folder class</returns> |
159 | public InventoryFolderBase getInventoryFolder(UUID folderID) | 159 | public InventoryFolderBase getInventoryFolder(UUID folderID) |
160 | { | 160 | { |
161 | string sql = "SELECT * FROM inventoryfolders WHERE folderID = @folderID"; | 161 | string sql = "SELECT * FROM inventoryfolders WHERE \"folderID\" = :folderID"; |
162 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 162 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
163 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 163 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
164 | { | 164 | { |
165 | cmd.Parameters.Add(database.CreateParameter("folderID", folderID)); | 165 | cmd.Parameters.Add(database.CreateParameter("folderID", folderID)); |
166 | conn.Open(); | 166 | conn.Open(); |
167 | using (SqlDataReader reader = cmd.ExecuteReader()) | 167 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) |
168 | { | 168 | { |
169 | if (reader.Read()) | 169 | if (reader.Read()) |
170 | { | 170 | { |
@@ -200,11 +200,11 @@ namespace OpenSim.Data.MSSQL | |||
200 | if (parentID == UUID.Zero) | 200 | if (parentID == UUID.Zero) |
201 | return folders; | 201 | return folders; |
202 | 202 | ||
203 | string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID"; | 203 | string sql = "SELECT * FROM inventoryfolders WHERE \"parentFolderID\" = :parentID"; |
204 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 204 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
205 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 205 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
206 | { | 206 | { |
207 | cmd.Parameters.Add(database.CreateParameter("@parentID", parentID)); | 207 | cmd.Parameters.Add(database.CreateParameter("parentID", parentID)); |
208 | conn.Open(); | 208 | conn.Open(); |
209 | folders.AddRange(getInventoryFolders(cmd)); | 209 | folders.AddRange(getInventoryFolders(cmd)); |
210 | 210 | ||
@@ -228,8 +228,8 @@ namespace OpenSim.Data.MSSQL | |||
228 | /// <param name="folder">Folder to create</param> | 228 | /// <param name="folder">Folder to create</param> |
229 | public void addInventoryFolder(InventoryFolderBase folder) | 229 | public void addInventoryFolder(InventoryFolderBase folder) |
230 | { | 230 | { |
231 | string sql = @"INSERT INTO inventoryfolders ([folderID], [agentID], [parentFolderID], [folderName], [type], [version]) | 231 | string sql = "INSERT INTO inventoryfolders (\"folderID\", \"agentID\", \"parentFolderID\", \"folderName\", type, version) " + |
232 | VALUES (@folderID, @agentID, @parentFolderID, @folderName, @type, @version);"; | 232 | " VALUES (:folderID, :agentID, :parentFolderID, :folderName, :type, :version);"; |
233 | 233 | ||
234 | string folderName = folder.Name; | 234 | string folderName = folder.Name; |
235 | if (folderName.Length > 64) | 235 | if (folderName.Length > 64) |
@@ -237,8 +237,8 @@ namespace OpenSim.Data.MSSQL | |||
237 | folderName = folderName.Substring(0, 64); | 237 | folderName = folderName.Substring(0, 64); |
238 | m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add"); | 238 | m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add"); |
239 | } | 239 | } |
240 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 240 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
241 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 241 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
242 | { | 242 | { |
243 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); | 243 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); |
244 | cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner)); | 244 | cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner)); |
@@ -264,12 +264,12 @@ namespace OpenSim.Data.MSSQL | |||
264 | /// <param name="folder">Folder to update</param> | 264 | /// <param name="folder">Folder to update</param> |
265 | public void updateInventoryFolder(InventoryFolderBase folder) | 265 | public void updateInventoryFolder(InventoryFolderBase folder) |
266 | { | 266 | { |
267 | string sql = @"UPDATE inventoryfolders SET agentID = @agentID, | 267 | string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID, |
268 | parentFolderID = @parentFolderID, | 268 | ""parentFolderID"" = :parentFolderID, |
269 | folderName = @folderName, | 269 | ""folderName"" = :folderName, |
270 | type = @type, | 270 | type = :type, |
271 | version = @version | 271 | version = :version |
272 | WHERE folderID = @folderID"; | 272 | WHERE folderID = :folderID"; |
273 | 273 | ||
274 | string folderName = folder.Name; | 274 | string folderName = folder.Name; |
275 | if (folderName.Length > 64) | 275 | if (folderName.Length > 64) |
@@ -277,8 +277,8 @@ namespace OpenSim.Data.MSSQL | |||
277 | folderName = folderName.Substring(0, 64); | 277 | folderName = folderName.Substring(0, 64); |
278 | m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update"); | 278 | m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update"); |
279 | } | 279 | } |
280 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 280 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
281 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 281 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
282 | { | 282 | { |
283 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); | 283 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); |
284 | cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner)); | 284 | cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner)); |
@@ -304,9 +304,9 @@ namespace OpenSim.Data.MSSQL | |||
304 | /// <param name="folder">Folder to update</param> | 304 | /// <param name="folder">Folder to update</param> |
305 | public void moveInventoryFolder(InventoryFolderBase folder) | 305 | public void moveInventoryFolder(InventoryFolderBase folder) |
306 | { | 306 | { |
307 | string sql = @"UPDATE inventoryfolders SET parentFolderID = @parentFolderID WHERE folderID = @folderID"; | 307 | string sql = @"UPDATE inventoryfolders SET ""parentFolderID"" = :parentFolderID WHERE ""folderID"" = :folderID"; |
308 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 308 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
309 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 309 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
310 | { | 310 | { |
311 | cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID)); | 311 | cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID)); |
312 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); | 312 | cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID)); |
@@ -328,13 +328,13 @@ namespace OpenSim.Data.MSSQL | |||
328 | /// <param name="folderID">Id of folder to delete</param> | 328 | /// <param name="folderID">Id of folder to delete</param> |
329 | public void deleteInventoryFolder(UUID folderID) | 329 | public void deleteInventoryFolder(UUID folderID) |
330 | { | 330 | { |
331 | string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID"; | 331 | string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID"; |
332 | 332 | ||
333 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 333 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
334 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 334 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
335 | { | 335 | { |
336 | List<InventoryFolderBase> subFolders; | 336 | List<InventoryFolderBase> subFolders; |
337 | cmd.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero)); | 337 | cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero)); |
338 | conn.Open(); | 338 | conn.Open(); |
339 | subFolders = getFolderHierarchy(folderID, cmd); | 339 | subFolders = getFolderHierarchy(folderID, cmd); |
340 | 340 | ||
@@ -363,15 +363,15 @@ namespace OpenSim.Data.MSSQL | |||
363 | /// <returns>A list containing inventory items</returns> | 363 | /// <returns>A list containing inventory items</returns> |
364 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) | 364 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) |
365 | { | 365 | { |
366 | string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID"; | 366 | string sql = @"SELECT * FROM inventoryitems WHERE ""parentFolderID"" = :parentFolderID"; |
367 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 367 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
368 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 368 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
369 | { | 369 | { |
370 | cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID)); | 370 | cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID)); |
371 | conn.Open(); | 371 | conn.Open(); |
372 | List<InventoryItemBase> items = new List<InventoryItemBase>(); | 372 | List<InventoryItemBase> items = new List<InventoryItemBase>(); |
373 | 373 | ||
374 | using (SqlDataReader reader = cmd.ExecuteReader()) | 374 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) |
375 | { | 375 | { |
376 | while (reader.Read()) | 376 | while (reader.Read()) |
377 | { | 377 | { |
@@ -389,13 +389,13 @@ namespace OpenSim.Data.MSSQL | |||
389 | /// <returns>An inventory item</returns> | 389 | /// <returns>An inventory item</returns> |
390 | public InventoryItemBase getInventoryItem(UUID itemID) | 390 | public InventoryItemBase getInventoryItem(UUID itemID) |
391 | { | 391 | { |
392 | string sql = "SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID"; | 392 | string sql = @"SELECT * FROM inventoryitems WHERE ""inventoryID"" = :inventoryID"; |
393 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 393 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
394 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 394 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
395 | { | 395 | { |
396 | cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID)); | 396 | cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID)); |
397 | conn.Open(); | 397 | conn.Open(); |
398 | using (SqlDataReader reader = cmd.ExecuteReader()) | 398 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) |
399 | { | 399 | { |
400 | if (reader.Read()) | 400 | if (reader.Read()) |
401 | { | 401 | { |
@@ -421,15 +421,15 @@ namespace OpenSim.Data.MSSQL | |||
421 | } | 421 | } |
422 | 422 | ||
423 | string sql = @"INSERT INTO inventoryitems | 423 | string sql = @"INSERT INTO inventoryitems |
424 | ([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName], | 424 | (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", |
425 | [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions], | 425 | ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"", |
426 | [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions], [inventoryGroupPermissions], | 426 | ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"", |
427 | [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) | 427 | ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) |
428 | VALUES | 428 | VALUES |
429 | (@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription, | 429 | (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription, |
430 | @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID, | 430 | :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID, |
431 | @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType, | 431 | :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType, |
432 | @creationDate, @groupID, @groupOwned, @flags)"; | 432 | :creationDate, :groupID, :groupOwned, :flags)"; |
433 | 433 | ||
434 | string itemName = item.Name; | 434 | string itemName = item.Name; |
435 | if (item.Name.Length > 64) | 435 | if (item.Name.Length > 64) |
@@ -445,8 +445,8 @@ namespace OpenSim.Data.MSSQL | |||
445 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters"); | 445 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters"); |
446 | } | 446 | } |
447 | 447 | ||
448 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 448 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
449 | using (SqlCommand command = new SqlCommand(sql, conn)) | 449 | using (NpgsqlCommand command = new NpgsqlCommand(sql, conn)) |
450 | { | 450 | { |
451 | command.Parameters.Add(database.CreateParameter("inventoryID", item.ID)); | 451 | command.Parameters.Add(database.CreateParameter("inventoryID", item.ID)); |
452 | command.Parameters.Add(database.CreateParameter("assetID", item.AssetID)); | 452 | command.Parameters.Add(database.CreateParameter("assetID", item.AssetID)); |
@@ -462,8 +462,8 @@ namespace OpenSim.Data.MSSQL | |||
462 | command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions)); | 462 | command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions)); |
463 | command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions)); | 463 | command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions)); |
464 | command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions)); | 464 | command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions)); |
465 | command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice)); | 465 | command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice)); |
466 | command.Parameters.Add(database.CreateParameter("saleType", item.SaleType)); | 466 | command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType)); |
467 | command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate)); | 467 | command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate)); |
468 | command.Parameters.Add(database.CreateParameter("groupID", item.GroupID)); | 468 | command.Parameters.Add(database.CreateParameter("groupID", item.GroupID)); |
469 | command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned)); | 469 | command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned)); |
@@ -479,9 +479,9 @@ namespace OpenSim.Data.MSSQL | |||
479 | } | 479 | } |
480 | } | 480 | } |
481 | 481 | ||
482 | sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID"; | 482 | sql = @"UPDATE inventoryfolders SET version = version + 1 WHERE ""folderID"" = @folderID"; |
483 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 483 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
484 | using (SqlCommand command = new SqlCommand(sql, conn)) | 484 | using (NpgsqlCommand command = new NpgsqlCommand(sql, conn)) |
485 | { | 485 | { |
486 | command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString())); | 486 | command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString())); |
487 | conn.Open(); | 487 | conn.Open(); |
@@ -502,26 +502,26 @@ namespace OpenSim.Data.MSSQL | |||
502 | /// <param name="item">Inventory item to update</param> | 502 | /// <param name="item">Inventory item to update</param> |
503 | public void updateInventoryItem(InventoryItemBase item) | 503 | public void updateInventoryItem(InventoryItemBase item) |
504 | { | 504 | { |
505 | string sql = @"UPDATE inventoryitems SET assetID = @assetID, | 505 | string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID, |
506 | assetType = @assetType, | 506 | ""assetType"" = :assetType, |
507 | parentFolderID = @parentFolderID, | 507 | ""parentFolderID"" = :parentFolderID, |
508 | avatarID = @avatarID, | 508 | ""avatarID"" = :avatarID, |
509 | inventoryName = @inventoryName, | 509 | ""inventoryName"" = :inventoryName, |
510 | inventoryDescription = @inventoryDescription, | 510 | ""inventoryDescription"" = :inventoryDescription, |
511 | inventoryNextPermissions = @inventoryNextPermissions, | 511 | ""inventoryNextPermissions"" = :inventoryNextPermissions, |
512 | inventoryCurrentPermissions = @inventoryCurrentPermissions, | 512 | ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, |
513 | invType = @invType, | 513 | ""invType"" = :invType, |
514 | creatorID = @creatorID, | 514 | ""creatorID"" = :creatorID, |
515 | inventoryBasePermissions = @inventoryBasePermissions, | 515 | ""inventoryBasePermissions"" = :inventoryBasePermissions, |
516 | inventoryEveryOnePermissions = @inventoryEveryOnePermissions, | 516 | ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, |
517 | inventoryGroupPermissions = @inventoryGroupPermissions, | 517 | ""inventoryGroupPermissions"" = :inventoryGroupPermissions, |
518 | salePrice = @salePrice, | 518 | ""salePrice"" = :SalePrice, |
519 | saleType = @saleType, | 519 | ""saleType"" = :SaleType, |
520 | creationDate = @creationDate, | 520 | ""creationDate"" = :creationDate, |
521 | groupID = @groupID, | 521 | ""groupID"" = :groupID, |
522 | groupOwned = @groupOwned, | 522 | ""groupOwned"" = :groupOwned, |
523 | flags = @flags | 523 | flags = :flags |
524 | WHERE inventoryID = @inventoryID"; | 524 | WHERE ""inventoryID"" = :inventoryID"; |
525 | 525 | ||
526 | string itemName = item.Name; | 526 | string itemName = item.Name; |
527 | if (item.Name.Length > 64) | 527 | if (item.Name.Length > 64) |
@@ -537,8 +537,8 @@ namespace OpenSim.Data.MSSQL | |||
537 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update"); | 537 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update"); |
538 | } | 538 | } |
539 | 539 | ||
540 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 540 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
541 | using (SqlCommand command = new SqlCommand(sql, conn)) | 541 | using (NpgsqlCommand command = new NpgsqlCommand(sql, conn)) |
542 | { | 542 | { |
543 | command.Parameters.Add(database.CreateParameter("inventoryID", item.ID)); | 543 | command.Parameters.Add(database.CreateParameter("inventoryID", item.ID)); |
544 | command.Parameters.Add(database.CreateParameter("assetID", item.AssetID)); | 544 | command.Parameters.Add(database.CreateParameter("assetID", item.AssetID)); |
@@ -554,8 +554,8 @@ namespace OpenSim.Data.MSSQL | |||
554 | command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions)); | 554 | command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions)); |
555 | command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions)); | 555 | command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions)); |
556 | command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions)); | 556 | command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions)); |
557 | command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice)); | 557 | command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice)); |
558 | command.Parameters.Add(database.CreateParameter("saleType", item.SaleType)); | 558 | command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType)); |
559 | command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate)); | 559 | command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate)); |
560 | command.Parameters.Add(database.CreateParameter("groupID", item.GroupID)); | 560 | command.Parameters.Add(database.CreateParameter("groupID", item.GroupID)); |
561 | command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned)); | 561 | command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned)); |
@@ -580,9 +580,9 @@ namespace OpenSim.Data.MSSQL | |||
580 | /// <param name="itemID">the item UUID</param> | 580 | /// <param name="itemID">the item UUID</param> |
581 | public void deleteInventoryItem(UUID itemID) | 581 | public void deleteInventoryItem(UUID itemID) |
582 | { | 582 | { |
583 | string sql = "DELETE FROM inventoryitems WHERE inventoryID=@inventoryID"; | 583 | string sql = @"DELETE FROM inventoryitems WHERE ""inventoryID""=:inventoryID"; |
584 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 584 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
585 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 585 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
586 | { | 586 | { |
587 | cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID)); | 587 | cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID)); |
588 | try | 588 | try |
@@ -616,14 +616,14 @@ namespace OpenSim.Data.MSSQL | |||
616 | /// </returns> | 616 | /// </returns> |
617 | public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) | 617 | public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) |
618 | { | 618 | { |
619 | string sql = "SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1"; | 619 | string sql = @"SELECT * FROM inventoryitems WHERE ""avatarID"" = :uuid AND ""assetType"" = :assetType and flags = 1"; |
620 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 620 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
621 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 621 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
622 | { | 622 | { |
623 | cmd.Parameters.Add(database.CreateParameter("uuid", avatarID)); | 623 | cmd.Parameters.Add(database.CreateParameter("uuid", avatarID)); |
624 | cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture)); | 624 | cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture)); |
625 | conn.Open(); | 625 | conn.Open(); |
626 | using (SqlDataReader reader = cmd.ExecuteReader()) | 626 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) |
627 | { | 627 | { |
628 | List<InventoryItemBase> gestureList = new List<InventoryItemBase>(); | 628 | List<InventoryItemBase> gestureList = new List<InventoryItemBase>(); |
629 | while (reader.Read()) | 629 | while (reader.Read()) |
@@ -644,9 +644,9 @@ namespace OpenSim.Data.MSSQL | |||
644 | /// </summary> | 644 | /// </summary> |
645 | /// <param name="folderID">the item ID</param> | 645 | /// <param name="folderID">the item ID</param> |
646 | /// <param name="connection">connection to the database</param> | 646 | /// <param name="connection">connection to the database</param> |
647 | private void DeleteItemsInFolder(UUID folderID, SqlConnection connection) | 647 | private void DeleteItemsInFolder(UUID folderID, NpgsqlConnection connection) |
648 | { | 648 | { |
649 | using (SqlCommand command = new SqlCommand("DELETE FROM inventoryitems WHERE folderID=@folderID", connection)) | 649 | using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryitems WHERE ""folderID""=:folderID", connection)) |
650 | { | 650 | { |
651 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); | 651 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); |
652 | 652 | ||
@@ -667,9 +667,9 @@ namespace OpenSim.Data.MSSQL | |||
667 | /// <param name="parentID">parent ID.</param> | 667 | /// <param name="parentID">parent ID.</param> |
668 | /// <param name="command">SQL command/connection to database</param> | 668 | /// <param name="command">SQL command/connection to database</param> |
669 | /// <returns></returns> | 669 | /// <returns></returns> |
670 | private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, SqlCommand command) | 670 | private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, NpgsqlCommand command) |
671 | { | 671 | { |
672 | command.Parameters["@parentID"].Value = parentID.Guid; //.ToString(); | 672 | command.Parameters["parentID"].Value = parentID.Guid; //.ToString(); |
673 | 673 | ||
674 | List<InventoryFolderBase> folders = getInventoryFolders(command); | 674 | List<InventoryFolderBase> folders = getInventoryFolders(command); |
675 | 675 | ||
@@ -698,9 +698,9 @@ namespace OpenSim.Data.MSSQL | |||
698 | /// <returns></returns> | 698 | /// <returns></returns> |
699 | private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user) | 699 | private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user) |
700 | { | 700 | { |
701 | string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid"; | 701 | string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID AND ""agentID"" = :uuid"; |
702 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 702 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
703 | using (SqlCommand command = new SqlCommand(sql, conn)) | 703 | using (NpgsqlCommand command = new NpgsqlCommand(sql, conn)) |
704 | { | 704 | { |
705 | if (user == UUID.Zero) | 705 | if (user == UUID.Zero) |
706 | { | 706 | { |
@@ -721,9 +721,9 @@ namespace OpenSim.Data.MSSQL | |||
721 | /// </summary> | 721 | /// </summary> |
722 | /// <param name="command">SQLcommand.</param> | 722 | /// <param name="command">SQLcommand.</param> |
723 | /// <returns></returns> | 723 | /// <returns></returns> |
724 | private static List<InventoryFolderBase> getInventoryFolders(SqlCommand command) | 724 | private static List<InventoryFolderBase> getInventoryFolders(NpgsqlCommand command) |
725 | { | 725 | { |
726 | using (SqlDataReader reader = command.ExecuteReader()) | 726 | using (NpgsqlDataReader reader = command.ExecuteReader()) |
727 | { | 727 | { |
728 | 728 | ||
729 | List<InventoryFolderBase> items = new List<InventoryFolderBase>(); | 729 | List<InventoryFolderBase> items = new List<InventoryFolderBase>(); |
@@ -738,9 +738,9 @@ namespace OpenSim.Data.MSSQL | |||
738 | /// <summary> | 738 | /// <summary> |
739 | /// Reads a list of inventory folders returned by a query. | 739 | /// Reads a list of inventory folders returned by a query. |
740 | /// </summary> | 740 | /// </summary> |
741 | /// <param name="reader">A MSSQL Data Reader</param> | 741 | /// <param name="reader">A PGSQL Data Reader</param> |
742 | /// <returns>A List containing inventory folders</returns> | 742 | /// <returns>A List containing inventory folders</returns> |
743 | protected static InventoryFolderBase readInventoryFolder(SqlDataReader reader) | 743 | protected static InventoryFolderBase readInventoryFolder(NpgsqlDataReader reader) |
744 | { | 744 | { |
745 | try | 745 | try |
746 | { | 746 | { |
@@ -796,7 +796,7 @@ namespace OpenSim.Data.MSSQL | |||
796 | 796 | ||
797 | return item; | 797 | return item; |
798 | } | 798 | } |
799 | catch (SqlException e) | 799 | catch (NpgsqlException e) |
800 | { | 800 | { |
801 | m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message); | 801 | m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message); |
802 | } | 802 | } |
@@ -809,18 +809,18 @@ namespace OpenSim.Data.MSSQL | |||
809 | /// </summary> | 809 | /// </summary> |
810 | /// <param name="folderID">the folder UUID</param> | 810 | /// <param name="folderID">the folder UUID</param> |
811 | /// <param name="connection">connection to database</param> | 811 | /// <param name="connection">connection to database</param> |
812 | private void DeleteOneFolder(UUID folderID, SqlConnection connection) | 812 | private void DeleteOneFolder(UUID folderID, NpgsqlConnection connection) |
813 | { | 813 | { |
814 | try | 814 | try |
815 | { | 815 | { |
816 | using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection)) | 816 | using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryfolders WHERE ""folderID""=:folderID and type=-1", connection)) |
817 | { | 817 | { |
818 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); | 818 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); |
819 | 819 | ||
820 | command.ExecuteNonQuery(); | 820 | command.ExecuteNonQuery(); |
821 | } | 821 | } |
822 | } | 822 | } |
823 | catch (SqlException e) | 823 | catch (NpgsqlException e) |
824 | { | 824 | { |
825 | m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message); | 825 | m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message); |
826 | } | 826 | } |