From 134e94a7e91adb7b4eb153c2df9b70096c4edfb4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 20 Feb 2016 19:08:02 -0800
Subject: Flatten migrations for MySQL.

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Data/MySQL/Resources/UserAccount.migrations
---
 OpenSim/Data/MySQL/Resources/Presence.migrations | 37 +++++++-----------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to 'OpenSim/Data/MySQL/Resources/Presence.migrations')

diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index c4e40fa..69e33e0 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -1,31 +1,16 @@
-:VERSION 1         # -------------------------- 
+:VERSION 4         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE `Presence` (
-    `UserID` VARCHAR(255) NOT NULL,
-    `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
-) ENGINE=InnoDB;
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT;
-
-:VERSION 2         # -------------------------- 
-
-BEGIN;
-
-ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp;
-
-COMMIT;
-
-:VERSION 3         # -------------------------- 
-
-BEGIN;
-
-CREATE INDEX RegionID ON Presence(RegionID);
+CREATE TABLE IF NOT EXISTS `presence` (
+  `UserID` varchar(255) NOT NULL,
+  `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `SessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `SecureSessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `LastSeen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  UNIQUE KEY `SessionID` (`SessionID`),
+  KEY `UserID` (`UserID`),
+  KEY `RegionID` (`RegionID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
-- 
cgit v1.1