aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorlbsa712008-03-25 14:27:39 +0000
committerlbsa712008-03-25 14:27:39 +0000
commitba2de258f420245d07c4d194f8f8a71abe299aff (patch)
tree7292d4f76a631898ddfe765968888206d5390677 /OpenSim/Framework
parentAdd "warnings as errors" support for nant and monodevelop to Prebuild (though... (diff)
downloadopensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.zip
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.gz
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.bz2
opensim-SC_OLD-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.xz
* Refactored out circular reference in Region.Environment <-> Framework.Data.Base
We REALLY need to get the db layer sorted soon...
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs (renamed from OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs)9
-rw-r--r--OpenSim/Framework/Data/OpenSimDatabaseConnector.cs20
2 files changed, 4 insertions, 25 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
index 8f65d70..da3b6a5 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQLMapper/MySQLDatabaseMapper.cs
@@ -27,10 +27,9 @@
27 27
28using System.Data.Common; 28using System.Data.Common;
29using MySql.Data.MySqlClient; 29using MySql.Data.MySqlClient;
30 30
31namespace OpenSim.Framework.Data.MySQL 31namespace OpenSim.Framework.Data.MySQLMapper
32{ 32{
33 /*
34 public class MySQLDatabaseMapper : OpenSimDatabaseConnector 33 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
35 { 34 {
36 public MySQLDatabaseMapper(string connectionString) 35 public MySQLDatabaseMapper(string connectionString)
@@ -48,5 +47,5 @@ namespace OpenSim.Framework.Data.MySQL
48 { 47 {
49 return "?" + fieldName; 48 return "?" + fieldName;
50 } 49 }
51 }*/ 50 }
52} 51} \ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index 2bfd6f1..809fd1e 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -28,7 +28,6 @@
28using System.Data; 28using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using libsecondlife; 30using libsecondlife;
31using MySql.Data.MySqlClient;
32 31
33using OpenSim.Framework.Data.Base; 32using OpenSim.Framework.Data.Base;
34 33
@@ -55,23 +54,4 @@ namespace OpenSim.Framework.Data
55 return new OpenSimDataReader(reader); 54 return new OpenSimDataReader(reader);
56 } 55 }
57 } 56 }
58
59 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
60 {
61 public MySQLDatabaseMapper(string connectionString)
62 : base(connectionString)
63 {
64 }
65
66 public override DbConnection GetNewConnection()
67 {
68 MySqlConnection connection = new MySqlConnection(m_connectionString);
69 return connection;
70 }
71
72 public override string CreateParamName(string fieldName)
73 {
74 return "?" + fieldName;
75 }
76 }
77} 57}