Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Change ForceLogPrepare to an instanced property, primarily in order to avoid lock contention. Pursuant to https://sqlite.org/forum/forumpost/0cf95d2717. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
15055f1aacc281671147790f5b5b1437 |
User & Date: | mistachkin 2021-06-07 17:34:38 |
Context
2021-06-17
| ||
22:57 | Bump several NuGet package versions. check-in: c2d14915f2 user: mistachkin tags: trunk | |
2021-06-07
| ||
17:34 | Change ForceLogPrepare to an instanced property, primarily in order to avoid lock contention. Pursuant to https://sqlite.org/forum/forumpost/0cf95d2717. check-in: 15055f1aac user: mistachkin tags: trunk | |
2021-05-31
| ||
17:57 | Update the downloads page. check-in: 0ba5dd65c3 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
114 115 116 117 118 119 120 121 122 123 124 125 126 127 | /// The modules created using this connection. /// </summary> protected Dictionary<string, SQLiteModule> _modules; #endif /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Constructs the object used to interact with the SQLite core library /// using the UTF-8 text encoding. /// </summary> /// <param name="fmt"> /// The DateTime format to be used when converting string values to a /// DateTime and binding DateTime parameters. | > > > > > > > > > > > | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | /// The modules created using this connection. /// </summary> protected Dictionary<string, SQLiteModule> _modules; #endif /////////////////////////////////////////////////////////////////////////////////////////////// #region Query Preparation Diagnostics Support /// <summary> /// This field is used to keep track of whether or not the /// "SQLite_ForceLogPrepare" environment variable has been queried. If so, /// it will only be non-zero if the environment variable was present. /// </summary> private bool _forceLogPrepare; #endregion /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Constructs the object used to interact with the SQLite core library /// using the UTF-8 text encoding. /// </summary> /// <param name="fmt"> /// The DateTime format to be used when converting string values to a /// DateTime and binding DateTime parameters. |
︙ | ︙ | |||
150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | string fmtString, IntPtr db, string fileName, bool ownHandle ) : base(fmt, kind, fmtString) { if (db != IntPtr.Zero) { _sql = new SQLiteConnectionHandle(db, ownHandle); _fileName = fileName; SQLiteConnection.OnChanged(null, new ConnectionEventArgs( SQLiteConnectionEventType.NewCriticalHandle, null, null, null, null, _sql, fileName, new object[] { typeof(SQLite3), fmt, kind, fmtString, db, fileName, ownHandle })); } } /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | string fmtString, IntPtr db, string fileName, bool ownHandle ) : base(fmt, kind, fmtString) { InitializeForceLogPrepare(); if (db != IntPtr.Zero) { _sql = new SQLiteConnectionHandle(db, ownHandle); _fileName = fileName; SQLiteConnection.OnChanged(null, new ConnectionEventArgs( SQLiteConnectionEventType.NewCriticalHandle, null, null, null, null, _sql, fileName, new object[] { typeof(SQLite3), fmt, kind, fmtString, db, fileName, ownHandle })); } } /////////////////////////////////////////////////////////////////////////////////////////////// #region Query Preparation Diagnostics Support /// <summary> /// Determines if all calls to prepare a SQL query will be logged, /// regardless of the flags for the associated connection. /// </summary> private void InitializeForceLogPrepare() { if (UnsafeNativeMethods.GetSettingValue( "SQLite_ForceLogPrepare", null) != null) { _forceLogPrepare = true; } else { _forceLogPrepare = false; } } /////////////////////////////////////////////////////////////////////////////////////////////// internal override bool ForceLogPrepare { get { return _forceLogPrepare; } } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { |
︙ | ︙ | |||
1333 1334 1335 1336 1337 1338 1339 | string result = SQLiteBase.GetLastError(_sql, _sql); if (String.IsNullOrEmpty(result)) result = defValue; return result; } /////////////////////////////////////////////////////////////////////////////////////////////// | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 | string result = SQLiteBase.GetLastError(_sql, _sql); if (String.IsNullOrEmpty(result)) result = defValue; return result; } /////////////////////////////////////////////////////////////////////////////////////////////// #region Lifecycle Diagnostics Support /// <summary> /// This field is used to keep track of whether or not the /// "SQLite_ForceLogLifecycle" environment variable has been queried. If /// so, it will only be non-zero if the environment variable was present. /// </summary> private static bool? forceLogLifecycle = null; /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if calls into key members pertaining to the lifecycle of /// connections and their associated classes will be logged, regardless /// of the flags for the associated connection. /// </summary> |
︙ | ︙ | |||
1443 1444 1445 1446 1447 1448 1449 | "{0}.", baseSchemaName), String.Empty); } } SQLiteConnectionFlags flags = (cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default; | | | 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 | "{0}.", baseSchemaName), String.Empty); } } SQLiteConnectionFlags flags = (cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default; if (_forceLogPrepare || 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)); |
︙ | ︙ | |||
1712 1713 1714 1715 1716 1717 1718 | 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; | | | | | 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 1761 | 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } SQLiteErrorCode n; if (HelperMethods.HasFlags(flags, SQLiteConnectionFlags.BindUInt32AsInt64)) |
︙ | ︙ | |||
1775 1776 1777 1778 1779 1780 1781 | 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; | | | | | | | | 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 | 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || HelperMethods.LogBind(flags)) { LogBind(handle, index, value); } byte[] b = ToUTF8(value); if (_forceLogPrepare || 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 (_forceLogPrepare || HelperMethods.LogBind(flags)) { LogBind(handle, index, dt); } if (HelperMethods.HasFlags(flags, SQLiteConnectionFlags.BindDateTimeWithKind)) { if ((_datetimeKind != DateTimeKind.Unspecified) && |
︙ | ︙ | |||
1874 1875 1876 1877 1878 1879 1880 | switch (_datetimeFormat) { case SQLiteDateFormats.Ticks: { long value = dt.Ticks; | | | | | | | | | 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 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 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 | switch (_datetimeFormat) { case SQLiteDateFormats.Ticks: { long value = dt.Ticks; if (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || 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 (_forceLogPrepare || HelperMethods.LogBind(flags)) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter count is {1}.", handleIntPtr, value)); |
︙ | ︙ | |||
2005 2006 2007 2008 2009 2010 2011 | #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 | | | | 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 | #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 (_forceLogPrepare || 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 (_forceLogPrepare || HelperMethods.LogBind(flags)) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter index of name {{{1}}} is #{2}.", handleIntPtr, paramName, index)); |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteBase.cs.
︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 72 73 74 75 76 | /// This is not really a per-connection value, it is global to the process. /// </summary> internal abstract long MemoryHighwater { get; } /// <summary> /// Returns non-zero if the underlying native connection handle is owned by this instance. /// </summary> internal abstract bool OwnHandle { get; } /// <summary> /// Returns the logical list of functions associated with this connection. /// </summary> internal abstract IDictionary<SQLiteFunctionAttribute, SQLiteFunction> Functions { get; } /// <summary> /// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled. /// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is | > > > > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | /// This is not really a per-connection value, it is global to the process. /// </summary> internal abstract long MemoryHighwater { get; } /// <summary> /// Returns non-zero if the underlying native connection handle is owned by this instance. /// </summary> internal abstract bool OwnHandle { get; } /// <summary> /// Non-zero to log all calls to prepare a SQL query. /// </summary> internal abstract bool ForceLogPrepare { get; } /// <summary> /// Returns the logical list of functions associated with this connection. /// </summary> internal abstract IDictionary<SQLiteFunctionAttribute, SQLiteFunction> Functions { get; } /// <summary> /// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled. /// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteStatement.cs.
︙ | ︙ | |||
396 397 398 399 400 401 402 | object obj = param.Value; DbType objType = param.DbType; if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); | | | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | object obj = param.Value; DbType objType = param.DbType; if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); if (_sql.ForceLogPrepare || 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)); |
︙ | ︙ |