aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-05-20 20:24:50 -0700
committerDiva Canto2010-05-20 20:24:50 -0700
commit213e372253eb8a59f0afb627e11b0a5b6f6b088f (patch)
tree14fa5d7df3f94380d741f68241f98f5d3088b0c2
parentRemoved sessionID from GridUserservice again. Removed parcel crossing detecti... (diff)
downloadopensim-SC_OLD-213e372253eb8a59f0afb627e11b0a5b6f6b088f.zip
opensim-SC_OLD-213e372253eb8a59f0afb627e11b0a5b6f6b088f.tar.gz
opensim-SC_OLD-213e372253eb8a59f0afb627e11b0a5b6f6b088f.tar.bz2
opensim-SC_OLD-213e372253eb8a59f0afb627e11b0a5b6f6b088f.tar.xz
Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.
-rw-r--r--OpenSim/Data/MySQL/Resources/007_AssetStore.sql5
-rw-r--r--OpenSim/Data/MySQL/Resources/033_RegionStore.sql3
-rw-r--r--OpenSim/Data/MySQL/Resources/GridUserStore.migrations (renamed from OpenSim/Data/MySQL/Resources/001_GridUserStore.sql)2
-rw-r--r--OpenSim/Data/MySQL/Resources/Presence.migrations25
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations5
5 files changed, 8 insertions, 32 deletions
diff --git a/OpenSim/Data/MySQL/Resources/007_AssetStore.sql b/OpenSim/Data/MySQL/Resources/007_AssetStore.sql
deleted file mode 100644
index f06121a..0000000
--- a/OpenSim/Data/MySQL/Resources/007_AssetStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
1BEGIN;
2
3ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
4
5COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/033_RegionStore.sql b/OpenSim/Data/MySQL/Resources/033_RegionStore.sql
deleted file mode 100644
index 2832b41..0000000
--- a/OpenSim/Data/MySQL/Resources/033_RegionStore.sql
+++ /dev/null
@@ -1,3 +0,0 @@
1BEGIN;
2ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
3COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index ce4ab96..32b85ee 100644
--- a/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -1,3 +1,5 @@
1:VERSION 1 # --------------------------
2
1BEGIN; 3BEGIN;
2 4
3CREATE TABLE `GridUser` ( 5CREATE TABLE `GridUser` (
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index d513024..91f7de5 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -4,32 +4,11 @@ BEGIN;
4 4
5CREATE TABLE `Presence` ( 5CREATE TABLE `Presence` (
6 `UserID` VARCHAR(255) NOT NULL, 6 `UserID` VARCHAR(255) NOT NULL,
7 `RegionID` CHAR(36) NOT NULL, 7 `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
8 `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 8 `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
9 `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 9 `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
10 `Online` CHAR(5) NOT NULL DEFAULT 'false',
11 `Login` CHAR(16) NOT NULL DEFAULT '0',
12 `Logout` CHAR(16) NOT NULL DEFAULT '0',
13 `Position` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
14 `LookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>'
15) ENGINE=InnoDB; 10) ENGINE=InnoDB;
16 11
17COMMIT;
18
19:VERSION 2 # --------------------------
20
21BEGIN;
22
23ALTER TABLE Presence ADD COLUMN `HomeRegionID` CHAR(36) NOT NULL;
24ALTER TABLE Presence ADD COLUMN `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
25ALTER TABLE Presence ADD COLUMN `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
26
27COMMIT;
28
29:VERSION 3 # --------------------------
30
31BEGIN;
32
33CREATE UNIQUE INDEX SessionID ON Presence(SessionID); 12CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
34CREATE INDEX UserID ON Presence(UserID); 13CREATE INDEX UserID ON Presence(UserID);
35 14
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 3dab67e..baeeedd 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -801,6 +801,9 @@ BEGIN;
801ALTER TABLE estate_settings AUTO_INCREMENT = 100; 801ALTER TABLE estate_settings AUTO_INCREMENT = 100;
802COMMIT; 802COMMIT;
803 803
804:VERSION 33 #---------------------
804 805
805 806BEGIN;
807ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
808COMMIT;
806 809