diff options
author | Jeff Ames | 2008-06-13 00:21:53 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-13 00:21:53 +0000 |
commit | 64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 (patch) | |
tree | 74c4e8fdc25dc28da7c63cbc9d97141c0f344938 /OpenSim/Data | |
parent | look mom, migrations in action. This adds a couple of indexes (diff) | |
download | opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.zip opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.gz opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.bz2 opensim-SC-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.xz |
Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/Migration.cs | 23 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 2 |
3 files changed, 18 insertions, 9 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 54d4970..d23200c 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -129,9 +129,12 @@ namespace OpenSim.Data | |||
129 | cmd.CommandText = kvp.Value; | 129 | cmd.CommandText = kvp.Value; |
130 | cmd.ExecuteNonQuery(); | 130 | cmd.ExecuteNonQuery(); |
131 | 131 | ||
132 | if (version == 0) { | 132 | if (version == 0) |
133 | { | ||
133 | InsertVersion(_type, newversion); | 134 | InsertVersion(_type, newversion); |
134 | } else { | 135 | } |
136 | else | ||
137 | { | ||
135 | UpdateVersion(_type, newversion); | 138 | UpdateVersion(_type, newversion); |
136 | } | 139 | } |
137 | version = newversion; | 140 | version = newversion; |
@@ -149,7 +152,7 @@ namespace OpenSim.Data | |||
149 | if (m.Success) | 152 | if (m.Success) |
150 | { | 153 | { |
151 | int MigrationVersion = int.Parse(m.Groups[1].ToString()); | 154 | int MigrationVersion = int.Parse(m.Groups[1].ToString()); |
152 | if ( MigrationVersion > max ) | 155 | if (MigrationVersion > max) |
153 | max = MigrationVersion; | 156 | max = MigrationVersion; |
154 | } | 157 | } |
155 | } | 158 | } |
@@ -160,9 +163,12 @@ namespace OpenSim.Data | |||
160 | { | 163 | { |
161 | get { return FindVersion(_type); } | 164 | get { return FindVersion(_type); } |
162 | set { | 165 | set { |
163 | if (Version < 1) { | 166 | if (Version < 1) |
167 | { | ||
164 | InsertVersion(_type, value); | 168 | InsertVersion(_type, value); |
165 | } else { | 169 | } |
170 | else | ||
171 | { | ||
166 | UpdateVersion(_type, value); | 172 | UpdateVersion(_type, value); |
167 | } | 173 | } |
168 | } | 174 | } |
@@ -172,7 +178,8 @@ namespace OpenSim.Data | |||
172 | { | 178 | { |
173 | int version = 0; | 179 | int version = 0; |
174 | DbCommand cmd = _conn.CreateCommand(); | 180 | DbCommand cmd = _conn.CreateCommand(); |
175 | try { | 181 | try |
182 | { | ||
176 | cmd.CommandText = "select version from migrations where name='" + type + "' limit 1"; | 183 | cmd.CommandText = "select version from migrations where name='" + type + "' limit 1"; |
177 | using (IDataReader reader = cmd.ExecuteReader()) | 184 | using (IDataReader reader = cmd.ExecuteReader()) |
178 | { | 185 | { |
@@ -182,7 +189,9 @@ namespace OpenSim.Data | |||
182 | } | 189 | } |
183 | reader.Close(); | 190 | reader.Close(); |
184 | } | 191 | } |
185 | } catch { | 192 | } |
193 | catch | ||
194 | { | ||
186 | // Something went wrong, so we're version 0 | 195 | // Something went wrong, so we're version 0 |
187 | } | 196 | } |
188 | return version; | 197 | return version; |
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 780b96f..de0826f 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Data.MySQL | |||
132 | 132 | ||
133 | // if there are no tables, get out of here and let | 133 | // if there are no tables, get out of here and let |
134 | // migrations do their job | 134 | // migrations do their job |
135 | if( | 135 | if ( |
136 | tableList["inventoryfolders"] == null && | 136 | tableList["inventoryfolders"] == null && |
137 | tableList["inventoryitems"] == null | 137 | tableList["inventoryitems"] == null |
138 | ) | 138 | ) |
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 279ff71..05874f8 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -138,7 +138,7 @@ namespace OpenSim.Data.MySQL | |||
138 | 138 | ||
139 | // if there are no tables, get out of here and let | 139 | // if there are no tables, get out of here and let |
140 | // migrations do their job | 140 | // migrations do their job |
141 | if( | 141 | if ( |
142 | tableList[m_agentsTableName] == null && | 142 | tableList[m_agentsTableName] == null && |
143 | tableList[m_usersTableName] == null && | 143 | tableList[m_usersTableName] == null && |
144 | tableList[m_userFriendsTableName] == null && | 144 | tableList[m_userFriendsTableName] == null && |