Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge updates from trunk. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sessions |
Files: | files | file ages | folders |
SHA1: |
0b70bd2e0e1a9226280ffe10720ca418 |
User & Date: | mistachkin 2017-10-10 21:41:59.393 |
Context
2017-10-10
| ||
21:46 | Merge trunk. check-in: 9a31f08683 user: mistachkin tags: sessions | |
21:41 | Merge updates from trunk. check-in: 0b70bd2e0e user: mistachkin tags: sessions | |
21:40 | Refactor how logging flags and exception handling are performed. check-in: 6fbb8f60e9 user: mistachkin tags: trunk | |
21:38 | Heavily refactor how native delegates and exception handling are performed. check-in: 3b281ced11 user: mistachkin tags: sessions | |
Changes
Changes to Setup/data/verify.lst.
︙ | ︙ | |||
1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 | ############################################################################### ############################### NuGet Packages ################################ ############################################################################### set manifests(System.Data.SQLite..nupkg) [list sds \ nuGetMetadata nuGetPrimary] set manifests(System.Data.SQLite.Core..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetCoreNative nuGetCore] set manifests(System.Data.SQLite.Core.MSIL..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetCoreMsil] set manifests(System.Data.SQLite.EF6..nupkg) [list sds \ nuGetMetadata nuGetEf6] set manifests(System.Data.SQLite.Linq..nupkg) [list sds \ nuGetMetadata nuGetLinq] set manifests(System.Data.SQLite.MSIL..nupkg) [list sds \ nuGetMetadata nuGetMsil] set manifests(System.Data.SQLite.x64..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetX64] set manifests(System.Data.SQLite.x86..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetX86] ############################################################################### # end of file | > > > > > > > > > > > > > > | 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 | ############################################################################### ############################### NuGet Packages ################################ ############################################################################### set manifests(System.Data.SQLite..nupkg) [list sds \ nuGetMetadata nuGetPrimary] ############################################################################### set manifests(System.Data.SQLite.Core..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetCoreNative nuGetCore] ############################################################################### set manifests(System.Data.SQLite.Core.MSIL..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetCoreMsil] ############################################################################### set manifests(System.Data.SQLite.EF6..nupkg) [list sds \ nuGetMetadata nuGetEf6] ############################################################################### set manifests(System.Data.SQLite.Linq..nupkg) [list sds \ nuGetMetadata nuGetLinq] ############################################################################### set manifests(System.Data.SQLite.MSIL..nupkg) [list sds \ nuGetMetadata nuGetMsil] ############################################################################### set manifests(System.Data.SQLite.x64..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetX64] ############################################################################### set manifests(System.Data.SQLite.x86..nupkg) [list sds \ nuGetMetadata nuGetCoreManaged nuGetX86] ############################################################################### # end of file |
Changes to Setup/verify.eagle.
︙ | ︙ | |||
216 217 218 219 220 221 222 | # HACK: Special hack to allow "CLRvX" to appear in the # manifest file names, part 1, the vanishing. # set manifest [string map \ [list CLRv2 CLRvTWO CLRv4 CLRvFOUR] $manifest] # | | | | | | | | | | | | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | # HACK: Special hack to allow "CLRvX" to appear in the # manifest file names, part 1, the vanishing. # set manifest [string map \ [list CLRv2 CLRvTWO CLRv4 CLRvFOUR] $manifest] # # HACK: Special hack to allow "EF6", "Win32", "x64", and # "x86" to appear in the manifest file names, part 1, # the vanishing. # set manifest [string map \ [list EF6 EF-SIX Win32 Win-THIRTYTWO x64 x-SIXTYFOUR \ x86 x-EIGHTYSIX] $manifest] # # HACK: Attempt to match and remove sub-strings from the # manifest file name that look like a version number # in the format "<major>.<minor>.<build>.<revision>" # and/or a date/time string matching the format # "YYYY-MM-DD-NN" (where the NN portion is a generic # incrementing sequence number). # regsub -- {\d+\.\d+\.\d+\.\d+} $manifest {} manifest regsub -- {\d{4}-\d{2}-\d{2}-\d{2}} $manifest {} manifest # # HACK: Special hack to allow "CLRvX" to appear in the # manifest file names, part 2, the return. # set manifest [string map \ [list CLRvTWO CLRv2 CLRvFOUR CLRv4] $manifest] # # HACK: Special hack to allow "EF6", "Win32", "x64", and # "x86" to appear in the manifest file names, part 2, # the return. # set manifest [string map \ [list EF-SIX EF6 Win-THIRTYTWO Win32 x-SIXTYFOUR x64 \ x-EIGHTYSIX x86] $manifest] # # HACK: Fixup manifest file names that correspond to the # NuGet packages for SymbolSource. # if {[regexp -- {[/\\]SymbolSource[/\\]} $archiveFileName]} then { set manifest [string map [list .. .Source..] $manifest] |
︙ | ︙ |
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
1340 1341 1342 1343 1344 1345 1346 | SQLiteConnectionFlags flags = (cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default; if ( #if !PLATFORM_COMPACTFRAMEWORK ForceLogPrepare() || #endif | | | 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 | SQLiteConnectionFlags flags = (cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default; if ( #if !PLATFORM_COMPACTFRAMEWORK ForceLogPrepare() || #endif HelperMethods.LogPrepare(flags)) { if ((strSql == null) || (strSql.Length == 0) || (strSql.Trim().Length == 0)) SQLiteLog.LogMessage("Preparing {<nothing>}..."); else SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Preparing {{{0}}}...", strSql)); } |
︙ | ︙ | |||
1608 1609 1610 1611 1612 1613 1614 | handleIntPtr, index, typeof(Byte[]), (value != null) ? ToHexadecimalString(value) : "<null>")); } internal override void Bind_Double(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, double value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; | | | | | 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 | handleIntPtr, index, typeof(Byte[]), (value != null) ? ToHexadecimalString(value) : "<null>")); } internal override void Bind_Double(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, double value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #else throw new NotImplementedException(); #endif } internal override void Bind_Int32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, int value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_UInt32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, uint value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } SQLiteErrorCode n; if ((flags & SQLiteConnectionFlags.BindUInt32AsInt64) == SQLiteConnectionFlags.BindUInt32AsInt64) |
︙ | ︙ | |||
1671 1672 1673 1674 1675 1676 1677 | if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_Int64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, long value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; | | | | | | | | 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 | if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_Int64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, long value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #else throw new NotImplementedException(); #endif } internal override void Bind_UInt64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, ulong value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); #else throw new NotImplementedException(); #endif } internal override void Bind_Boolean(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, bool value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } int value2 = value ? 1 : 0; SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int(handle, index, value2); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_Text(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, string value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } byte[] b = ToUTF8(value); if (HelperMethods.LogBind(flags)) { LogBind(handle, index, b); } SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_text(handle, index, b, b.Length - 1, (IntPtr)(-1)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_DateTime(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, DateTime dt) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, dt); } if ((flags & SQLiteConnectionFlags.BindDateTimeWithKind) == SQLiteConnectionFlags.BindDateTimeWithKind) { if ((_datetimeKind != DateTimeKind.Unspecified) && |
︙ | ︙ | |||
1770 1771 1772 1773 1774 1775 1776 | switch (_datetimeFormat) { case SQLiteDateFormats.Ticks: { long value = dt.Ticks; | | | | | | | | | 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 | switch (_datetimeFormat) { case SQLiteDateFormats.Ticks: { long value = dt.Ticks; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #else throw new NotImplementedException(); #endif } case SQLiteDateFormats.JulianDay: { double value = ToJulianDay(dt); if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #else throw new NotImplementedException(); #endif } case SQLiteDateFormats.UnixEpoch: { long value = Convert.ToInt64(dt.Subtract(UnixEpoch).TotalSeconds); if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #if !PLATFORM_COMPACTFRAMEWORK SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #elif !SQLITE_STANDARD SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; #else throw new NotImplementedException(); #endif } default: { byte[] b = ToUTF8(dt); if (HelperMethods.LogBind(flags)) { LogBind(handle, index, b); } SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_text(handle, index, b, b.Length - 1, (IntPtr)(-1)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); break; } } } internal override void Bind_Blob(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, byte[] blobData) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index, blobData); } SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_blob(handle, index, blobData, blobData.Length, (IntPtr)(-1)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override void Bind_Null(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index) { SQLiteStatementHandle handle = stmt._sqlite_stmt; if (HelperMethods.LogBind(flags)) { LogBind(handle, index); } SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_null(handle, index); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); } internal override int Bind_ParamCount(SQLiteStatement stmt, SQLiteConnectionFlags flags) { SQLiteStatementHandle handle = stmt._sqlite_stmt; int value = UnsafeNativeMethods.sqlite3_bind_parameter_count(handle); if (HelperMethods.LogBind(flags)) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter count is {1}.", handleIntPtr, value)); |
︙ | ︙ | |||
1901 1902 1903 1904 1905 1906 1907 | #if !SQLITE_STANDARD int len = 0; name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name_interop(handle, index, ref len), len); #else name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name(handle, index), -1); #endif | | | | 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 | #if !SQLITE_STANDARD int len = 0; name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name_interop(handle, index, ref len), len); #else name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name(handle, index), -1); #endif if (HelperMethods.LogBind(flags)) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter #{1} name is {{{2}}}.", handleIntPtr, index, name)); } return name; } internal override int Bind_ParamIndex(SQLiteStatement stmt, SQLiteConnectionFlags flags, string paramName) { SQLiteStatementHandle handle = stmt._sqlite_stmt; int index = UnsafeNativeMethods.sqlite3_bind_parameter_index(handle, ToUTF8(paramName)); if (HelperMethods.LogBind(flags)) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter index of name {{{1}}} is #{2}.", handleIntPtr, paramName, index)); |
︙ | ︙ | |||
2535 2536 2537 2538 2539 2540 2541 | /// The flags for the associated <see cref="SQLiteConnection" /> object instance. /// </param> internal override void CreateModule(SQLiteModule module, SQLiteConnectionFlags flags) { if (module == null) throw new ArgumentNullException("module"); | | | | | 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 | /// The flags for the associated <see cref="SQLiteConnection" /> object instance. /// </param> internal override void CreateModule(SQLiteModule module, SQLiteConnectionFlags flags) { if (module == null) throw new ArgumentNullException("module"); if (HelperMethods.NoLogModule(flags)) { module.LogErrors = HelperMethods.LogModuleError(flags); module.LogExceptions = HelperMethods.LogModuleException(flags); } if (_sql == null) throw new SQLiteException("connection has an invalid handle"); bool isLoadNeeded = false; string fileName = GetShimExtensionFileName(ref isLoadNeeded); |
︙ | ︙ |
Changes to System.Data.SQLite/SQLite3_UTF16.cs.
︙ | ︙ | |||
256 257 258 259 260 261 262 | { base.Bind_DateTime(stmt, flags, index, dt); break; } default: { #if !PLATFORM_COMPACTFRAMEWORK | | | | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | { base.Bind_DateTime(stmt, flags, index, dt); break; } default: { #if !PLATFORM_COMPACTFRAMEWORK if (HelperMethods.LogBind(flags)) { SQLiteStatementHandle handle = (stmt != null) ? stmt._sqlite_stmt : null; LogBind(handle, index, dt); } #endif Bind_Text(stmt, flags, index, ToString(dt)); break; } } } internal override void Bind_Text(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, string value) { SQLiteStatementHandle handle = stmt._sqlite_stmt; #if !PLATFORM_COMPACTFRAMEWORK if (HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } #endif SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_text16(handle, index, value, value.Length * 2, (IntPtr)(-1)); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙ | ︙ | |||
2017 2018 2019 2020 2021 2022 2023 | // if (pages == 0) break; } } catch (Exception e) { | | | 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 | // if (pages == 0) break; } } catch (Exception e) { if (HelperMethods.LogBackup(_flags)) { SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Caught exception while backing up database: {0}", e)); } throw; |
︙ | ︙ | |||
6428 6429 6430 6431 6432 6433 6434 | return eventArgs.ReturnCode; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 | return eventArgs.ReturnCode; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Progress", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
6481 6482 6483 6484 6485 6486 6487 | return eventArgs.ReturnCode; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 | return eventArgs.ReturnCode; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Authorize", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
6530 6531 6532 6533 6534 6535 6536 | (UpdateEventType)type, rowid)); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 | (UpdateEventType)type, rowid)); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Update", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
6621 6622 6623 6624 6625 6626 6627 | _traceHandler(this, new TraceEventArgs( SQLiteBase.UTF8ToString(statement, -1))); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 | _traceHandler(this, new TraceEventArgs( SQLiteBase.UTF8ToString(statement, -1))); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Trace", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
6683 6684 6685 6686 6687 6688 6689 | return (e.AbortTransaction == true) ? 1 : 0; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 | return (e.AbortTransaction == true) ? 1 : 0; } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Commit", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
6725 6726 6727 6728 6729 6730 6731 | if (_rollbackHandler != null) _rollbackHandler(this, EventArgs.Empty); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 | if (_rollbackHandler != null) _rollbackHandler(this, EventArgs.Empty); } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Rollback", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFunction.cs.
︙ | ︙ | |||
412 413 414 415 416 417 418 | SetReturnValue(context, Invoke(ConvertParams(nArgs, argsptr))); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | SetReturnValue(context, Invoke(ConvertParams(nArgs, argsptr))); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Invoke", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
450 451 452 453 454 455 456 | return Compare(SQLiteConvert.UTF8ToString(ptr1, len1), SQLiteConvert.UTF8ToString(ptr2, len2)); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | return Compare(SQLiteConvert.UTF8ToString(ptr1, len1), SQLiteConvert.UTF8ToString(ptr2, len2)); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Compare", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
497 498 499 500 501 502 503 | return Compare(SQLite3_UTF16.UTF16ToString(ptr1, len1), SQLite3_UTF16.UTF16ToString(ptr2, len2)); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 | return Compare(SQLite3_UTF16.UTF16ToString(ptr1, len1), SQLite3_UTF16.UTF16ToString(ptr2, len2)); /* throw */ } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Compare (UTF16)", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
570 571 572 573 574 575 576 | data._count++; } } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | data._count++; } } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Step", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
625 626 627 628 629 630 631 | if (disp != null) disp.Dispose(); /* throw */ } } catch (Exception e) /* NOTE: Must catch ALL. */ { try { | < | | | | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 | if (disp != null) disp.Dispose(); /* throw */ } } catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (HelperMethods.LogCallbackExceptions(_flags)) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Final", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModule.cs.
︙ | ︙ | |||
5704 5705 5706 5707 5708 5709 5710 | { if (LogExceptionsNoThrow) { /* throw */ SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, | | | 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 | { if (LogExceptionsNoThrow) { /* throw */ SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, destroy ? "xDestroy" : "xDisconnect", e)); } } catch { // do nothing. } |
︙ | ︙ | |||
5812 5813 5814 5815 5816 5817 5818 | try { if (logExceptions) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, | | | | 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 | try { if (logExceptions) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "SetTableError", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ | |||
8268 8269 8270 8271 8272 8273 8274 | try { if (LogExceptionsNoThrow) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, | | | | 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 | try { if (LogExceptionsNoThrow) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, UnsafeNativeMethods.ExceptionMessageFormat, "Dispose", e)); /* throw */ } } catch { // do nothing. } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteStatement.cs.
︙ | ︙ | |||
395 396 397 398 399 400 401 | object obj = param.Value; DbType objType = param.DbType; if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | object obj = param.Value; DbType objType = param.DbType; if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); if (HelperMethods.LogPreBind(_flags)) { IntPtr handle = _sqlite_stmt; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} with database type {2} and raw value {{{3}}}...", handle, index, objType, obj)); |
︙ | ︙ |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
︙ | ︙ | |||
306 307 308 309 310 311 312 313 314 315 316 317 318 319 | } #endregion ///////////////////////////////////////////////////////////////////////// #region Internal Methods /// <summary> /// Determines if the current process is running on one of the Windows /// [sub-]platforms. /// </summary> /// <returns> /// Non-zero when running on Windows; otherwise, zero. /// </returns> internal static bool IsWindows() | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | } #endregion ///////////////////////////////////////////////////////////////////////// #region Internal Methods /// <summary> /// Determines if preparing a query should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the query preparation should be logged; otherwise, zero. /// </returns> internal static bool LogPrepare( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogPrepare; return (flags == SQLiteConnectionFlags.LogPrepare); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if pre-parameter binding should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the pre-parameter binding should be logged; otherwise, /// zero. /// </returns> internal static bool LogPreBind( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogPreBind; return (flags == SQLiteConnectionFlags.LogPreBind); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if parameter binding should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the parameter binding should be logged; otherwise, zero. /// </returns> internal static bool LogBind( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogBind; return (flags == SQLiteConnectionFlags.LogBind); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if an exception in a native callback should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the exception should be logged; otherwise, zero. /// </returns> internal static bool LogCallbackExceptions( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogCallbackException; return (flags == SQLiteConnectionFlags.LogCallbackException); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if backup API errors should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the backup API error should be logged; otherwise, zero. /// </returns> internal static bool LogBackup( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogBackup; return (flags == SQLiteConnectionFlags.LogBackup); } #if INTEROP_VIRTUAL_TABLE ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if logging for the <see cref="SQLiteModule" /> class is /// disabled. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if logging for the <see cref="SQLiteModule" /> class is /// disabled; otherwise, zero. /// </returns> internal static bool NoLogModule( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.NoLogModule; return (flags == SQLiteConnectionFlags.NoLogModule); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if <see cref="SQLiteModule" /> errors should be logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the <see cref="SQLiteModule" /> error should be logged; /// otherwise, zero. /// </returns> internal static bool LogModuleError( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogModuleError; return (flags == SQLiteConnectionFlags.LogModuleError); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if <see cref="SQLiteModule" /> exceptions should be /// logged. /// </summary> /// <param name="flags"> /// The flags associated with the parent connection object. /// </param> /// <returns> /// Non-zero if the <see cref="SQLiteModule" /> exception should be /// logged; otherwise, zero. /// </returns> internal static bool LogModuleException( SQLiteConnectionFlags flags ) { flags &= SQLiteConnectionFlags.LogModuleException; return (flags == SQLiteConnectionFlags.LogModuleException); } #endif ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if the current process is running on one of the Windows /// [sub-]platforms. /// </summary> /// <returns> /// Non-zero when running on Windows; otherwise, zero. /// </returns> internal static bool IsWindows() |
︙ | ︙ | |||
684 685 686 687 688 689 690 691 692 693 694 695 696 697 | /// This class declares P/Invoke methods to call native SQLite APIs. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [SuppressUnmanagedCodeSecurity] #endif internal static class UnsafeNativeMethods { #region Shared Native SQLite Library Pre-Loading Code #region Private Constants /// <summary> /// The file extension used for dynamic link libraries. /// </summary> private static readonly string DllFileExtension = ".dll"; | > > > > > | 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 | /// This class declares P/Invoke methods to call native SQLite APIs. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [SuppressUnmanagedCodeSecurity] #endif internal static class UnsafeNativeMethods { public const string ExceptionMessageFormat = "Caught exception in \"{0}\" method: {1}"; ///////////////////////////////////////////////////////////////////////// #region Shared Native SQLite Library Pre-Loading Code #region Private Constants /// <summary> /// The file extension used for dynamic link libraries. /// </summary> private static readonly string DllFileExtension = ".dll"; |
︙ | ︙ |