diff options
author | Diva Canto | 2011-03-08 09:02:29 -0800 |
---|---|---|
committer | Diva Canto | 2011-03-08 09:02:29 -0800 |
commit | 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 (patch) | |
tree | 5181ed92a1bc682cd5d7ae383bf016fd6b8b6865 /OpenSim/Data | |
parent | factor out SetPartMediaFlags() function in MoapModule. (diff) | |
download | opensim-SC-9923a2ff1002d722ccebea8bf4d71718ed4e2a03.zip opensim-SC-9923a2ff1002d722ccebea8bf4d71718ed4e2a03.tar.gz opensim-SC-9923a2ff1002d722ccebea8bf4d71718ed4e2a03.tar.bz2 opensim-SC-9923a2ff1002d722ccebea8bf4d71718ed4e2a03.tar.xz |
Pull up Assembly of the MySQL 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 just a refactor -- no functional changes whatsoever.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAuthenticationData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 9 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 8 |
6 files changed, 39 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index ed92f3e..e740232 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -47,6 +47,11 @@ namespace OpenSim.Data.MySQL | |||
47 | private string m_connectionString; | 47 | private string m_connectionString; |
48 | private object m_dbLock = new object(); | 48 | private object m_dbLock = new object(); |
49 | 49 | ||
50 | protected virtual Assembly Assembly | ||
51 | { | ||
52 | get { return GetType().Assembly; } | ||
53 | } | ||
54 | |||
50 | #region IPlugin Members | 55 | #region IPlugin Members |
51 | 56 | ||
52 | public override string Version { get { return "1.0.0.0"; } } | 57 | public override string Version { get { return "1.0.0.0"; } } |
@@ -66,13 +71,10 @@ namespace OpenSim.Data.MySQL | |||
66 | { | 71 | { |
67 | m_connectionString = connect; | 72 | m_connectionString = connect; |
68 | 73 | ||
69 | // This actually does the roll forward assembly stuff | ||
70 | Assembly assem = GetType().Assembly; | ||
71 | |||
72 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 74 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
73 | { | 75 | { |
74 | dbcon.Open(); | 76 | dbcon.Open(); |
75 | Migration m = new Migration(dbcon, assem, "AssetStore"); | 77 | Migration m = new Migration(dbcon, Assembly, "AssetStore"); |
76 | m.Update(); | 78 | m.Update(); |
77 | } | 79 | } |
78 | } | 80 | } |
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs index 5056aee..8d82f61 100644 --- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs +++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
31 | using System.Data; | 32 | using System.Data; |
32 | using OpenMetaverse; | 33 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
@@ -42,6 +43,11 @@ namespace OpenSim.Data.MySQL | |||
42 | private int m_LastExpire; | 43 | private int m_LastExpire; |
43 | // private string m_connectionString; | 44 | // private string m_connectionString; |
44 | 45 | ||
46 | protected virtual Assembly Assembly | ||
47 | { | ||
48 | get { return GetType().Assembly; } | ||
49 | } | ||
50 | |||
45 | public MySqlAuthenticationData(string connectionString, string realm) | 51 | public MySqlAuthenticationData(string connectionString, string realm) |
46 | : base(connectionString) | 52 | : base(connectionString) |
47 | { | 53 | { |
@@ -51,7 +57,7 @@ namespace OpenSim.Data.MySQL | |||
51 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 57 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
52 | { | 58 | { |
53 | dbcon.Open(); | 59 | dbcon.Open(); |
54 | Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore"); | 60 | Migration m = new Migration(dbcon, Assembly, "AuthStore"); |
55 | m.Update(); | 61 | m.Update(); |
56 | } | 62 | } |
57 | } | 63 | } |
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index c42c687..de72a6a 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
@@ -54,6 +54,11 @@ namespace OpenSim.Data.MySQL | |||
54 | private Dictionary<string, FieldInfo> m_FieldMap = | 54 | private Dictionary<string, FieldInfo> m_FieldMap = |
55 | new Dictionary<string, FieldInfo>(); | 55 | new Dictionary<string, FieldInfo>(); |
56 | 56 | ||
57 | protected virtual Assembly Assembly | ||
58 | { | ||
59 | get { return GetType().Assembly; } | ||
60 | } | ||
61 | |||
57 | public MySQLEstateStore() | 62 | public MySQLEstateStore() |
58 | { | 63 | { |
59 | } | 64 | } |
@@ -82,8 +87,7 @@ namespace OpenSim.Data.MySQL | |||
82 | { | 87 | { |
83 | dbcon.Open(); | 88 | dbcon.Open(); |
84 | 89 | ||
85 | Assembly assem = GetType().Assembly; | 90 | Migration m = new Migration(dbcon, Assembly, "EstateStore"); |
86 | Migration m = new Migration(dbcon, assem, "EstateStore"); | ||
87 | m.Update(); | 91 | m.Update(); |
88 | 92 | ||
89 | Type t = typeof(EstateSettings); | 93 | Type t = typeof(EstateSettings); |
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 7c23a47..8efe4e9 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
@@ -46,6 +46,11 @@ namespace OpenSim.Data.MySQL | |||
46 | protected string m_Realm; | 46 | protected string m_Realm; |
47 | protected FieldInfo m_DataField = null; | 47 | protected FieldInfo m_DataField = null; |
48 | 48 | ||
49 | protected virtual Assembly Assembly | ||
50 | { | ||
51 | get { return GetType().Assembly; } | ||
52 | } | ||
53 | |||
49 | public MySQLGenericTableHandler(string connectionString, | 54 | public MySQLGenericTableHandler(string connectionString, |
50 | string realm, string storeName) : base(connectionString) | 55 | string realm, string storeName) : base(connectionString) |
51 | { | 56 | { |
@@ -57,7 +62,7 @@ namespace OpenSim.Data.MySQL | |||
57 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 62 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
58 | { | 63 | { |
59 | dbcon.Open(); | 64 | dbcon.Open(); |
60 | Migration m = new Migration(dbcon, GetType().Assembly, storeName); | 65 | Migration m = new Migration(dbcon, Assembly, storeName); |
61 | m.Update(); | 66 | m.Update(); |
62 | } | 67 | } |
63 | } | 68 | } |
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index d04e3dc..c20c392 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -29,6 +29,8 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Data; | 31 | using System.Data; |
32 | using System.Reflection; | ||
33 | |||
32 | using OpenMetaverse; | 34 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
34 | using OpenSim.Data; | 36 | using OpenSim.Data; |
@@ -42,6 +44,11 @@ namespace OpenSim.Data.MySQL | |||
42 | private List<string> m_ColumnNames; | 44 | private List<string> m_ColumnNames; |
43 | //private string m_connectionString; | 45 | //private string m_connectionString; |
44 | 46 | ||
47 | protected virtual Assembly Assembly | ||
48 | { | ||
49 | get { return GetType().Assembly; } | ||
50 | } | ||
51 | |||
45 | public MySqlRegionData(string connectionString, string realm) | 52 | public MySqlRegionData(string connectionString, string realm) |
46 | : base(connectionString) | 53 | : base(connectionString) |
47 | { | 54 | { |
@@ -51,7 +58,7 @@ namespace OpenSim.Data.MySQL | |||
51 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 58 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
52 | { | 59 | { |
53 | dbcon.Open(); | 60 | dbcon.Open(); |
54 | Migration m = new Migration(dbcon, GetType().Assembly, "GridStore"); | 61 | Migration m = new Migration(dbcon, Assembly, "GridStore"); |
55 | m.Update(); | 62 | m.Update(); |
56 | } | 63 | } |
57 | } | 64 | } |
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 02997b3..e14d775 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -52,6 +52,11 @@ namespace OpenSim.Data.MySQL | |||
52 | private string m_connectionString; | 52 | private string m_connectionString; |
53 | private object m_dbLock = new object(); | 53 | private object m_dbLock = new object(); |
54 | 54 | ||
55 | protected virtual Assembly Assembly | ||
56 | { | ||
57 | get { return GetType().Assembly; } | ||
58 | } | ||
59 | |||
55 | public MySQLSimulationData() | 60 | public MySQLSimulationData() |
56 | { | 61 | { |
57 | } | 62 | } |
@@ -71,8 +76,7 @@ namespace OpenSim.Data.MySQL | |||
71 | 76 | ||
72 | // Apply new Migrations | 77 | // Apply new Migrations |
73 | // | 78 | // |
74 | Assembly assem = GetType().Assembly; | 79 | Migration m = new Migration(dbcon, Assembly, "RegionStore"); |
75 | Migration m = new Migration(dbcon, assem, "RegionStore"); | ||
76 | m.Update(); | 80 | m.Update(); |
77 | 81 | ||
78 | // Clean dropped attachments | 82 | // Clean dropped attachments |