aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs7
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs8
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs7
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs7
7 files changed, 29 insertions, 12 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 3bb6857..2f14f16 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -1030,7 +1030,6 @@ namespace OpenSim.Data.MySQL
1030 { 1030 {
1031 IDbCommand result = Query(sql, parameters); 1031 IDbCommand result = Query(sql, parameters);
1032 1032
1033 //Console.WriteLine(result.CommandText);
1034 // int x; 1033 // int x;
1035 // if ((x = result.ExecuteNonQuery()) > 0) 1034 // if ((x = result.ExecuteNonQuery()) > 0)
1036 // { 1035 // {
@@ -1123,7 +1122,6 @@ namespace OpenSim.Data.MySQL
1123 { 1122 {
1124 IDbCommand result = Query(sql, parameters); 1123 IDbCommand result = Query(sql, parameters);
1125 1124
1126 //Console.WriteLine(result.CommandText);
1127 // int x; 1125 // int x;
1128 // if ((x = result.ExecuteNonQuery()) > 0) 1126 // if ((x = result.ExecuteNonQuery()) > 0)
1129 // { 1127 // {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index d03e66c..514e04e 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLAssetTest : BasicAssetTest 37 public class MySQLAssetTest : BasicAssetTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.MySQL.Tests
73 } 76 }
74 } 77 }
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index f148385..79fcc2d 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLEstateTest : BasicEstateTest 37 public class MySQLEstateTest : BasicEstateTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -56,7 +59,7 @@ namespace OpenSim.Data.MySQL.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error("Exception {0}", e);
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 953294f..fd71022 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -28,12 +28,16 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLGridTest : BasicGridTest 37 public class MySQLGridTest : BasicGridTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40
37 public string file; 41 public string file;
38 public MySQLManager database; 42 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 43 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +58,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 58 }
55 catch (Exception e) 59 catch (Exception e)
56 { 60 {
57 Console.WriteLine("Exception {0}", e); 61 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 62 Assert.Ignore();
59 } 63 }
60 } 64 }
@@ -73,4 +77,4 @@ namespace OpenSim.Data.MySQL.Tests
73 } 77 }
74 } 78 }
75 } 79 }
76} \ No newline at end of file 80}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index e03e38d..c7799e5 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLInventoryTest : BasicInventoryTest 37 public class MySQLInventoryTest : BasicInventoryTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 5cce53b..77964d3 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLRegionTest : BasicRegionTest 37 public class MySQLRegionTest : BasicRegionTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -87,4 +90,4 @@ namespace OpenSim.Data.MySQL.Tests
87 } 90 }
88 } 91 }
89 } 92 }
90} \ No newline at end of file 93}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index b74617e..449ce4a 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLUserTest : BasicUserTest 37 public class MySQLUserTest : BasicUserTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -78,4 +81,4 @@ namespace OpenSim.Data.MySQL.Tests
78 } 81 }
79 } 82 }
80 } 83 }
81} \ No newline at end of file 84}