aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs2
-rw-r--r--OpenSim/Data/Tests/BasicDataServiceTest.cs2
-rw-r--r--OpenSim/Data/Tests/Resources/TestDataConnections.ini4
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index f0dda64..30b26c4 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite
86 86
87 if (dbconnect == string.Empty) 87 if (dbconnect == string.Empty)
88 { 88 {
89 dbconnect = "URI=file:Asset.db,version=3"; 89 dbconnect = "URI=file:../db/Asset.db,version=3";
90 } 90 }
91 m_conn = new SqliteConnection(dbconnect); 91 m_conn = new SqliteConnection(dbconnect);
92 m_conn.Open(); 92 m_conn.Open();
@@ -358,7 +358,7 @@ namespace OpenSim.Data.SQLite
358 /// </summary> 358 /// </summary>
359 override public void Initialise() 359 override public void Initialise()
360 { 360 {
361 Initialise("URI=file:Asset.db,version=3"); 361 Initialise("URI=file:../db/Asset.db,version=3");
362 } 362 }
363 363
364 /// <summary> 364 /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 7d493ca..7caf347 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Data.SQLite
82 82
83 if (dbconnect == string.Empty) 83 if (dbconnect == string.Empty)
84 { 84 {
85 dbconnect = "URI=file:inventoryStore.db,version=3"; 85 dbconnect = "URI=file:../db/inventoryStore.db,version=3";
86 } 86 }
87 m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); 87 m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
88 conn = new SqliteConnection(dbconnect); 88 conn = new SqliteConnection(dbconnect);
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index acfebd0..8c296b9 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
106 if (String.IsNullOrEmpty(m_connStr)) 106 if (String.IsNullOrEmpty(m_connStr))
107 { 107 {
108 m_file = Path.GetTempFileName() + ".db"; 108 m_file = Path.GetTempFileName() + ".db";
109 m_connStr = "URI=file:" + m_file + ",version=3"; 109 m_connStr = "URI=file:../db/" + m_file + ",version=3";
110 } 110 }
111 } 111 }
112 112
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 7b55467..75f7855 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -16,9 +16,9 @@
16; file for the DB. If you want the resulting DB to persist (e.g. for performance testing, 16; file for the DB. If you want the resulting DB to persist (e.g. for performance testing,
17; when filling up the tables can take a long time), explicitly specify a conn string like this: 17; when filling up the tables can take a long time), explicitly specify a conn string like this:
18 18
19; SqliteConnection="URI=file:<path_to_your_file>,version=3" 19; SqliteConnection="URI=file:../db/<path_to_your_file>,version=3"
20 20
21[TestConnections] 21[TestConnections]
22MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;" 22MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
23SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;" 23SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
24SqliteConnection="URI=file:opensim-nunit.db,version=3" \ No newline at end of file 24SqliteConnection="URI=file:../db/opensim-nunit.db,version=3" \ No newline at end of file