diff options
Diffstat (limited to 'OpenSim/Framework/Data')
5 files changed, 32 insertions, 11 deletions
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs index c7b6470..d113f14 100644 --- a/OpenSim/Framework/Data/OpenSimDataReader.cs +++ b/OpenSim/Framework/Data/OpenSimDataReader.cs | |||
@@ -4,7 +4,7 @@ using System.Data; | |||
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | 6 | ||
7 | /* | 7 | |
8 | using TribalMedia.Framework.Data; | 8 | using TribalMedia.Framework.Data; |
9 | 9 | ||
10 | namespace OpenSim.Framework.Data | 10 | namespace OpenSim.Framework.Data |
@@ -39,4 +39,4 @@ namespace OpenSim.Framework.Data | |||
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } |
42 | */ | 42 | |
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs index 155bdc1..aba9329 100644 --- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs +++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs | |||
@@ -1,6 +1,8 @@ | |||
1 | using System.Data; | 1 | using System.Data; |
2 | using System.Data.Common; | ||
2 | using libsecondlife; | 3 | using libsecondlife; |
3 | /* | 4 | using MySql.Data.MySqlClient; |
5 | |||
4 | using TribalMedia.Framework.Data; | 6 | using TribalMedia.Framework.Data; |
5 | 7 | ||
6 | namespace OpenSim.Framework.Data | 8 | namespace OpenSim.Framework.Data |
@@ -26,5 +28,25 @@ namespace OpenSim.Framework.Data | |||
26 | return new OpenSimDataReader(reader); | 28 | return new OpenSimDataReader(reader); |
27 | } | 29 | } |
28 | } | 30 | } |
31 | |||
32 | |||
33 | public class MySQLDatabaseMapper : OpenSimDatabaseConnector | ||
34 | { | ||
35 | public MySQLDatabaseMapper(string connectionString) | ||
36 | : base(connectionString) | ||
37 | { | ||
38 | } | ||
39 | |||
40 | public override DbConnection GetNewConnection() | ||
41 | { | ||
42 | MySqlConnection connection = new MySqlConnection(m_connectionString); | ||
43 | return connection; | ||
44 | } | ||
45 | |||
46 | public override string CreateParamName(string fieldName) | ||
47 | { | ||
48 | return "?" + fieldName; | ||
49 | } | ||
50 | } | ||
29 | } | 51 | } |
30 | */ | 52 | |
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs index 8d5b9cf..269f863 100644 --- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs +++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs | |||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||
3 | using System.Data.Common; | 3 | using System.Data.Common; |
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | /* | 6 | |
7 | using TribalMedia.Framework.Data; | 7 | using TribalMedia.Framework.Data; |
8 | 8 | ||
9 | namespace OpenSim.Framework.Data | 9 | namespace OpenSim.Framework.Data |
@@ -73,4 +73,4 @@ namespace OpenSim.Framework.Data | |||
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |
76 | */ | 76 | |
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs index f596b45..e5deae0 100644 --- a/OpenSim/Framework/Data/OpenSimTableMapper.cs +++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | using System.Data; | 1 | using System.Data; |
2 | /* | 2 | |
3 | using TribalMedia.Framework.Data; | 3 | using TribalMedia.Framework.Data; |
4 | 4 | ||
5 | namespace OpenSim.Framework.Data | 5 | namespace OpenSim.Framework.Data |
@@ -11,4 +11,3 @@ namespace OpenSim.Framework.Data | |||
11 | } | 11 | } |
12 | } | 12 | } |
13 | } | 13 | } |
14 | */ | ||
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs index 227a98e..ec9689a 100644 --- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs +++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs | |||
@@ -1,9 +1,9 @@ | |||
1 | using System; | 1 | using System; |
2 | using OpenSim.Framework; | 2 | using OpenSim.Framework; |
3 | //using TribalMedia.Framework.Data; | 3 | using TribalMedia.Framework.Data; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | 5 | ||
6 | /* | 6 | |
7 | namespace OpenSim.Framework.Data | 7 | namespace OpenSim.Framework.Data |
8 | { | 8 | { |
9 | public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape> | 9 | public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape> |
@@ -142,4 +142,4 @@ namespace OpenSim.Framework.Data | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | } | 144 | } |
145 | */ | 145 | |