Move db directory out of tree.

5 files changed, 12 insertions, 7 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 966d0b8..51d1030 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite
 
             if (dbconnect == string.Empty)
             {
-                dbconnect = "URI=file:Asset.db,version=3";
+                dbconnect = "URI=file:" + Util.dbDir() + "Asset.db,version=3";
             }
             m_conn = new SqliteConnection(dbconnect);
             m_conn.Open();
@@ -360,7 +360,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         override public void Initialise()
         {
-            Initialise("URI=file:Asset.db,version=3");
+            Initialise("URI=file:" + Util.dbDir() + "Asset.db,version=3");
         }
 
         /// <summary>
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 79691e4..580e7aa 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
                 if (String.IsNullOrEmpty(m_connStr))
                 {
                     m_file = Path.GetTempFileName() + ".db";
-                    m_connStr = "URI=file:" + m_file + ",version=3";
+                    m_connStr = "URI=file:" + Util.dbDir() + "/" + m_file + ",version=3";
                 }
             }
 
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 7b55467..2ddec8b 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -16,9 +16,9 @@
 ; file for the DB.  If you want the resulting DB to persist (e.g. for performance testing,
 ; when filling up the tables can take a long time), explicitly specify a conn string like this: 
 
-; SqliteConnection="URI=file:<path_to_your_file>,version=3"
+; SqliteConnection="URI=file:../../db/<path_to_your_file>,version=3"
 
 [TestConnections]
 MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
 SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection="URI=file:opensim-nunit.db,version=3"
\ No newline at end of file
+SqliteConnection="URI=file:../../db/opensim-nunit.db,version=3"
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 7093010..2f65f3c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1277,6 +1277,11 @@ namespace OpenSim.Framework
             return Path.Combine(configDir(), "inventory");
         }
 
+        public static string dbDir()
+        {
+            return Path.Combine("..", Path.Combine("..", "db"));
+        }
+
         public static string configDir()
         {
             return ".";
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index c15b194..f76b057 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics
 
             //IConfig startupConfig = config.Configs["Startup"];
 
-            dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
+            dbConn = new SqliteConnection("URI=file:" + Util.dbDir()  + "/LocalUserStatistics.db,version=3");
             dbConn.Open();
             CreateTables(dbConn);
 
@@ -1200,4 +1200,4 @@ VALUES
             m_scriptLinesPerSecond = stats.ExtraStatsBlock[0].StatValue;
         }
     }
-}
\ No newline at end of file
+}