diff options
author | Marck | 2011-06-30 20:05:02 +0200 |
---|---|---|
committer | Marck | 2011-07-16 09:49:38 +0200 |
commit | dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309 (patch) | |
tree | 8692f848f8ee55db8745c2f975bdbadf29fddb1c /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
parent | Replace ifs in SOG.GroupResize() with Math.Min() (diff) | |
download | opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.zip opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.gz opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.bz2 opensim-SC_OLD-dd2564d7ecd4fa628daaacfd612c1a8c3e0ef309.tar.xz |
refactor: Pull up Assembly of the SQLite classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 377c680..5618772 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -74,6 +74,11 @@ namespace OpenSim.Data.SQLite | |||
74 | 74 | ||
75 | private String m_connectionString; | 75 | private String m_connectionString; |
76 | 76 | ||
77 | protected virtual Assembly Assembly | ||
78 | { | ||
79 | get { return GetType().Assembly; } | ||
80 | } | ||
81 | |||
77 | public SQLiteSimulationData() | 82 | public SQLiteSimulationData() |
78 | { | 83 | { |
79 | } | 84 | } |
@@ -132,8 +137,7 @@ namespace OpenSim.Data.SQLite | |||
132 | SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); | 137 | SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn); |
133 | regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); | 138 | regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd); |
134 | // This actually does the roll forward assembly stuff | 139 | // This actually does the roll forward assembly stuff |
135 | Assembly assem = GetType().Assembly; | 140 | Migration m = new Migration(m_conn, Assembly, "RegionStore"); |
136 | Migration m = new Migration(m_conn, assem, "RegionStore"); | ||
137 | m.Update(); | 141 | m.Update(); |
138 | 142 | ||
139 | lock (ds) | 143 | lock (ds) |