mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 01:06:30 +08:00
Postgresql Fixes: region store, mutelist and generic table handler.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
This commit is contained in:
BlueWall
@@ -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))
|
||||
@@ -920,7 +920,8 @@ namespace OpenSim.Data.PGSQL
|
||||
regionSettings.OnSave += StoreRegionSettings;
|
||||
|
||||
//Store new values
|
||||
StoreNewRegionSettings(regionSettings);
|
||||
// StoreNewRegionSettings(regionSettings);
|
||||
StoreRegionSettings(regionSettings);
|
||||
|
||||
LoadSpawnPoints(regionSettings);
|
||||
|
||||
@@ -928,51 +929,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 +1002,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 +1587,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 +1956,6 @@ namespace OpenSim.Data.PGSQL
|
||||
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
private void LoadSpawnPoints(RegionSettings rs)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user