diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLEstateData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/PGSQL/Resources/EstateStore.migrations | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs index 9489d6c..16e56fa 100644 --- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs +++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Data.PGSQL | |||
286 | { | 286 | { |
287 | es.ClearBans(); | 287 | es.ClearBans(); |
288 | 288 | ||
289 | string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID"; | 289 | string sql = "select * from estateban where \"EstateID\" = :EstateID"; |
290 | 290 | ||
291 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) | 291 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
292 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) | 292 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
@@ -302,6 +302,8 @@ namespace OpenSim.Data.PGSQL | |||
302 | EstateBan eb = new EstateBan(); | 302 | EstateBan eb = new EstateBan(); |
303 | 303 | ||
304 | eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid; | 304 | eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid; |
305 | eb.BanningUserID = new UUID((Guid)reader["banningUUID"]); //uuid; | ||
306 | eb.BanTime = Convert.ToInt32(reader["banTime"]); | ||
305 | eb.BannedHostAddress = "0.0.0.0"; | 307 | eb.BannedHostAddress = "0.0.0.0"; |
306 | eb.BannedHostIPMask = "0.0.0.0"; | 308 | eb.BannedHostIPMask = "0.0.0.0"; |
307 | es.AddBan(eb); | 309 | es.AddBan(eb); |
@@ -346,11 +348,15 @@ namespace OpenSim.Data.PGSQL | |||
346 | cmd.ExecuteNonQuery(); | 348 | cmd.ExecuteNonQuery(); |
347 | 349 | ||
348 | //Insert after | 350 | //Insert after |
349 | cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\") values ( :EstateID, :bannedUUID, '','','' )"; | 351 | cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\", \"banningUUID\",\"banTime\" ) values ( :EstateID, :bannedUUID, '','','', :banningUUID, :banTime )"; |
350 | cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty); | 352 | cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty); |
351 | foreach (EstateBan b in es.EstateBans) | 353 | foreach (EstateBan b in es.EstateBans) |
352 | { | 354 | { |
355 | cmd.Parameters["EstateID"].Value = b.EstateID; | ||
353 | cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid; | 356 | cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid; |
357 | cmd.Parameters["banningUUID"].Value = b.BanningUserID.Guid; | ||
358 | cmd.Parameters["banTime"].Value = b.BanTime; | ||
359 | |||
354 | cmd.ExecuteNonQuery(); | 360 | cmd.ExecuteNonQuery(); |
355 | } | 361 | } |
356 | } | 362 | } |
diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations index 5b450aa..d0ca5c0 100644 --- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations | |||
@@ -125,3 +125,11 @@ CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" | |||
125 | CACHE 1; | 125 | CACHE 1; |
126 | 126 | ||
127 | COMMIT; | 127 | COMMIT; |
128 | |||
129 | :VERSION 14 | ||
130 | BEGIN TRANSACTION; | ||
131 | |||
132 | ALTER TABLE `estateban` | ||
133 | ADD COLUMN `banningUUID` uuid NOT NULL, | ||
134 | ADD COLUMN `banTime` int NOT NULL DEFAULT 0; | ||
135 | COMMIT; | ||