aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-06-12 18:44:58 +0000
committerSean Dague2008-06-12 18:44:58 +0000
commit202a4bec13a37d8a2f702f879a5e2b0d2e74085a (patch)
treef19f849a6d5f742e15100103defbf6b73d50559b /OpenSim
parent* minor: Remove and tidy duplicate 'storing object to scene' messages in log (diff)
downloadopensim-SC_OLD-202a4bec13a37d8a2f702f879a5e2b0d2e74085a.zip
opensim-SC_OLD-202a4bec13a37d8a2f702f879a5e2b0d2e74085a.tar.gz
opensim-SC_OLD-202a4bec13a37d8a2f702f879a5e2b0d2e74085a.tar.bz2
opensim-SC_OLD-202a4bec13a37d8a2f702f879a5e2b0d2e74085a.tar.xz
Fix mysql migrations. This is tested with an existing up to date schema,
and no schema. It should also work with a non up to date schema as well. Btw, meetings in which I can get code done are the right kind of meetings.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs1
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs2
-rw-r--r--OpenSim/Data/MySQL/Resources/001_AssetStore.sql6
-rw-r--r--OpenSim/Data/MySQL/Resources/001_InventoryStore.sql9
-rw-r--r--OpenSim/Data/MySQL/Resources/001_RegionStore.sql16
-rw-r--r--OpenSim/Data/MySQL/Resources/001_UserStore.sql13
7 files changed, 32 insertions, 17 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index e9bc365..01cd605 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -90,6 +90,7 @@ namespace OpenSim.Data.MySQL
90 90
91 m_log.Info("[REGION DB]: MySql - connecting: " + connectionstring); 91 m_log.Info("[REGION DB]: MySql - connecting: " + connectionstring);
92 m_connection = new MySqlConnection(connectionstring); 92 m_connection = new MySqlConnection(connectionstring);
93 m_connection.Open();
93 94
94 // This actually does the roll forward assembly stuff 95 // This actually does the roll forward assembly stuff
95 Assembly assem = GetType().Assembly; 96 Assembly assem = GetType().Assembly;
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 1b86abf..780b96f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Data.MySQL
72 72
73 // This actually does the roll forward assembly stuff 73 // This actually does the roll forward assembly stuff
74 Assembly assem = GetType().Assembly; 74 Assembly assem = GetType().Assembly;
75 Migration m = new Migration(database.Connection, assem, "AssetStore"); 75 Migration m = new Migration(database.Connection, assem, "InventoryStore");
76 76
77 // TODO: After rev 6000, remove this. People should have 77 // TODO: After rev 6000, remove this. People should have
78 // been rolled onto the new migration code by then. 78 // been rolled onto the new migration code by then.
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 7d2da3a..279ff71 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Data.MySQL
107 107
108 // This actually does the roll forward assembly stuff 108 // This actually does the roll forward assembly stuff
109 Assembly assem = GetType().Assembly; 109 Assembly assem = GetType().Assembly;
110 Migration m = new Migration(database.Connection, assem, "AssetStore"); 110 Migration m = new Migration(database.Connection, assem, "UserStore");
111 111
112 // TODO: After rev 6000, remove this. People should have 112 // TODO: After rev 6000, remove this. People should have
113 // been rolled onto the new migration code by then. 113 // been rolled onto the new migration code by then.
diff --git a/OpenSim/Data/MySQL/Resources/001_AssetStore.sql b/OpenSim/Data/MySQL/Resources/001_AssetStore.sql
index 2c750fe..6a9a127 100644
--- a/OpenSim/Data/MySQL/Resources/001_AssetStore.sql
+++ b/OpenSim/Data/MySQL/Resources/001_AssetStore.sql
@@ -1,3 +1,5 @@
1BEGIN;
2
1CREATE TABLE `assets` ( 3CREATE TABLE `assets` (
2 `id` binary(16) NOT NULL, 4 `id` binary(16) NOT NULL,
3 `name` varchar(64) NOT NULL, 5 `name` varchar(64) NOT NULL,
@@ -8,4 +10,6 @@ CREATE TABLE `assets` (
8 `temporary` tinyint(1) NOT NULL, 10 `temporary` tinyint(1) NOT NULL,
9 `data` longblob NOT NULL, 11 `data` longblob NOT NULL,
10 PRIMARY KEY (`id`) 12 PRIMARY KEY (`id`)
11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; \ No newline at end of file 13) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
14
15COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql b/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql
index 84701db..40dc91c 100644
--- a/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql
+++ b/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql
@@ -1,3 +1,5 @@
1BEGIN;
2
1CREATE TABLE `inventoryfolders` ( 3CREATE TABLE `inventoryfolders` (
2 `folderID` varchar(36) NOT NULL default '', 4 `folderID` varchar(36) NOT NULL default '',
3 `agentID` varchar(36) default NULL, 5 `agentID` varchar(36) default NULL,
@@ -8,7 +10,8 @@ CREATE TABLE `inventoryfolders` (
8 PRIMARY KEY (`folderID`), 10 PRIMARY KEY (`folderID`),
9 KEY `owner` (`agentID`), 11 KEY `owner` (`agentID`),
10 KEY `parent` (`parentFolderID`) 12 KEY `parent` (`parentFolderID`)
11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2'; 13) ENGINE=InnoDB DEFAULT CHARSET=utf8;
14
12CREATE TABLE `inventoryitems` ( 15CREATE TABLE `inventoryitems` (
13 `inventoryID` varchar(36) NOT NULL default '', 16 `inventoryID` varchar(36) NOT NULL default '',
14 `assetID` varchar(36) default NULL, 17 `assetID` varchar(36) default NULL,
@@ -32,4 +35,6 @@ CREATE TABLE `inventoryitems` (
32 PRIMARY KEY (`inventoryID`), 35 PRIMARY KEY (`inventoryID`),
33 KEY `owner` (`avatarID`), 36 KEY `owner` (`avatarID`),
34 KEY `folder` (`parentFolderID`) 37 KEY `folder` (`parentFolderID`)
35) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 3'; 38) ENGINE=InnoDB DEFAULT CHARSET=utf8;
39
40COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_RegionStore.sql b/OpenSim/Data/MySQL/Resources/001_RegionStore.sql
index 6604c3b..31164b3 100644
--- a/OpenSim/Data/MySQL/Resources/001_RegionStore.sql
+++ b/OpenSim/Data/MySQL/Resources/001_RegionStore.sql
@@ -1,3 +1,5 @@
1BEGIN;
2
1CREATE TABLE `prims` ( 3CREATE TABLE `prims` (
2 `UUID` varchar(255) NOT NULL, 4 `UUID` varchar(255) NOT NULL,
3 `RegionUUID` varchar(255) default NULL, 5 `RegionUUID` varchar(255) default NULL,
@@ -46,7 +48,7 @@ CREATE TABLE `prims` (
46 `SitTargetOrientY` float default NULL, 48 `SitTargetOrientY` float default NULL,
47 `SitTargetOrientZ` float default NULL, 49 `SitTargetOrientZ` float default NULL,
48 PRIMARY KEY (`UUID`) 50 PRIMARY KEY (`UUID`)
49) ENGINE=MyISAM DEFAULT CHARSET=latin1 51) ENGINE=MyISAM DEFAULT CHARSET=latin1;
50 52
51CREATE TABLE `primshapes` ( 53CREATE TABLE `primshapes` (
52 `UUID` varchar(255) NOT NULL, 54 `UUID` varchar(255) NOT NULL,
@@ -77,7 +79,7 @@ CREATE TABLE `primshapes` (
77 `Texture` longblob, 79 `Texture` longblob,
78 `ExtraParams` longblob, 80 `ExtraParams` longblob,
79 PRIMARY KEY (`UUID`) 81 PRIMARY KEY (`UUID`)
80) ENGINE=MyISAM DEFAULT CHARSET=latin1 82) ENGINE=MyISAM DEFAULT CHARSET=latin1;
81 83
82CREATE TABLE `primitems` ( 84CREATE TABLE `primitems` (
83 `itemID` varchar(255) NOT NULL, 85 `itemID` varchar(255) NOT NULL,
@@ -99,13 +101,13 @@ CREATE TABLE `primitems` (
99 `everyonePermissions` int(11) default NULL, 101 `everyonePermissions` int(11) default NULL,
100 `groupPermissions` int(11) default NULL, 102 `groupPermissions` int(11) default NULL,
101 PRIMARY KEY (`itemID`) 103 PRIMARY KEY (`itemID`)
102) ENGINE=MyISAM DEFAULT CHARSET=latin1 104) ENGINE=MyISAM DEFAULT CHARSET=latin1;
103 105
104CREATE TABLE `terrain` ( 106CREATE TABLE `terrain` (
105 `RegionUUID` varchar(255) default NULL, 107 `RegionUUID` varchar(255) default NULL,
106 `Revision` int(11) default NULL, 108 `Revision` int(11) default NULL,
107 `Heightfield` longblob 109 `Heightfield` longblob
108) ENGINE=MyISAM DEFAULT CHARSET=latin1 110) ENGINE=MyISAM DEFAULT CHARSET=latin1;
109 111
110CREATE TABLE `land` ( 112CREATE TABLE `land` (
111 `UUID` varchar(255) NOT NULL, 113 `UUID` varchar(255) NOT NULL,
@@ -141,10 +143,12 @@ CREATE TABLE `land` (
141 `UserLookAtZ` float default NULL, 143 `UserLookAtZ` float default NULL,
142 `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000', 144 `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
143 PRIMARY KEY (`UUID`) 145 PRIMARY KEY (`UUID`)
144) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2' 146) ENGINE=InnoDB DEFAULT CHARSET=utf8;
145 147
146CREATE TABLE `landaccesslist` ( 148CREATE TABLE `landaccesslist` (
147 `LandUUID` varchar(255) default NULL, 149 `LandUUID` varchar(255) default NULL,
148 `AccessUUID` varchar(255) default NULL, 150 `AccessUUID` varchar(255) default NULL,
149 `Flags` int(11) default NULL 151 `Flags` int(11) default NULL
150) ENGINE=MyISAM DEFAULT CHARSET=latin1 \ No newline at end of file 152) ENGINE=MyISAM DEFAULT CHARSET=latin1;
153
154COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_UserStore.sql b/OpenSim/Data/MySQL/Resources/001_UserStore.sql
index 7ab628f..29ebc7d 100644
--- a/OpenSim/Data/MySQL/Resources/001_UserStore.sql
+++ b/OpenSim/Data/MySQL/Resources/001_UserStore.sql
@@ -1,3 +1,5 @@
1BEGIN;
2
1SET FOREIGN_KEY_CHECKS=0; 3SET FOREIGN_KEY_CHECKS=0;
2-- ---------------------------- 4-- ----------------------------
3-- Table structure for agents 5-- Table structure for agents
@@ -17,7 +19,7 @@ CREATE TABLE `agents` (
17 PRIMARY KEY (`UUID`), 19 PRIMARY KEY (`UUID`),
18 UNIQUE KEY `session` (`sessionID`), 20 UNIQUE KEY `session` (`sessionID`),
19 UNIQUE KEY `ssession` (`secureSessionID`) 21 UNIQUE KEY `ssession` (`secureSessionID`)
20) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; 22) ENGINE=InnoDB DEFAULT CHARSET=utf8;
21 23
22-- Create schema avatar_appearance 24-- Create schema avatar_appearance
23-- 25--
@@ -54,10 +56,8 @@ CREATE TABLE `avatarappearance` (
54 Underpants_Asset char(36) NOT NULL, 56 Underpants_Asset char(36) NOT NULL,
55 Skirt_Item char(36) NOT NULL, 57 Skirt_Item char(36) NOT NULL,
56 Skirt_Asset char(36) NOT NULL, 58 Skirt_Asset char(36) NOT NULL,
57
58
59 PRIMARY KEY (`Owner`) 59 PRIMARY KEY (`Owner`)
60) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev.2'; 60) ENGINE=InnoDB DEFAULT CHARSET=utf8;
61 61
62SET FOREIGN_KEY_CHECKS=0; 62SET FOREIGN_KEY_CHECKS=0;
63-- ---------------------------- 63-- ----------------------------
@@ -69,7 +69,7 @@ CREATE TABLE `userfriends` (
69 `friendPerms` INT NOT NULL, 69 `friendPerms` INT NOT NULL,
70 `datetimestamp` INT NOT NULL, 70 `datetimestamp` INT NOT NULL,
71 UNIQUE KEY (`ownerID`, `friendID`) 71 UNIQUE KEY (`ownerID`, `friendID`)
72) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev.1';SET FOREIGN_KEY_CHECKS=0; 72) ENGINE=InnoDB DEFAULT CHARSET=utf8;
73-- ---------------------------- 73-- ----------------------------
74-- Table structure for users 74-- Table structure for users
75-- ---------------------------- 75-- ----------------------------
@@ -99,8 +99,9 @@ CREATE TABLE `users` (
99 `webLoginKey` varchar(36) default NULL, 99 `webLoginKey` varchar(36) default NULL,
100 PRIMARY KEY (`UUID`), 100 PRIMARY KEY (`UUID`),
101 UNIQUE KEY `usernames` (`username`,`lastname`) 101 UNIQUE KEY `usernames` (`username`,`lastname`)
102) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2'; 102) ENGINE=InnoDB DEFAULT CHARSET=utf8;
103 103
104-- ---------------------------- 104-- ----------------------------
105-- Records 105-- Records
106-- ---------------------------- 106-- ----------------------------
107COMMIT; \ No newline at end of file