Skip to content

Commit e987106

Browse files
More reliable SQLite handling.
* Get file to delete from connection string instead of having it hard-coded. * Ensure SQLite required libraries are deployed for dependent projects too (VB Tests).
1 parent 759b1a4 commit e987106

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5656
</Content>
5757
</ItemGroup>
58+
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
59+
<NativeBinaries Include="$(NuGetPackageRoot)system.data.sqlite.core\1.0.105.2\build\net46\**\*.*" />
60+
<Content Include="@(NativeBinaries)">
61+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
62+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63+
</Content>
64+
</ItemGroup>
5865
<ItemGroup>
5966
<ProjectReference Include="..\NHibernate.DomainModel\NHibernate.DomainModel.csproj" />
6067
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />

src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Data.Odbc;
44
using System.Data.SqlClient;
55
using System.Data.SqlServerCe;
6+
using System.Data.SQLite;
67
using System.IO;
78
using FirebirdSql.Data.FirebirdClient;
89
using NHibernate.Test;
@@ -182,8 +183,19 @@ RETURNS uuid
182183

183184
private static void SetupSQLite(Cfg.Configuration cfg)
184185
{
185-
if (File.Exists("NHibernate.db"))
186-
File.Delete("NHibernate.db");
186+
var connStr = cfg.Properties[Cfg.Environment.ConnectionString];
187+
188+
try
189+
{
190+
var connStrBuilder = new SQLiteConnectionStringBuilder(connStr);
191+
var dataSource = connStrBuilder.DataSource;
192+
if (File.Exists(dataSource))
193+
File.Delete(dataSource);
194+
}
195+
catch (Exception e)
196+
{
197+
Console.WriteLine(e);
198+
}
187199
}
188200

189201
private static void SetupOracle(Cfg.Configuration cfg)

0 commit comments

Comments
 (0)