From 5ddba2a3a780bdfd02a7a99e00edd87d191b16d3 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 28 Sep 2008 22:07:05 +0000
Subject: Mantis#2291. Thank you kindly, StrawberryFride for a patch that
 solves: User server won't start up for a MSSQL grid migrating from a
 significantly older version to current version due to duplication in three of
 the migrations code files. Patch included takes out the duplicated code from
 the three files so a smooth update should happen on start up.

---
 OpenSim/Data/MSSQL/Resources/002_UserStore.sql |  9 --------
 OpenSim/Data/MSSQL/Resources/003_UserStore.sql | 15 -------------
 OpenSim/Data/MSSQL/Resources/004_UserStore.sql | 29 --------------------------
 3 files changed, 53 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql b/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
index a3b5868..402eddf 100644
--- a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
@@ -7,12 +7,3 @@ ALTER TABLE users ADD customType varchar(32) not null default '';
 ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
 
 COMMIT
-BEGIN TRANSACTION
-
-ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE users ADD userFlags int NOT NULL default 0;
-ALTER TABLE users ADD godLevel int NOT NULL default 0;
-ALTER TABLE users ADD customType varchar(32) not null default '';
-ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql b/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
index c2821e6..cb507c9 100644
--- a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
@@ -13,18 +13,3 @@ CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
 
 
 COMMIT
-BEGIN TRANSACTION
-
-CREATE TABLE [avatarattachments] (
-	[UUID] varchar(36) NOT NULL
-	, [attachpoint] int NOT NULL
-	, [item] varchar(36) NOT NULL
-	, [asset] varchar(36) NOT NULL)
-
-CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
-	(
-	UUID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql b/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
index f3e223e..08f1a1d 100644
--- a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
@@ -27,32 +27,3 @@ CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
 	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 
 COMMIT
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_userfriends
-	(
-	ownerID varchar(36) NOT NULL,
-	friendID varchar(36) NOT NULL,
-	friendPerms int NOT NULL,
-	datetimestamp int NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.userfriends)
-	 EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
-		SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.userfriends
-
-EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
-	(
-	ownerID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
-	(
-	friendID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-- 
cgit v1.1