Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Use the correct PRAGMA to set the journal mode while opening a connection with ZipVFS enabled. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
acdc40ff05db13afc28dfb0747ba9afe |
| User & Date: | mistachkin 2015-06-09 20:24:01.698 |
Context
|
2015-06-09
| ||
| 20:27 | Improve exception message for the ZipVfsVersion connection string property. check-in: 81a9e94c47 user: mistachkin tags: trunk | |
| 20:24 | Use the correct PRAGMA to set the journal mode while opening a connection with ZipVFS enabled. check-in: acdc40ff05 user: mistachkin tags: trunk | |
|
2015-06-06
| ||
| 00:24 | Enhance the test suite infrastructure to handle having the tests in their own directory. check-in: b7162effee user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteConnection.cs.
| ︙ | ︙ | |||
458 459 460 461 462 463 464 465 466 467 468 469 470 471 |
private const bool DefaultForeignKeys = false;
private const bool DefaultEnlist = true;
private const bool DefaultSetDefaults = true;
internal const int DefaultPrepareRetries = 3;
private const string DefaultVfsName = null;
#if INTEROP_INCLUDE_ZIPVFS
private const string ZipVfs_V2 = "v2";
private const string ZipVfs_V3 = "v3";
private const string DefaultZipVfsVersion = null;
#endif
private const int SQLITE_FCNTL_CHUNK_SIZE = 6;
| > | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 |
private const bool DefaultForeignKeys = false;
private const bool DefaultEnlist = true;
private const bool DefaultSetDefaults = true;
internal const int DefaultPrepareRetries = 3;
private const string DefaultVfsName = null;
#if INTEROP_INCLUDE_ZIPVFS
private const string ZipVfs_Automatic = "automatic";
private const string ZipVfs_V2 = "v2";
private const string ZipVfs_V3 = "v3";
private const string DefaultZipVfsVersion = null;
#endif
private const int SQLITE_FCNTL_CHUNK_SIZE = 6;
|
| ︙ | ︙ | |||
2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 |
bool fullUri = false;
string fileName;
if (Convert.ToInt32(FindKey(opts, "Version", DefaultVersion.ToString()), CultureInfo.InvariantCulture) != DefaultVersion)
throw new NotSupportedException(String.Format(CultureInfo.CurrentCulture, "Only SQLite Version {0} is supported at this time", DefaultVersion));
#if INTEROP_INCLUDE_ZIPVFS
string zipVfsVersion = FindKey(opts, "ZipVfsVersion", DefaultZipVfsVersion);
if (zipVfsVersion != null)
{
| > | > > > > > > | 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 |
bool fullUri = false;
string fileName;
if (Convert.ToInt32(FindKey(opts, "Version", DefaultVersion.ToString()), CultureInfo.InvariantCulture) != DefaultVersion)
throw new NotSupportedException(String.Format(CultureInfo.CurrentCulture, "Only SQLite Version {0} is supported at this time", DefaultVersion));
#if INTEROP_INCLUDE_ZIPVFS
bool useZipVfs = false;
string zipVfsVersion = FindKey(opts, "ZipVfsVersion", DefaultZipVfsVersion);
if (zipVfsVersion != null)
{
if (String.Compare(zipVfsVersion, ZipVfs_Automatic) == 0)
{
useZipVfs = true;
}
else if (String.Compare(zipVfsVersion, ZipVfs_V2) == 0)
{
UnsafeNativeMethods.zipvfsInit_v2();
useZipVfs = true;
}
else if (String.Compare(zipVfsVersion, ZipVfs_V3) == 0)
{
UnsafeNativeMethods.zipvfsInit_v3(0);
useZipVfs = true;
}
else
{
throw new NotSupportedException(String.Format(
CultureInfo.CurrentCulture, "Only ZipVFS versions {0} and {1} are supported at this time",
ZipVfs_V2, ZipVfs_V3));
}
|
| ︙ | ︙ | |||
2813 2814 2815 2816 2817 2818 2819 |
cmd.ExecuteNonQuery();
}
strValue = FindKey(opts, "Journal Mode", DefaultJournalMode.ToString());
enumValue = TryParseEnum(typeof(SQLiteJournalModeEnum), strValue, true);
if (!(enumValue is SQLiteJournalModeEnum) || ((SQLiteJournalModeEnum)enumValue != DefaultJournalMode))
{
| > > > > > > > | | 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 |
cmd.ExecuteNonQuery();
}
strValue = FindKey(opts, "Journal Mode", DefaultJournalMode.ToString());
enumValue = TryParseEnum(typeof(SQLiteJournalModeEnum), strValue, true);
if (!(enumValue is SQLiteJournalModeEnum) || ((SQLiteJournalModeEnum)enumValue != DefaultJournalMode))
{
string pragmaStr = "PRAGMA journal_mode={0}";
#if INTEROP_INCLUDE_ZIPVFS
if (useZipVfs)
pragmaStr = "PRAGMA zipvfs_journal_mode={0}";
#endif
cmd.CommandText = String.Format(CultureInfo.InvariantCulture, pragmaStr, strValue);
cmd.ExecuteNonQuery();
}
strValue = FindKey(opts, "Foreign Keys", DefaultForeignKeys.ToString());
boolValue = SQLiteConvert.ToBoolean(strValue);
if (boolValue != DefaultForeignKeys)
{
|
| ︙ | ︙ |