diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs index ddc136a0f3..5b50520f58 100644 --- a/OpenSim/Data/PGSQL/PGSQLFramework.cs +++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs @@ -41,9 +41,7 @@ namespace OpenSim.Data.PGSQL /// public class PGSqlFramework { - private static readonly log4net.ILog m_log = - log4net.LogManager.GetLogger( - System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger( System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); protected string m_connectionString; protected object m_dbLock = new object(); diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations index a1852d55f9..11d8ec8f65 100644 --- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations +++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations @@ -41,6 +41,16 @@ WITH (OIDS=FALSE); -- ---------------------------- ALTER TABLE "public"."estate_map" ADD PRIMARY KEY ("RegionID") NOT DEFERRABLE INITIALLY IMMEDIATE; +-- ---------------------------- +-- SEQUENCE estate_settings_id +-- ---------------------------- +CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" + INCREMENT 100 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 100 + CACHE 1; + -- ---------------------------- -- Table structure for estate_settings -- ---------------------------- @@ -110,22 +120,6 @@ CREATE INDEX IF NOT EXISTS "ix_estateban" ON "public"."estateban" USING btree(" COMMIT; -:VERSION 13 - - BEGIN TRASACTION; - --- ---------------------------- --- SEQUENCE estate_settings_id --- ---------------------------- -CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id" - INCREMENT 100 - MINVALUE 1 - MAXVALUE 9223372036854775807 - START 100 - CACHE 1; - -COMMIT; - :VERSION 14 BEGIN TRANSACTION;