From 464409bbc2caa064be6dc75b8e3c2cb9bcb21823 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 15 May 2024 22:57:45 +0100 Subject: [PATCH] pgsql: a few more changes.. --- OpenSim/Data/PGSQL/PGSQLEstateData.cs | 4 ++-- OpenSim/Data/PGSQL/Resources/AssetStore.migrations | 2 +- .../Data/PGSQL/Resources/InventoryStore.migrations | 13 ------------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs index f059e49199..2f0d50ab18 100644 --- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs +++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs @@ -324,7 +324,7 @@ namespace OpenSim.Data.PGSQL using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) { - cmd.Parameters.Add(_Database.CreateParameter("EstateID", estateID)); + cmd.Parameters.Add(_Database.CreateParameter("EstateID", (int)estateID)); conn.Open(); using (NpgsqlDataReader reader = cmd.ExecuteReader()) { @@ -397,7 +397,7 @@ namespace OpenSim.Data.PGSQL conn.Open(); using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) { - cmd.Parameters.AddWithValue("EstateID", (int)estateID); + cmd.Parameters.AddWithValue("EstateID", estateID); using (NpgsqlDataReader reader = cmd.ExecuteReader()) { if (reader.Read()) diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations index 38db5ee98f..3171074937 100644 --- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations @@ -103,6 +103,6 @@ COMMIT; BEGIN TRANSACTION; alter table assets - alter column "creatorID" type varchar(128); + alter column "creatorid" type varchar(128); Commit; diff --git a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations index 8f7982ad35..20afbeede3 100644 --- a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations @@ -182,17 +182,6 @@ alter table inventoryitems COMMIT ; -:VERSION 7 - -BEGIN TRANSACTION; - --- # "creatorID" goes back to VARCHAR(36) (???) - -alter table inventoryitems - alter column "creatorID" type varchar(36); - -COMMIT ; - :VERSION 8 ALTER TABLE inventoryitems @@ -203,8 +192,6 @@ ALTER TABLE inventoryitems BEGIN TRANSACTION; ---# "creatorID" goes up to VARCHAR(255) - alter table inventoryitems alter column "creatorID" type varchar(255);