Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ public SqliteConnectionInternal(SqliteConnectionStringBuilder connectionOptions,
}
}

var rc = sqlite3_open_v2(filename, out _db, flags, vfs: null);
var vfs = !string.IsNullOrWhiteSpace(connectionOptions.Vfs)
? connectionOptions.Vfs
: null;
var rc = sqlite3_open_v2(filename, out _db, flags, vfs: vfs);
SqliteException.ThrowExceptionForRC(rc, _db);

if (connectionOptions.Password.Length != 0)
Expand Down
28 changes: 25 additions & 3 deletions src/Microsoft.Data.Sqlite.Core/SqliteConnectionStringBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class SqliteConnectionStringBuilder : DbConnectionStringBuilder
private const string DefaultTimeoutKeyword = "Default Timeout";
private const string CommandTimeoutKeyword = "Command Timeout";
private const string PoolingKeyword = "Pooling";
private const string VfsKeyword = "Vfs";

private enum Keywords
{
Expand All @@ -41,7 +42,8 @@ private enum Keywords
ForeignKeys,
RecursiveTriggers,
DefaultTimeout,
Pooling
Pooling,
Vfs,
}

private static readonly IReadOnlyList<string> _validKeywords;
Expand All @@ -55,10 +57,11 @@ private enum Keywords
private bool _recursiveTriggers;
private int _defaultTimeout = 30;
private bool _pooling = true;
private string? _vfs;

static SqliteConnectionStringBuilder()
{
var validKeywords = new string[8];
var validKeywords = new string[9];
validKeywords[(int)Keywords.DataSource] = DataSourceKeyword;
validKeywords[(int)Keywords.Mode] = ModeKeyword;
validKeywords[(int)Keywords.Cache] = CacheKeyword;
Expand All @@ -67,9 +70,10 @@ static SqliteConnectionStringBuilder()
validKeywords[(int)Keywords.RecursiveTriggers] = RecursiveTriggersKeyword;
validKeywords[(int)Keywords.DefaultTimeout] = DefaultTimeoutKeyword;
validKeywords[(int)Keywords.Pooling] = PoolingKeyword;
validKeywords[(int)Keywords.Vfs] = VfsKeyword;
_validKeywords = validKeywords;

_keywords = new Dictionary<string, Keywords>(11, StringComparer.OrdinalIgnoreCase)
_keywords = new Dictionary<string, Keywords>(12, StringComparer.OrdinalIgnoreCase)
{
[DataSourceKeyword] = Keywords.DataSource,
[ModeKeyword] = Keywords.Mode,
Expand All @@ -79,6 +83,7 @@ static SqliteConnectionStringBuilder()
[RecursiveTriggersKeyword] = Keywords.RecursiveTriggers,
[DefaultTimeoutKeyword] = Keywords.DefaultTimeout,
[PoolingKeyword] = Keywords.Pooling,
[VfsKeyword] = Keywords.Vfs,

// aliases
[FilenameKeyword] = Keywords.DataSource,
Expand Down Expand Up @@ -217,6 +222,17 @@ public bool Pooling
set => base[PoolingKeyword] = _pooling = value;
}

/// <summary>
/// Gets or sets the SQLite VFS used by the connection.
/// </summary>
/// <value>The SQLite VFS used by the connection.</value>
/// <seealso href="https://www.sqlite.org/vfs.html">SQLite VFS</seealso>
public string? Vfs
{
get => _vfs;
set => base[VfsKeyword] = _vfs = value;
}

/// <summary>
/// Gets or sets the value associated with the specified key.
/// </summary>
Expand Down Expand Up @@ -269,6 +285,9 @@ public override object? this[string keyword]
case Keywords.Pooling:
Pooling = Convert.ToBoolean(value, CultureInfo.InvariantCulture);
return;
case Keywords.Vfs:
Vfs = Convert.ToString(value, CultureInfo.InvariantCulture);
return;

default:
Debug.Fail("Unexpected keyword: " + keyword);
Expand Down Expand Up @@ -458,6 +477,9 @@ private void Reset(Keywords index)
case Keywords.Pooling:
_pooling = true;
return;
case Keywords.Vfs:
_vfs = null;
return;

default:
Debug.Fail("Unexpected keyword: " + index);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ public void Ctor_parses_DefaultTimeout(string keyword)
Assert.Equal(1, builder.DefaultTimeout);
}

[Fact]
public void Ctor_parses_Vfs()
{
var builder = new SqliteConnectionStringBuilder("Vfs=win32-longpath");

Assert.Equal("win32-longpath", builder.Vfs);
}

[Fact]
public void ConnectionString_defaults_to_empty()
{
Expand Down Expand Up @@ -148,7 +156,7 @@ public void Keys_works()
var keys = (ICollection<string>)new SqliteConnectionStringBuilder().Keys;

Assert.True(keys.IsReadOnly);
Assert.Equal(8, keys.Count);
Assert.Equal(9, keys.Count);
Assert.Contains("Data Source", keys);
Assert.Contains("Mode", keys);
Assert.Contains("Cache", keys);
Expand All @@ -157,6 +165,7 @@ public void Keys_works()
Assert.Contains("Recursive Triggers", keys);
Assert.Contains("Default Timeout", keys);
Assert.Contains("Pooling", keys);
Assert.Contains("Vfs", keys);
}

[Fact]
Expand All @@ -165,7 +174,7 @@ public void Values_works()
var values = (ICollection<object>)new SqliteConnectionStringBuilder().Values;

Assert.True(values.IsReadOnly);
Assert.Equal(8, values.Count);
Assert.Equal(9, values.Count);
}

[Fact]
Expand Down
17 changes: 17 additions & 0 deletions test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,23 @@ public void Open_works_when_recursive_triggers()
Assert.Equal(1L, connection.ExecuteScalar<long>("PRAGMA recursive_triggers;"));
}

[Fact]
public void Open_works_when_vfs()
{
var vfs = Environment.OSVersion.Platform == PlatformID.Win32NT
? "win32-longpath"
: "unix-dotfile";
using var connection = new SqliteConnection($"Data Source=:memory:;Vfs={vfs}");
connection.Open();
}

[Fact]
public void Open_throws_when_vfs_invalid()
{
using var connection = new SqliteConnection("Data Source=:memory:;Vfs=invalidvfs");
Assert.Throws<SqliteException>(connection.Open);
}

[Fact]
public void BackupDatabase_works()
{
Expand Down