diff options
| author | Justin Clarke Casey | 2009-01-05 18:04:47 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-01-05 18:04:47 +0000 |
| commit | 0d3a99f6bc1c0f291d242407d67239f09cf49a7c (patch) | |
| tree | e1361b5f8b2492605578927c6022f22f8067383e /OpenSim | |
| parent | * Simplify test code by always setting up mock 'in memory' user and inventory... (diff) | |
| download | opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.zip opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.gz opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.bz2 opensim-SC_OLD-0d3a99f6bc1c0f291d242407d67239f09cf49a7c.tar.xz | |
fixes mantis #2950
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateManager.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateRegionData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index e1d074f..fab39b1 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
| @@ -45,7 +45,7 @@ namespace OpenSim.Data.NHibernate | |||
| 45 | { | 45 | { |
| 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 47 | 47 | ||
| 48 | private NHibernateManager manager; | 48 | public NHibernateManager manager; |
| 49 | 49 | ||
| 50 | override public void Dispose() { } | 50 | override public void Dispose() { } |
| 51 | 51 | ||
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index f7de8eb..dc98d11 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
| @@ -43,7 +43,7 @@ namespace OpenSim.Data.NHibernate | |||
| 43 | { | 43 | { |
| 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 45 | 45 | ||
| 46 | private NHibernateManager manager; | 46 | public NHibernateManager manager; |
| 47 | 47 | ||
| 48 | public void Initialise() | 48 | public void Initialise() |
| 49 | { | 49 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs index 46840ac..12d8959 100644 --- a/OpenSim/Data/NHibernate/NHibernateManager.cs +++ b/OpenSim/Data/NHibernate/NHibernateManager.cs | |||
| @@ -151,6 +151,12 @@ namespace OpenSim.Data.NHibernate | |||
| 151 | return false; | 151 | return false; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | public void DropSchema() | ||
| 155 | { | ||
| 156 | SchemaExport export = new SchemaExport(this.cfg); | ||
| 157 | export.Drop(true, true); | ||
| 158 | } | ||
| 159 | |||
| 154 | public ISession GetSession() | 160 | public ISession GetSession() |
| 155 | { | 161 | { |
| 156 | return session; | 162 | return session; |
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 0aba58c..871013b 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs | |||
| @@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate | |||
| 49 | { | 49 | { |
| 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 51 | 51 | ||
| 52 | private NHibernateManager manager; | 52 | public NHibernateManager manager; |
| 53 | 53 | ||
| 54 | public void Initialise(string connect) | 54 | public void Initialise(string connect) |
| 55 | { | 55 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index ee0d2b8..e0f6db7 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Data.NHibernate | |||
| 46 | { | 46 | { |
| 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 48 | 48 | ||
| 49 | private NHibernateManager manager; | 49 | public NHibernateManager manager; |
| 50 | 50 | ||
| 51 | public override void Initialise() | 51 | public override void Initialise() |
| 52 | { | 52 | { |