7 files changed, 292 insertions, 3 deletions

diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
index b6db585..7a858b4 100644
--- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -92,3 +92,8 @@ ALTER TABLE assets ADD "asset_flags" INTEGER NOT NULL DEFAULT 0;
 :VERSION 7
 
 alter table assets add "creatorid" varchar(36) not null default '';
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/IM_Store.migrations b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
index 70dc011..eb97824 100644
--- a/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
+++ b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
@@ -24,3 +24,22 @@ DELETE FROM `migrations` WHERE name='diva_im_Store';
 */
 
 COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+-- dropping the table here as there most likely is only one record in the table at the time of migration
+
+DROP TABLE IF EXISTS "public"."im_offline";
+CREATE TABLE "public"."im_offline" (
+        "ID" serial,
+        "PrincipalID" uuid NOT NULL,
+        "Message" text NOT NULL COLLATE "default",
+        "TMStamp" timestamp(6) NOT NULL DEFAULT clock_timestamp(),
+        "FromID" uuid NOT NULL
+)
+WITH (OIDS=FALSE);
+ALTER TABLE "public"."im_offline" ADD PRIMARY KEY ("ID","PrincipalID","FromID") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/Presence.migrations b/OpenSim/Data/PGSQL/Resources/Presence.migrations
index 684faa2..5184034 100644..100755
--- a/OpenSim/Data/PGSQL/Resources/Presence.migrations
+++ b/OpenSim/Data/PGSQL/Resources/Presence.migrations
@@ -19,12 +19,24 @@ BEGIN TRANSACTION;
 CREATE UNIQUE INDEX SessionID ON Presence("SessionID");
 CREATE INDEX UserID ON Presence("UserID");
 
+ALTER TABLE Presence ADD "LastSeen" Timestamp;
+
 COMMIT;
 
-:VERSION 2
+:VERSION 3         # -------------------------- 
 
-BEGIN TRANSACTION;
+BEGIN; 
 
-ALTER TABLE Presence ADD "LastSeen" Timestamp;
+CREATE INDEX RegionID ON Presence("RegionID");
 
 COMMIT;
+
+:VERSION 4         # Making sure LastSeen is actually defined in the table as it most likely erred in the double version 2 migration above 
+
+BEGIN;
+
+ALTER TABLE Presence 
+DROP COLUMN IF EXISTS "LastSeen",
+ADD COLUMN "LastSeen" Timestamp;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
index 1e33027..1284ce0 100644
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -1152,3 +1152,11 @@ ALTER TABLE regionwindlight ALTER draw_classic_clouds TYPE bool USING CASE WHEN
 ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds SET DEFAULT FALSE;
 
 COMMIT;
+
+VERSION 41       #-- Change Landlags to bigint
+
+BEGIN TRANSACTION;
+
+ALTER TABLE land ALTER "LandFlags" TYPE bigint;
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index f23c870..a67107a 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,3 +81,78 @@ CREATE TABLE userdata (
 
 commit;
 
+<<<<<<< HEAD
+:VERSION 3        # -------------------------------
+begin;
+CREATE TABLE usersettings (
+    "useruuid" char(36) NOT NULL,
+    "imviaemail" bytea NOT NULL,
+    "visible" bytea NOT NULL,
+    PRIMARY KEY ("useruuid")
+);
+commit;
+
+:VERSION 4
+
+BEGIN;
+
+-- Classifieds
+ALTER TABLE classifieds DROP CONSTRAINT classifiedspk;
+ALTER TABLE classifieds ALTER COLUMN classifieduuid SET DATA TYPE uuid using classifieduuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN creatoruuid SET DATA TYPE uuid using creatoruuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN parceluuid SET DATA TYPE uuid using parceluuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN snapshotuuid SET DATA TYPE uuid using snapshotuuid::uuid;
+ALTER TABLE classifieds ADD CONSTRAINT classifiedspk PRIMARY KEY (classifieduuid);
+
+-- Notes
+ALTER TABLE usernotes DROP CONSTRAINT usernoteuk;
+ALTER TABLE usernotes ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usernotes ALTER COLUMN targetuuid SET DATA TYPE uuid USING targetuuid::uuid;
+ALTER TABLE usernotes ADD CONSTRAINT usernoteuk UNIQUE (useruuid,targetuuid);
+
+
+-- Userpicks
+ALTER TABLE userpicks DROP CONSTRAINT userpicks_pkey;
+ALTER TABLE userpicks ALTER COLUMN pickuuid SET DATA TYPE uuid USING pickuuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN creatoruuid SET DATA TYPE uuid USING creatoruuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ADD PRIMARY KEY (pickuuid);
+
+-- Userprofile
+ALTER TABLE userprofile DROP CONSTRAINT userprofile_pkey;
+ALTER TABLE userprofile ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profilePartner" SET DATA TYPE uuid USING "profilePartner"::uuid;
+-- Force column conversions
+ALTER TABLE userprofile ALTER COLUMN "profileAllowPublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileMaturePublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileImage" SET DATA TYPE uuid USING "profileImage"::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profileFirstImage" SET DATA TYPE uuid USING "profileFirstImage"::uuid;
+ALTER TABLE userprofile ADD PRIMARY KEY (useruuid);
+
+-- Userdata
+ALTER TABLE userdata DROP CONSTRAINT userdata_pkey;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ADD PRIMARY KEY ("UserId","TagId");
+
+
+-- Usersettings
+ALTER TABLE usersettings DROP CONSTRAINT usersettings_pkey;
+ALTER TABLE usersettings ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usersettings ALTER COLUMN visible SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE usersettings ADD COLUMN email varchar(254) NOT NULL;
+ALTER TABLE usersettings ADD PRIMARY KEY (useruuid);
+
+COMMIT;
+
+
+:VERSION 5         # -------------------------------
+
+BEGIN;
+
+ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+
+COMMIT;
+=======
+>>>>>>> avn/ubitvar
diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
index 325ed0d..df9d821 100644
--- a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
@@ -25,3 +25,56 @@ CREATE TABLE XAssetsData (
 );
 
 COMMIT;
+
+
+:VERSION 2
+
+BEGIN;
+
+ALTER TABLE xassetsmeta ALTER COLUMN "Local" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Temporary" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Hash" SET DATA TYPE char(66);
+ALTER TABLE xassetsdata ALTER COLUMN "Hash" SET DATA TYPE char(66);
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN;
+
+ALTER TABLE xassetsmeta RENAME COLUMN "ID" TO id;
+ALTER TABLE xassetsmeta RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsmeta RENAME COLUMN "Name" TO name;
+ALTER TABLE xassetsmeta RENAME COLUMN "Description" TO description;
+ALTER TABLE xassetsmeta RENAME COLUMN "Local" to local;
+ALTER TABLE xassetsmeta RENAME COLUMN "Temporary" TO temporary;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreateTime" TO create_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AccessTime" TO access_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AssetFlags" TO asset_flags;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreatorID" TO creatorid;
+ALTER TABLE xassetsmeta DROP CONSTRAINT xassetsmeta_pkey;
+ALTER TABLE xassetsmeta ADD PRIMARY KEY (id);
+
+
+ALTER TABLE xassetsdata RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsdata RENAME COLUMN "Data" TO data;
+ALTER TABLE xassetsdata DROP CONSTRAINT xassetsdata_pkey;
+ALTER TABLE xassetsdata ADD PRIMARY KEY (hash);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN;
+
+ALTER TABLE xassetsmeta ALTER COLUMN id SET DATA TYPE uuid USING id::uuid;
+ALTER TABLE xassetsmeta ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+ALTER TABLE xassetsdata ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+
+COMMIT;
+
+:VERSION 5
+
+BEGIN;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
index 4573f71..74b07c3 100644
--- a/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
+++ b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
@@ -92,3 +92,120 @@ BEGIN;
 
 
 COMMIT;
+
+
+
+:VERSION 3
+
+BEGIN;
+
+-- Not a pretty way to do this, but it did not work as-is
+-- and nothing was found about converting between existing data
+-- and the new type.
+-- Since there should be nothing to preserve ...
+
+DROP TABLE IF EXISTS os_groups_groups CASCADE;
+
+CREATE TABLE os_groups_groups (
+  "GroupID" uuid PRIMARY KEY NOT NULL,
+  "Location" varchar(255) NOT NULL DEFAULT '',
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Charter" text NOT NULL,
+  "InsigniaID" uuid NOT NULL,
+  "FounderID" uuid NOT NULL,
+  "MembershipFee" integer NOT NULL DEFAULT '0',
+  "OpenEnrollment" varchar(255) NOT NULL DEFAULT '',
+  "ShowInList" integer NOT NULL DEFAULT '0',
+  "AllowPublish" integer NOT NULL DEFAULT '0',
+  "MaturePublish" integer NOT NULL DEFAULT '0',
+  "OwnerRoleID" uuid NOT NULL
+);
+
+
+DROP TABLE IF EXISTS os_groups_membership;
+
+CREATE TABLE os_groups_membership (
+  "GroupID"uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "SelectedRoleID" uuid NOT NULL,
+  "Contribution" integer NOT NULL DEFAULT '0',
+  "ListInProfile" integer NOT NULL DEFAULT '1',
+  "AcceptNotices" integer NOT NULL DEFAULT '1',
+  "AccessToken" uuid NOT NULL,
+  constraint os_groupmemberpk PRIMARY KEY ("GroupID", "PrincipalID")
+);
+
+
+
+DROP TABLE IF EXISTS os_groups_roles;
+
+CREATE TABLE os_groups_roles (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Description" varchar(255) NOT NULL DEFAULT '',
+  "Title" varchar(255) NOT NULL DEFAULT '',
+  "Powers" varchar(36) NOT NULL DEFAULT '',
+  constraint os_grouprolepk PRIMARY KEY  ("GroupID","RoleID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_rolemembership;
+
+CREATE TABLE os_groups_rolemembership (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  constraint os_grouprolememberpk PRIMARY KEY  ("GroupID","RoleID","PrincipalID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_invites;
+
+CREATE TABLE os_groups_invites (
+  "InviteID" uuid NOT NULL,
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "TMStamp" timestamp NOT NULL DEFAULT now(),
+  constraint os_groupinvitespk PRIMARY KEY  ("InviteID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_notices;
+
+CREATE TABLE os_groups_notices (
+  "GroupID" uuid NOT NULL,
+  "NoticeID" uuid NOT NULL,
+  "TMStamp" integer NOT NULL DEFAULT '0',
+  "FromName" varchar(255) NOT NULL DEFAULT '',
+  "Subject" varchar(255) NOT NULL DEFAULT '',
+  "Message" text NOT NULL,
+  "HasAttachment" integer NOT NULL DEFAULT '0',
+  "AttachmentType" integer NOT NULL DEFAULT '0',
+  "AttachmentName" varchar(128) NOT NULL DEFAULT '',
+  "AttachmentItemID" uuid NOT NULL,
+  "AttachmentOwnerID" varchar(255) NOT NULL DEFAULT '',
+  constraint os_groupsnoticespk PRIMARY KEY  ("NoticeID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_principals;
+
+CREATE TABLE os_groups_principals (
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "ActiveGroupID" uuid NOT NULL,
+  constraint os_groupprincpk PRIMARY KEY  ("PrincipalID")
+);
+
+COMMIT;
+
+:VERSION 4
+
+BEGIN;
+
+ALTER TABLE IF EXISTS os_groups_notices  
+  ALTER COLUMN "AttachmentItemID" SET DEFAULT '00000000-0000-0000-0000-000000000000'
+;
+
+COMMIT;