ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-13 01:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/opensim/opensim

Browse Source
This commit is contained in:
Adil El Farissi
2024-07-09 02:06:53 +00:00
parent e54e30943e cce3327734
commit 90618dc4d5
12 changed files with 409 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
View File

@@ -534,7 +534,7 @@ namespace OpenSim.Data.PGSQL
{
for (int i = 0; i < fields.Length; i++)
{
cmd.Parameters.AddWithValue(fields[i], keys[i]);
cmd.Parameters.AddWithValue(fields[i], new Guid(keys[i]));
terms.Add("\"" + fields[i] + "\" = :" + fields[i]);
}

209
OpenSim/Data/PGSQL/PGSQLSimulationData.cs
View File

@@ -784,7 +784,7 @@ namespace OpenSim.Data.PGSQL
cmd.ExecuteNonQuery();
}
sql = @"INSERT INTO landaccesslist (""LandUUID"",""AccessUUID"",""LandFlags"",""Expires"") VALUES (:LandUUID,:AccessUUID,:Flags,:Expires)";
sql = @"INSERT INTO landaccesslist (""LandUUID"",""AccessUUID"",""Flags"",""Expires"") VALUES (:LandUUID,:AccessUUID,:Flags,:Expires)";
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -896,7 +896,7 @@ namespace OpenSim.Data.PGSQL
public RegionSettings LoadRegionSettings(UUID regionUUID)
{
string sql = @"select * from regionsettings where ""regionUUID"" = :regionUUID";
RegionSettings regionSettings;
RegionSettings regionSettings = null;
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
@@ -908,10 +908,13 @@ namespace OpenSim.Data.PGSQL
{
regionSettings = BuildRegionSettings(reader);
regionSettings.OnSave += StoreRegionSettings;
return regionSettings;
}
}
if (regionSettings != null)
{
LoadSpawnPoints(regionSettings);
return regionSettings;
}
}
//If we reach this point then there are new region settings for that region
@@ -920,7 +923,8 @@ namespace OpenSim.Data.PGSQL
regionSettings.OnSave += StoreRegionSettings;
//Store new values
StoreNewRegionSettings(regionSettings);
// StoreNewRegionSettings(regionSettings);
StoreRegionSettings(regionSettings);
LoadSpawnPoints(regionSettings);
@@ -928,51 +932,69 @@ namespace OpenSim.Data.PGSQL
}
/// <summary>
/// Store region settings, need to check if the check is really necesary. If we can make something for creating new region.
/// Store region settings
/// </summary>
/// <param name="regionSettings">region settings.</param>
public void StoreRegionSettings(RegionSettings regionSettings)
{
//Little check if regionUUID already exist in DB
string regionUUID;
string sql = @"SELECT ""regionUUID"" FROM regionsettings WHERE ""regionUUID"" = :regionUUID";
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
cmd.Parameters.Add(_Database.CreateParameter("regionUUID", regionSettings.RegionUUID));
conn.Open();
regionUUID = cmd.ExecuteScalar().ToString();
}
const string queryString = """
INSERT INTO regionsettings ( "regionUUID", block_terraform, block_fly, allow_damage, restrict_pushing,
allow_land_resell, allow_land_join_divide, block_show_in_search, agent_limit, object_bonus,
maturity, disable_scripts, disable_collisions, disable_physics, terrain_texture_1, terrain_texture_2,
terrain_texture_3, terrain_texture_4, elevation_1_nw, elevation_2_nw, elevation_1_ne, elevation_2_ne,
elevation_1_se, elevation_2_se, elevation_1_sw, elevation_2_sw, water_height, terrain_raise_limit,
terrain_lower_limit, use_estate_sun, fixed_sun, sun_position, covenant, covenant_datetime, "Sandbox",
sunvectorx, sunvectory, sunvectorz, loaded_creation_datetime, loaded_creation_id, "map_tile_ID",
block_search, casino, "TelehubObject", "parcel_tile_ID", "cacheID", "TerrainPBR1", "TerrainPBR2",
"TerrainPBR3", "TerrainPBR4")
VALUES
(:RegionUUID, :block_terraform, :block_fly, :allow_damage, :restrict_pushing, :allow_land_resell,
:allow_land_join_divide, :block_show_in_search, :agent_limit, :object_bonus, :maturity, :disable_scripts,
:disable_collisions, :disable_physics, :terrain_texture_1, :terrain_texture_2, :terrain_texture_3,
:terrain_texture_4, :elevation_1_nw, :elevation_2_nw, :elevation_1_ne, :elevation_2_ne, :elevation_1_se,
:elevation_2_se, :elevation_1_sw, :elevation_2_sw, :water_height, :terrain_raise_limit, :terrain_lower_limit,
:use_estate_sun, :fixed_sun, :sun_position, :covenant, :covenant_datetime, :Sandbox, :sunvectorx,
:sunvectory, :sunvectorz, :Loaded_Creation_DateTime, :Loaded_Creation_ID, :map_tile_ID,
:block_search, :casino, :TelehubObject, :ParcelImageID, :cacheID, :TerrainPBR1, :TerrainPBR2,
:TerrainPBR3, :TerrainPBR4)
ON CONFLICT ("regionUUID")
DO UPDATE SET "regionUUID" = :RegionUUID, block_terraform = :block_terraform, block_fly = :block_fly,
allow_damage = :allow_damage, restrict_pushing = :restrict_pushing, allow_land_resell = :allow_land_resell,
allow_land_join_divide = :allow_land_join_divide, block_show_in_search = :block_show_in_search,
agent_limit = :agent_limit, object_bonus = :object_bonus, maturity = :maturity, disable_scripts = :disable_scripts,
disable_collisions = :disable_collisions, disable_physics = :disable_physics, terrain_texture_1 = :terrain_texture_1,
terrain_texture_2 = :terrain_texture_2, terrain_texture_3 = :terrain_texture_3, terrain_texture_4 = :terrain_texture_4,
elevation_1_nw = :elevation_1_nw, elevation_2_nw = :elevation_2_nw, elevation_1_ne = :elevation_1_ne,
elevation_2_ne = :elevation_2_ne, elevation_1_se = :elevation_1_se, elevation_2_se = :elevation_2_se,
elevation_1_sw = :elevation_1_sw, elevation_2_sw = :elevation_2_sw, water_height = :water_height,
terrain_raise_limit = :terrain_raise_limit, terrain_lower_limit = :terrain_lower_limit,
use_estate_sun = :use_estate_sun, fixed_sun = :fixed_sun, sun_position = :sun_position, covenant = :covenant,
covenant_datetime = :covenant_datetime, "Sandbox" = :Sandbox, sunvectorx = :sunvectorx,
sunvectory = :sunvectory, sunvectorz = :sunvectorz, loaded_creation_datetime = :Loaded_Creation_DateTime,
loaded_creation_id = :Loaded_Creation_ID, "map_tile_ID" = :map_tile_ID, block_search = :block_search,
casino = :casino, "TelehubObject" = :TelehubObject, "parcel_tile_ID" = :ParcelImageID, "cacheID" = :cacheID,
"TerrainPBR1" = :TerrainPBR1, "TerrainPBR2" = :TerrainPBR2, "TerrainPBR3" = :TerrainPBR3,
"TerrainPBR4" = :TerrainPBR4
""";
if (string.IsNullOrEmpty(regionUUID))
using (var connection = new NpgsqlConnection(m_connectionString))
{
StoreNewRegionSettings(regionSettings);
}
else
{
//This method only updates region settings!!! First call LoadRegionSettings to create new region settings in DB
sql =
@"UPDATE regionsettings SET block_terraform = :block_terraform ,block_fly = :block_fly ,allow_damage = :allow_damage
,restrict_pushing = :restrict_pushing ,allow_land_resell = :allow_land_resell ,allow_land_join_divide = :allow_land_join_divide
,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity
,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics
,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3
,terrain_texture_4 = :terrain_texture_4 , TerrainPBR1 = :TerrainPBR1, TerrainPBR2 = :TerrainPBR2, TerrainPBR3 = :TerrainPBR3
,TerrainPBR4 = :TerrainPBR4, elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se
,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit
,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position
,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,
""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID,
""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID, ""cacheID"" = :cacheID
WHERE ""regionUUID"" = :regionUUID";
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
connection.Open();
NpgsqlCommand command = new NpgsqlCommand(queryString, connection, connection.BeginTransaction());
using (command)
{
cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
conn.Open();
cmd.ExecuteNonQuery();
try
{
command.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
command.ExecuteNonQuery();
command.Transaction.Commit();
}
catch (Exception e)
{
Console.WriteLine(e);
command.Transaction.Rollback();
throw;
}
}
}
SaveSpawnPoints(regionSettings);
@@ -983,39 +1005,6 @@ namespace OpenSim.Data.PGSQL
//Not used??
}
#region Private Methods
/// <summary>
/// Stores new regionsettings.
/// </summary>
/// <param name="regionSettings">The region settings.</param>
private void StoreNewRegionSettings(RegionSettings regionSettings)
{
string sql = @"INSERT INTO regionsettings
(""regionUUID"",block_terraform,block_fly,allow_damage,restrict_pushing,allow_land_resell,allow_land_join_divide,
block_show_in_search,agent_limit,object_bonus,maturity,disable_scripts,disable_collisions,disable_physics,
terrain_texture_1,terrain_texture_2,terrain_texture_3,terrain_texture_4,elevation_1_nw,elevation_2_nw,elevation_1_ne,
elevation_2_ne,elevation_1_se,elevation_2_se,elevation_1_sw,elevation_2_sw,water_height,terrain_raise_limit,
terrain_lower_limit,use_estate_sun,fixed_sun,sun_position,covenant,covenant_datetime,sunvectorx, sunvectory, sunvectorz,
""Sandbox"", loaded_creation_datetime, loaded_creation_id
)
VALUES
(:regionUUID,:block_terraform,:block_fly,:allow_damage,:restrict_pushing,:allow_land_resell,:allow_land_join_divide,
:block_show_in_search,:agent_limit,:object_bonus,:maturity,:disable_scripts,:disable_collisions,:disable_physics,
:terrain_texture_1,:terrain_texture_2,:terrain_texture_3,:terrain_texture_4,:elevation_1_nw,:elevation_2_nw,:elevation_1_ne,
:elevation_2_ne,:elevation_1_se,:elevation_2_se,:elevation_1_sw,:elevation_2_sw,:water_height,:terrain_raise_limit,
:terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory,
:sunvectorz, :Sandbox, :loaded_creation_datetime, :loaded_creation_id )";
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
conn.Open();
cmd.ExecuteNonQuery();
}
}
#region Private DataRecord conversion methods
/// <summary>
@@ -1601,7 +1590,9 @@ namespace OpenSim.Data.PGSQL
_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime),
_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime),
_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID),
_Database.CreateParameter("TerrainImageID", settings.TerrainImageID),
_Database.CreateParameter("map_tile_ID", settings.TerrainImageID),
_Database.CreateParameter("block_search", settings.GodBlockSearch),
_Database.CreateParameter("casino", settings.Casino),
_Database.CreateParameter("ParcelImageID", settings.ParcelImageID),
_Database.CreateParameter("TelehubObject", settings.TelehubObject),
_Database.CreateParameter("cacheID", settings.CacheID),
@@ -1968,7 +1959,6 @@ namespace OpenSim.Data.PGSQL
#endregion
#endregion
private void LoadSpawnPoints(RegionSettings rs)
{
@@ -1983,14 +1973,14 @@ namespace OpenSim.Data.PGSQL
conn.Open();
using (NpgsqlDataReader reader = cmd.ExecuteReader())
{
if (reader.Read())
while (reader.Read())
{
SpawnPoint sp = new SpawnPoint();
sp.Yaw = (float)reader["Yaw"];
sp.Pitch = (float)reader["Pitch"];
sp.Distance = (float)reader["Distance"];
var sp = new SpawnPoint
{
Yaw = Convert.ToSingle(reader["Yaw"]),
Pitch = Convert.ToSingle(reader["Pitch"]),
Distance = Convert.ToSingle(reader["Distance"])
};
rs.AddSpawnPoint(sp);
}
}
@@ -2030,15 +2020,62 @@ namespace OpenSim.Data.PGSQL
public void SaveExtra(UUID regionID, string name, string value)
{
const string queryString = """
INSERT INTO regionextra ("RegionID", "Name", "value")
VALUES (:RegionID, :Name, :Value)
""";
using var connection = new NpgsqlConnection(m_connectionString);
connection.Open();
using var command = new NpgsqlCommand(queryString, connection, connection.BeginTransaction());
try
{
command.Parameters.AddWithValue("RegionID", regionID.ToString());
command.Parameters.AddWithValue("Name", name);
command.Parameters.AddWithValue("Value", value);
command.ExecuteNonQuery();
command.Transaction.Commit();
}
catch (Exception e)
{
Console.WriteLine(e);
command.Transaction.Rollback();
}
}
public void RemoveExtra(UUID regionID, string name)
{
const string queryString = """DELETE FROM regionextra WHERE "RegionID"=:RegionID AND "Name"=:Name""";
using var connection = new NpgsqlConnection(m_connectionString);
connection.Open();
using var command = new NpgsqlCommand(queryString, connection, connection.BeginTransaction());
try
{
command.Parameters.AddWithValue("RegionID", regionID.ToString());
command.Parameters.AddWithValue("Name", name);
command.ExecuteNonQuery();
command.Transaction.Commit();
}
catch (Exception e)
{
Console.WriteLine(e);
command.Transaction.Rollback();
}
}
public Dictionary<string, string> GetExtra(UUID regionID)
{
return null;
const string queryString = """SELECT * FROM regionextra WHERE "RegionID" = :RegionID""";
using NpgsqlConnection conn = new NpgsqlConnection(m_connectionString);
using NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn);
cmd.Parameters.Add(_Database.CreateParameter("RegionID", regionID.ToString()));
conn.Open();
using NpgsqlDataReader reader = cmd.ExecuteReader();
Dictionary<string, string> extraSettings = new Dictionary<string, string>();
while (reader.Read())
{
extraSettings.Add(reader["Name"].ToString(), reader["value"].ToString());
}
return extraSettings;
}
}
}

45
OpenSim/Data/PGSQL/Resources/RegionStore.migrations
View File

@@ -1262,8 +1262,45 @@ COMMIT;
:VERSION 54 #----- add pbr terrain storage
BEGIN;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR1" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR2" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR3" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR4" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR1" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR2" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR3" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR4" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
COMMIT;
:VERSION 55 #----- Fix data type for columns
BEGIN;
ALTER TABLE public.regionsettings ALTER COLUMN "block_search" DROP DEFAULT;
ALTER TABLE public.regionsettings ALTER COLUMN "casino" DROP DEFAULT;
ALTER TABLE public.regionsettings
ALTER COLUMN "block_search" TYPE BOOLEAN
USING CASE WHEN "block_search" = 0 THEN FALSE
WHEN "block_search" = 1 THEN TRUE
ELSE NULL
END;
ALTER TABLE public.regionsettings
ALTER COLUMN "casino" TYPE BOOLEAN
USING CASE WHEN "casino" = 0 THEN FALSE
WHEN "casino" = 1 THEN TRUE
ELSE NULL
END;
COMMIT;
:VERSION 56 #----- Fix the constraints on the spawn points
BEGIN;
ALTER TABLE spawn_points DROP CONSTRAINT spawn_points_pkey;
ALTER TABLE spawn_points ADD CONSTRAINT spawn_points_pkey
PRIMARY KEY ("RegionUUID", "Yaw", "Pitch", "Distance");
COMMIT;
:VERSION 57 #----- Adding a table missing from the PgSQL adapter
BEGIN;
CREATE TABLE "regionextra"
(
"RegionID" char(36),
"Name" varchar(32),
"value" text,
PRIMARY KEY ("RegionID", "Name")
);
COMMIT;