Version History
-1.0.83.0 - December XX, 2012 (release scheduled)
+1.0.85.0 - March XX, 2013 (release scheduled)
+-
+
- Updated to SQLite 3.7.16. +
- Skip checking loaded assemblies for types tagged with the SQLiteFunction attribute when the No_SQLiteFunctions environment variable is set. Pursuant to [e4c8121f7b]. +
- Add HexPassword connection string property to work around the inability to include a literal semicolon in a connection string property value. Pursuant to [1c456ae75f]. +
- Add static Execute method to the SQLiteCommand class. +
- Support custom connection pool implementations by adding the ISQLiteConnectionPool interface, the static SQLiteConnection.ConnectionPool property, and the static CreateHandle method in addition to modifying the SQLiteConnectionPool class. Pursuant to [393d954be0]. +
- Add public constructor to the SQLiteDataAdapter class that allows passing the parseViaFramework parameter to the SQLiteConnection constructor. +
- When built with the CHECK_STATE compile-time option, skip throwing exceptions from the SQLiteDataReader class when the object is being disposed. +
- Support automatic value conversions for columns with a declared type of BIGUINT, INTEGER8, INTEGER16, INTEGER32, INTEGER64, SMALLUINT, TINYSINT, UNSIGNEDINTEGER, UNSIGNEDINTEGER8, UNSIGNEDINTEGER16, UNSIGNEDINTEGER32, UNSIGNEDINTEGER64, INT8, INT16, INT32, INT64, UINT, UINT8, UINT16, UINT32, UINT64, or ULONG. +
- Add BindUInt32AsInt64 connection flag to force binding of UInt32 values as Int64 instead. Pursuant to [c010fa6584]. +
- Add BindAllAsText connection flag to force binding of all values as text. +
- Remove AUTOINCREMENT from the column type name map. ** Potentially Incompatible Change ** +
- Avoid throwing overflow exceptions from the SQLite3.GetValue method for integral column types. Partial fix for [c010fa6584]. ** Potentially Incompatible Change ** +
- Use the legacy connection closing algorithm when built with the INTEROP_LEGACY_CLOSE compile-time option. +
- Support using the directory containing the primary managed-only assembly as the basis for native library pre-loading. +
1.0.84.0 - January 9, 2013
+-
+
- Updated to SQLite 3.7.15.2. +
- Explicitly dispose of all SQLiteCommand objects managed by the DbDataAdapter class. Fix for [6434e23a0f]. +
- Add Cancel method to the SQLiteConnection class to interrupt a long running query. +
- Improve thread safety of the SQLiteLog.LogMessage method. +
1.0.83.0 - December 29, 2012
- Updated to SQLite 3.7.15.1.
- Add Visual Studio 2012 support to all the applicable solution/project files, their associated supporting files, and the test suite.
- Add Visual Studio 2012 support to the redesigned designer support installer.
- Allow opened connections to skip adding the extension functions included in the interop assembly via the new NoExtensionFunctions connection flag. Index: Doc/Extra/welcome.html ================================================================== --- Doc/Extra/welcome.html +++ Doc/Extra/welcome.html @@ -158,11 +158,11 @@
-
+ ///
HexPassword + ///{hexPassword} - Must contain a sequence of zero or more hexadecimal encoded byte values without a leading "0x" prefix. Using this parameter requires that the CryptoAPI based codec be enabled at compile-time for both the native interop assembly and the core managed assemblies; otherwise, using this parameter may result in an exception being thrown when attempting to open the connection. + ///N + ///+ ///
/// -
///
Enlist ///Y - Automatically enlist in distributed transactions ///
N - No automatic enlistmentN ///Y ///
/// -
///
Pooling - ///True - Use connection pooling + ///
False - Do not use connection pooling+ /// True - Use connection pooling. ///
+ /// False - Do not use connection pooling.
+ /// WARNING: When using the default connection pool implementation, + /// setting this property to True should be avoided by applications that make + /// use of COM (either directly or indirectly) due to possible deadlocks that + /// can occur during the finalization of some COM objects. + ///N ///False ///
/// -
///
FailIfMissing @@ -294,10 +308,11 @@ private const SQLiteDateFormats DefaultDateTimeFormat = SQLiteDateFormats.ISO8601; private const DateTimeKind DefaultDateTimeKind = DateTimeKind.Unspecified; private const string DefaultDataSource = null; private const string DefaultUri = null; private const string DefaultFullUri = null; + private const string DefaultHexPassword = null; private const string DefaultPassword = null; private const int DefaultVersion = 3; private const int DefaultPageSize = 1024; private const int DefaultMaxPageCount = 0; private const int DefaultCacheSize = 2000; @@ -474,14 +489,15 @@ { #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY UnsafeNativeMethods.Initialize(); #endif -#if !PLATFORM_COMPACTFRAMEWORK +#if !INTEROP_LOG SQLiteLog.Initialize(); +#endif -#if SQLITE_STANDARD +#if !PLATFORM_COMPACTFRAMEWORK && !INTEROP_LEGACY_CLOSE && SQLITE_STANDARD // // NOTE: Check if the sqlite3_close_v2() native API should be available // to use. This must be done dynamically because the delegate set // here is used by the SQLiteConnectionHandle class, which is a // CriticalHandle derived class (i.e. protected by a constrained @@ -500,11 +516,12 @@ if (_versionNumber >= 3007014) SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2; } } #endif -#elif INTEROP_LOG + +#if INTEROP_LOG if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok) { UnsafeNativeMethods.sqlite3_log( SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized.")); } @@ -622,10 +639,48 @@ } } /////////////////////////////////////////////////////////////////////////////////////////////// + ///+ /// This property is used to obtain or set the custom connection pool + /// implementation to use, if any. Setting this property to null will + /// cause the default connection pool implementation to be used. + /// + public static ISQLiteConnectionPool ConnectionPool + { + get { return SQLiteConnectionPool.GetConnectionPool(); } + set { SQLiteConnectionPool.SetConnectionPool(value); } + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///+ /// Creates and returns a new managed database connection handle. This + /// method is intended to be used by implementations of the + /// + /// + /// This must be a native database connection handle returned by the + /// SQLite core library and it must remain valid and open during the + /// entire duration of the calling method. + /// + ///interface only. In theory, it + /// could be used by other classes; however, that usage is not supported. + /// + /// The new managed database connection handle or null if it cannot be + /// created. + /// + public static object CreateHandle( + IntPtr nativeHandle + ) + { + if (nativeHandle == IntPtr.Zero) return null; + return new SQLiteConnectionHandle(nativeHandle); + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + #region Backup API Members ////// Backs up the database, using the specified database connection as the /// destination. /// @@ -717,11 +772,10 @@ // if (pages == 0) break; } } -#if !PLATFORM_COMPACTFRAMEWORK catch (Exception e) { if ((_flags & SQLiteConnectionFlags.LogBackup) == SQLiteConnectionFlags.LogBackup) { SQLiteLog.LogMessage(String.Format( @@ -729,11 +783,10 @@ "Caught exception while backing up database: {0}", e)); } throw; } -#endif finally { if (backup != null) sqliteBase.FinishBackup(backup); /* throw */ } @@ -1143,19 +1196,32 @@ ///Password ///{password} - Using this parameter requires that the CryptoAPI based codec be enabled at compile-time for both the native interop assembly and the core managed assemblies; otherwise, using this parameter may result in an exception being thrown when attempting to open the connection. ///N //////
+ /// -
+ ///
HexPassword + ///{hexPassword} - Must contain a sequence of zero or more hexadecimal encoded byte values without a leading "0x" prefix. Using this parameter requires that the CryptoAPI based codec be enabled at compile-time for both the native interop assembly and the core managed assemblies; otherwise, using this parameter may result in an exception being thrown when attempting to open the connection. + ///N + ///+ ///
/// -
///
Enlist ///Y - Automatically enlist in distributed transactions ///
N - No automatic enlistmentN ///Y ///
/// -
///
Pooling - ///True - Use connection pooling + ///
False - Do not use connection pooling+ /// True - Use connection pooling. ///
+ /// False - Do not use connection pooling.
+ /// WARNING: When using the default connection pool implementation, + /// setting this property to True should be avoided by applications that + /// make use of COM (either directly or indirectly) due to possible + /// deadlocks that can occur during the finalization of some COM objects. + ///N ///False ///
/// -
///
FailIfMissing @@ -1333,12 +1399,11 @@ { string s = connectionString; int n; SortedList+ /// Attempts to convert an input string into a byte value. + /// + /// + /// The string value to be converted. + /// + /// + /// The number styles to use for the conversion. + /// + /// + /// Upon sucess, this will contain the parsed byte value. + /// Upon failure, the value of this parameter is undefined. + /// + ///+ /// Non-zero upon success; zero on failure. + /// + private static bool TryParseByte( + string value, + NumberStyles style, + out byte result + ) + { +#if !PLATFORM_COMPACTFRAMEWORK + return byte.TryParse(value, style, null, out result); +#else + try + { + result = byte.Parse(value, style); + return true; + } + catch + { + result = 0; + return false; + } +#endif + } ////// Enables or disabled extension loading. /// /// @@ -1548,10 +1651,112 @@ throw new InvalidOperationException( "Database connection not valid for loading extensions."); _sql.LoadExtension(fileName, procName); } + + ///+ /// Parses a string containing a sequence of zero or more hexadecimal + /// encoded byte values and returns the resulting byte array. The + /// "0x" prefix is not allowed on the input string. + /// + /// + /// The input string containing zero or more hexadecimal encoded byte + /// values. + /// + ///+ /// A byte array containing the parsed byte values or null if an error + /// was encountered. + /// + internal static byte[] FromHexString( + string text + ) + { + string error = null; + + return FromHexString(text, ref error); + } + + ///+ /// Creates and returns a string containing the hexadecimal encoded byte + /// values from the input array. + /// + /// + /// The input array of bytes. + /// + ///+ /// The resulting string or null upon failure. + /// + internal static string ToHexString( + byte[] array + ) + { + if (array == null) + return null; + + StringBuilder result = new StringBuilder(); + + int length = array.Length; + + for (int index = 0; index < length; index++) + result.AppendFormat("{0:x2}", array[index]); + + return result.ToString(); + } + + ///+ /// Parses a string containing a sequence of zero or more hexadecimal + /// encoded byte values and returns the resulting byte array. The + /// "0x" prefix is not allowed on the input string. + /// + /// + /// The input string containing zero or more hexadecimal encoded byte + /// values. + /// + /// + /// Upon failure, this will contain an appropriate error message. + /// + ///+ /// A byte array containing the parsed byte values or null if an error + /// was encountered. + /// + private static byte[] FromHexString( + string text, + ref string error + ) + { + if (String.IsNullOrEmpty(text)) + { + error = "string is null or empty"; + return null; + } + + if (text.Length % 2 != 0) + { + error = "string contains an odd number of characters"; + return null; + } + + byte[] result = new byte[text.Length / 2]; + + for (int index = 0; index < text.Length; index += 2) + { + string value = text.Substring(index, 2); + + if (!TryParseByte(value, + NumberStyles.HexNumber, out result[index / 2])) + { + error = String.Format( + "string contains \"{0}\", which cannot be converted to a byte value", + value); + + return null; + } + } + + return result; + } ////// Opens the connection using the parameters found in the public override void Open() @@ -1684,17 +1889,35 @@ _sql.Open(fileName, _flags, flags, maxPoolSize, usePooling); _binaryGuid = SQLiteConvert.ToBoolean(FindKey(opts, "BinaryGUID", DefaultBinaryGUID.ToString())); #if INTEROP_CODEC - string password = FindKey(opts, "Password", DefaultPassword); + string hexPassword = FindKey(opts, "HexPassword", DefaultHexPassword); - if (!String.IsNullOrEmpty(password)) - _sql.SetPassword(System.Text.UTF8Encoding.UTF8.GetBytes(password)); - else if (_password != null) - _sql.SetPassword(_password); + if (!String.IsNullOrEmpty(hexPassword)) + { + string error = null; + byte[] hexPasswordBytes = FromHexString(hexPassword, ref error); + if (hexPasswordBytes == null) + { + throw new FormatException(String.Format( + "Cannot parse 'HexPassword' property value into byte values: {0}", + error)); + } + + _sql.SetPassword(hexPasswordBytes); + } + else + { + string password = FindKey(opts, "Password", DefaultPassword); + + if (!String.IsNullOrEmpty(password)) + _sql.SetPassword(UTF8Encoding.UTF8.GetBytes(password)); + else if (_password != null) + _sql.SetPassword(_password); + } _password = null; #endif if (!fullUri) _dataSource = Path.GetFileNameWithoutExtension(fileName); @@ -1897,10 +2120,29 @@ throw new InvalidOperationException("Database connection not valid for getting last insert rowid."); return _sql.LastInsertRowId; } } + + ///. /// + /// This method causes any pending database operation to abort and return at + /// its earliest opportunity. This routine is typically called in response + /// to a user action such as pressing "Cancel" or Ctrl-C where the user wants + /// a long query operation to halt immediately. It is safe to call this + /// routine from any thread. However, it is not safe to call this routine + /// with a database connection that is closed or might close before this method + /// returns. + /// + public void Cancel() + { + CheckDisposed(); + + if (_sql == null) + throw new InvalidOperationException("Database connection not valid for query cancellation."); + + _sql.Cancel(); /* throw */ + } ////// Returns the number of rows changed by the last INSERT, UPDATE, or DELETE statement executed on /// this connection. /// @@ -2116,11 +2358,11 @@ /// The new password to assign to the database public void ChangePassword(string newPassword) { CheckDisposed(); - ChangePassword(String.IsNullOrEmpty(newPassword) ? null : System.Text.UTF8Encoding.UTF8.GetBytes(newPassword)); + ChangePassword(String.IsNullOrEmpty(newPassword) ? null : UTF8Encoding.UTF8.GetBytes(newPassword)); } ////// Change the password (or assign a password) to an open database. /// @@ -2146,11 +2388,11 @@ /// The password for the database public void SetPassword(string databasePassword) { CheckDisposed(); - SetPassword(String.IsNullOrEmpty(databasePassword) ? null : System.Text.UTF8Encoding.UTF8.GetBytes(databasePassword)); + SetPassword(String.IsNullOrEmpty(databasePassword) ? null : UTF8Encoding.UTF8.GetBytes(databasePassword)); } ////// Sets the password for a password-protected database. A password-protected database is /// unusable for any operation until the password has been set. Index: System.Data.SQLite/SQLiteConnectionPool.cs ================================================================== --- System.Data.SQLite/SQLiteConnectionPool.cs +++ System.Data.SQLite/SQLiteConnectionPool.cs @@ -1,410 +1,1028 @@ -/******************************************************** - * ADO.NET 2.0 Data Provider for SQLite Version 3.X - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -namespace System.Data.SQLite -{ - using System; - using System.Collections.Generic; - using System.Threading; - - internal static class SQLiteConnectionPool - { - /// ///- /// Keeps track of connections made on a specified file. The PoolVersion dictates whether old objects get - /// returned to the pool or discarded when no longer in use. - /// - internal class Pool - { - internal readonly QueueQueue = new Queue (); - internal int PoolVersion; - internal int MaxPoolSize; - - internal Pool(int version, int maxSize) - { - PoolVersion = version; - MaxPoolSize = maxSize; - } - } - - /// - /// The connection pool object - /// - private static SortedList- /// The default version number new pools will get - /// - private static int _poolVersion = 1; - - ///- /// The number of connections successfully opened from any pool. - /// This value is incremented by the Remove method. - /// - private static int _poolOpened = 0; - - ///- /// The number of connections successfully closed from any pool. - /// This value is incremented by the Add method. - /// - private static int _poolClosed = 0; - - ///- /// Counts the number of pool entries matching the specified file name. - /// - /// The file name to match or null to match all files. - /// The pool entry counts for each matching file. - /// The total number of connections successfully opened from any pool. - /// The total number of connections successfully closed from any pool. - /// The total number of pool entries for all matching files. - internal static void GetCounts( - string fileName, - ref DictionarypoolQueue = queue.Queue; - int count = (poolQueue != null) ? poolQueue.Count : 0; - - counts.Add(fileName, count); - totalCount += count; - } - } - else - { - foreach (KeyValuePair poolQueue = pair.Value.Queue; - int count = (poolQueue != null) ? poolQueue.Count : 0; - - counts.Add(pair.Key, count); - totalCount += count; - } - } - } - } - - /// - /// Attempt to pull a pooled connection out of the queue for active duty - /// - /// The filename for a desired connection - /// The maximum size the connection pool for the filename can be - /// The pool version the returned connection will belong to - ///Returns NULL if no connections were available. Even if none are, the poolversion will still be a valid pool version - internal static SQLiteConnectionHandle Remove(string fileName, int maxPoolSize, out int version) - { - int localVersion; - QueuepoolQueue; - - // - // NOTE: This lock cannot be held while checking the queue for available - // connections because other methods of this class are called from - // the GC finalizer thread and we use the WaitForPendingFinalizers - // method (below). Holding this lock while calling that method - // would therefore result in a deadlock. Instead, this lock is - // held only while a temporary copy of the queue is created, and - // if necessary, when committing changes back to that original - // queue prior to returning from this method. - // - lock (_connections) - { - Pool queue; - - // Default to the highest pool version - version = _poolVersion; - - // If we didn't find a pool for this file, create one even though it will be empty. - // We have to do this here because otherwise calling ClearPool() on the file will not work for active connections - // that have never seen the pool yet. - if (_connections.TryGetValue(fileName, out queue) == false) - { - queue = new Pool(_poolVersion, maxPoolSize); - _connections.Add(fileName, queue); - - return null; - } - - // We found a pool for this file, so use its version number - version = localVersion = queue.PoolVersion; - queue.MaxPoolSize = maxPoolSize; - - ResizePool(queue, false); - - // Try and get a pooled connection from the queue - poolQueue = queue.Queue; - if (poolQueue == null) return null; - - // - // NOTE: Temporarily tranfer the queue for this file into a local - // variable. The queue for this file will be modified and - // then committed back to the real pool list (below) prior - // to returning from this method. - // - _connections.Remove(fileName); - poolQueue = new Queue (poolQueue); - } - - try - { - while (poolQueue.Count > 0) - { - WeakReference cnn = poolQueue.Dequeue(); - if (cnn == null) continue; - - SQLiteConnectionHandle hdl = cnn.Target as SQLiteConnectionHandle; - if (hdl == null) continue; - - // - // BUGFIX: For ticket [996d13cd87], step #1. After this point, - // make sure that the finalizer for the connection - // handle just obtained from the queue cannot START - // running (i.e. it may still be pending but it will no - // longer start after this point). - // - GC.SuppressFinalize(hdl); - - try - { - // - // BUGFIX: For ticket [996d13cd87], step #2. Now, we must wait - // for all pending finalizers which have STARTED running - // and have not yet COMPLETED. This must be done just - // in case the finalizer for the connection handle just - // obtained from the queue has STARTED running at some - // point before SuppressFinalize was called on it. - // - // After this point, checking properties of the - // connection handle (e.g. IsClosed) should work - // reliably without having to worry that they will - // (due to the finalizer) change out from under us. - // - GC.WaitForPendingFinalizers(); - - // - // BUGFIX: For ticket [996d13cd87], step #3. Next, verify that - // the connection handle is actually valid and [still?] - // not closed prior to actually returning it to our - // caller. - // - if (!hdl.IsInvalid && !hdl.IsClosed) - { - Interlocked.Increment(ref _poolOpened); - return hdl; - } - } - finally - { - // - // BUGFIX: For ticket [996d13cd87], step #4. Next, we must - // re-register the connection handle for finalization - // now that we have a strong reference to it (i.e. the - // finalizer will not run at least until the connection - // is subsequently closed). - // - GC.ReRegisterForFinalize(hdl); - } - - GC.KeepAlive(hdl); - } - } - finally - { - // - // BUGFIX: For ticket [996d13cd87], step #5. Finally, commit any - // changes to the pool/queue for this database file. - // - lock (_connections) - { - // - // NOTE: We must check [again] if a pool exists for this file - // because one may have been added while the search for - // an available connection was in progress (above). - // - Pool queue; - Queue newPoolQueue; - bool addPool; - - if (_connections.TryGetValue(fileName, out queue)) - { - addPool = false; - } - else - { - addPool = true; - queue = new Pool(localVersion, maxPoolSize); - } - - newPoolQueue = queue.Queue; - - while (poolQueue.Count > 0) - newPoolQueue.Enqueue(poolQueue.Dequeue()); - - ResizePool(queue, false); - - if (addPool) - _connections.Add(fileName, queue); - } - } - - return null; - } - - /// - /// Clears out all pooled connections and rev's up the default pool version to force all old active objects - /// not in the pool to get discarded rather than returned to their pools. - /// - internal static void ClearAllPools() - { - lock (_connections) - { - foreach (KeyValuePairpoolQueue = pair.Value.Queue; - - while (poolQueue.Count > 0) - { - WeakReference cnn = poolQueue.Dequeue(); - if (cnn == null) continue; - SQLiteConnectionHandle hdl = cnn.Target as SQLiteConnectionHandle; - if (hdl != null) - { - hdl.Dispose(); - } - GC.KeepAlive(hdl); - } - - // Keep track of the highest revision so we can go one higher when we're finished - if (_poolVersion <= pair.Value.PoolVersion) - _poolVersion = pair.Value.PoolVersion + 1; - } - // All pools are cleared and we have a new highest version number to force all old version active items to get discarded - // instead of going back to the queue when they are closed. - // We can get away with this because we've pumped up the _poolVersion out of range of all active connections, so they - // will all get discarded when they try to put themselves back in their pool. - _connections.Clear(); - } - } - - /// - /// Clear a given pool for a given filename. Discards anything in the pool for the given file, and revs the pool - /// version so current active objects on the old version of the pool will get discarded rather than be returned to the pool. - /// - /// The filename of the pool to clear - internal static void ClearPool(string fileName) - { - lock (_connections) - { - Pool queue; - if (_connections.TryGetValue(fileName, out queue) == true) - { - queue.PoolVersion++; - - QueuepoolQueue = queue.Queue; - if (poolQueue == null) return; - - while (poolQueue.Count > 0) - { - WeakReference cnn = poolQueue.Dequeue(); - if (cnn == null) continue; - SQLiteConnectionHandle hdl = cnn.Target as SQLiteConnectionHandle; - if (hdl != null) - { - hdl.Dispose(); - } - GC.KeepAlive(hdl); - } - } - } - } - - /// - /// Return a connection to the pool for someone else to use. - /// - /// The filename of the pool to use - /// The connection handle to pool - /// The pool version the handle was created under - ///- /// If the version numbers don't match between the connection and the pool, then the handle is discarded. - /// - internal static void Add(string fileName, SQLiteConnectionHandle hdl, int version) - { - lock (_connections) - { - // If the queue doesn't exist in the pool, then it must've been cleared sometime after the connection was created. - Pool queue; - if (_connections.TryGetValue(fileName, out queue) == true && version == queue.PoolVersion) - { - ResizePool(queue, true); - - QueuepoolQueue = queue.Queue; - if (poolQueue == null) return; - - poolQueue.Enqueue(new WeakReference(hdl, false)); - Interlocked.Increment(ref _poolClosed); - } - else - { - hdl.Close(); - } - GC.KeepAlive(hdl); - } - } - - /// - /// We don't have to thread-lock anything in this function, because it's only called by other functions above - /// which already have a thread-safe lock. - /// - /// The queue to resize - /// If a function intends to add to the pool, this is true, which forces the resize - /// to take one more than it needs from the pool - private static void ResizePool(Pool queue, bool forAdding) - { - int target = queue.MaxPoolSize; - - if (forAdding && target > 0) target--; - - QueuepoolQueue = queue.Queue; - if (poolQueue == null) return; - - while (poolQueue.Count > target) - { - WeakReference cnn = poolQueue.Dequeue(); - if (cnn == null) continue; - SQLiteConnectionHandle hdl = cnn.Target as SQLiteConnectionHandle; - if (hdl != null) - { - hdl.Dispose(); - } - GC.KeepAlive(hdl); - } - } - } -} +/******************************************************** + * ADO.NET 2.0 Data Provider for SQLite Version 3.X + * Written by Robert Simpson (robert@blackcastlesoft.com) + * + * Released to the public domain, use at your own risk! + ********************************************************/ + +namespace System.Data.SQLite +{ + using System; + using System.Collections.Generic; + +#if !PLATFORM_COMPACTFRAMEWORK && DEBUG + using System.Text; +#endif + + using System.Threading; + + /////////////////////////////////////////////////////////////////////////// + + #region Null Connection Pool Class +#if !PLATFORM_COMPACTFRAMEWORK && DEBUG + /// + /// This class implements a connection pool where all methods of the + /// + internal sealed class NullConnectionPool : ISQLiteConnectionPool + { + #region Private Data + ///interface are NOPs. This class + /// is used for testing purposes only. + /// + /// This field keeps track of all method calls made into the + /// + private StringBuilder log; + + /////////////////////////////////////////////////////////////////////// + + ///interface methods of this + /// class. + /// + /// Non-zero to dispose of database connection handles received via the + /// + private bool dispose; + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Private Constructors + ///method. + /// + /// Constructs a connection pool object where all methods of the + /// + private NullConnectionPool() + { + log = new StringBuilder(); + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Public Constructors + ///interface are NOPs. This + /// class is used for testing purposes only. + /// + /// Constructs a connection pool object where all methods of the + /// + /// + /// Non-zero to dispose of database connection handles received via the + ///interface are NOPs. This + /// class is used for testing purposes only. + /// method. + /// + public NullConnectionPool( + bool dispose + ) + : this() + { + this.dispose = dispose; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region ISQLiteConnectionPool Members + /// + /// Counts the number of pool entries matching the specified file name. + /// + /// + /// The file name to match or null to match all files. + /// + /// + /// The pool entry counts for each matching file. + /// + /// + /// The total number of connections successfully opened from any pool. + /// + /// + /// The total number of connections successfully closed from any pool. + /// + /// + /// The total number of pool entries for all matching files. + /// + public void GetCounts( + string fileName, + ref Dictionary+ /// Disposes of all pooled connections associated with the specified + /// database file name. + /// + /// + /// The database file name. + /// + public void ClearPool( + string fileName + ) + { + if (log != null) + { + log.AppendFormat( + "ClearPool(\"{0}\"){1}", fileName, Environment.NewLine); + } + } + + /////////////////////////////////////////////////////////////////////// + + ///+ /// Disposes of all pooled connections. + /// + public void ClearAllPools() + { + if (log != null) + { + log.AppendFormat( + "ClearAllPools(){0}", Environment.NewLine); + } + } + + /////////////////////////////////////////////////////////////////////// + + ///+ /// Adds a connection to the pool of those associated with the + /// specified database file name. + /// + /// + /// The database file name. + /// + /// + /// The database connection handle. + /// + /// + /// The connection pool version at the point the database connection + /// handle was received from the connection pool. This is also the + /// connection pool version that the database connection handle was + /// created under. + /// + public void Add( + string fileName, + object handle, + int version + ) + { + if (log != null) + { + log.AppendFormat( + "Add(\"{0}\", {1}, {2}){3}", fileName, handle, version, + Environment.NewLine); + } + + // + // NOTE: If configured to do so, dispose of the received connection + // handle now. + // + if (dispose) + { + IDisposable disposable = handle as IDisposable; + + if (disposable != null) + disposable.Dispose(); + } + } + + /////////////////////////////////////////////////////////////////////// + + ///+ /// Removes a connection from the pool of those associated with the + /// specified database file name with the intent of using it to + /// interact with the database. + /// + /// + /// The database file name. + /// + /// + /// The new maximum size of the connection pool for the specified + /// database file name. + /// + /// + /// The connection pool version associated with the returned database + /// connection handle, if any. + /// + ///+ /// The database connection handle associated with the specified + /// database file name or null if it cannot be obtained. + /// + public object Remove( + string fileName, + int maxPoolSize, + out int version + ) + { + version = 0; + + if (log != null) + { + log.AppendFormat( + "Remove(\"{0}\", {1}, {2}){3}", fileName, maxPoolSize, + version, Environment.NewLine); + } + + return null; + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region System.Object Overrides + ///+ /// Overrides the default + ///method + /// to provide a log of all methods called on the + /// interface. + /// + /// A string containing a log of all method calls into the + /// + public override string ToString() + { + return (log != null) ? log.ToString() : String.Empty; + } + #endregion + } +#endif + #endregion + + /////////////////////////////////////////////////////////////////////////// + + #region Public Connection Pool Interface + ///interface, along with their + /// parameters, delimited by . + /// + /// This interface represents a custom connection pool implementation + /// usable by System.Data.SQLite. + /// + public interface ISQLiteConnectionPool + { + ///+ /// Counts the number of pool entries matching the specified file name. + /// + /// + /// The file name to match or null to match all files. + /// + /// + /// The pool entry counts for each matching file. + /// + /// + /// The total number of connections successfully opened from any pool. + /// + /// + /// The total number of connections successfully closed from any pool. + /// + /// + /// The total number of pool entries for all matching files. + /// + void GetCounts(string fileName, ref Dictionary+ /// Disposes of all pooled connections associated with the specified + /// database file name. + /// + /// + /// The database file name. + /// + void ClearPool(string fileName); + + ///+ /// Disposes of all pooled connections. + /// + void ClearAllPools(); + + ///+ /// Adds a connection to the pool of those associated with the + /// specified database file name. + /// + /// + /// The database file name. + /// + /// + /// The database connection handle. + /// + /// + /// The connection pool version at the point the database connection + /// handle was received from the connection pool. This is also the + /// connection pool version that the database connection handle was + /// created under. + /// + void Add(string fileName, object handle, int version); + + ///+ /// Removes a connection from the pool of those associated with the + /// specified database file name with the intent of using it to + /// interact with the database. + /// + /// + /// The database file name. + /// + /// + /// The new maximum size of the connection pool for the specified + /// database file name. + /// + /// + /// The connection pool version associated with the returned database + /// connection handle, if any. + /// + ///+ /// The database connection handle associated with the specified + /// database file name or null if it cannot be obtained. + /// + object Remove(string fileName, int maxPoolSize, out int version); + } + #endregion + + /////////////////////////////////////////////////////////////////////////// + + #region Connection Pool Subsystem & Default Implementation + ///+ /// This default method implementations in this class should not be used by + /// applications that make use of COM (either directly or indirectly) due + /// to possible deadlocks that can occur during finalization of some COM + /// objects. + /// + internal static class SQLiteConnectionPool + { + #region Private Pool Class + ///+ /// Keeps track of connections made on a specified file. The PoolVersion + /// dictates whether old objects get returned to the pool or discarded + /// when no longer in use. + /// + private sealed class PoolQueue + { + #region Private Data + ///+ /// The queue of weak references to the actual database connection + /// handles. + /// + internal readonly QueueQueue = + new Queue (); + + /////////////////////////////////////////////////////////////////// + + /// + /// This pool version associated with the database connection + /// handles in this pool queue. + /// + internal int PoolVersion; + + /////////////////////////////////////////////////////////////////// + + ///+ /// The maximum size of this pool queue. + /// + internal int MaxPoolSize; + #endregion + + /////////////////////////////////////////////////////////////////// + + #region Private Constructors + ///+ /// Constructs a connection pool queue using the specified version + /// and maximum size. Normally, all the database connection + /// handles in this pool are associated with a single database file + /// name. + /// + /// + /// The initial pool version for this connection pool queue. + /// + /// + /// The initial maximum size for this connection pool queue. + /// + internal PoolQueue( + int version, + int maxSize + ) + { + PoolVersion = version; + MaxPoolSize = maxSize; + } + #endregion + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Private Static Data + ///+ /// This field is used to synchronize access to the private static data + /// in this class. + /// + private static readonly object _syncRoot = new object(); + + /////////////////////////////////////////////////////////////////////// + + ///+ /// When this field is non-null, it will be used to provide the + /// implementation of all the connection pool methods; otherwise, + /// the default method implementations will be used. + /// + private static ISQLiteConnectionPool _connectionPool = null; + + /////////////////////////////////////////////////////////////////////// + + ///+ /// The dictionary of connection pools, based on the normalized file + /// name of the SQLite database. + /// + private static SortedList+ /// The default version number new pools will get. + /// + private static int _poolVersion = 1; + + /////////////////////////////////////////////////////////////////////// + + ///+ /// The number of connections successfully opened from any pool. + /// This value is incremented by the Remove method. + /// + private static int _poolOpened = 0; + + /////////////////////////////////////////////////////////////////////// + + ///+ /// The number of connections successfully closed from any pool. + /// This value is incremented by the Add method. + /// + private static int _poolClosed = 0; + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region ISQLiteConnectionPool Members (Static, Non-Formal) + ///+ /// Counts the number of pool entries matching the specified file name. + /// + /// + /// The file name to match or null to match all files. + /// + /// + /// The pool entry counts for each matching file. + /// + /// + /// The total number of connections successfully opened from any pool. + /// + /// + /// The total number of connections successfully closed from any pool. + /// + /// + /// The total number of pool entries for all matching files. + /// + internal static void GetCounts( + string fileName, + ref DictionarypoolQueue = queue.Queue; + int count = (poolQueue != null) ? poolQueue.Count : 0; + + counts.Add(fileName, count); + totalCount += count; + } + } + else + { + foreach (KeyValuePair poolQueue = pair.Value.Queue; + int count = (poolQueue != null) ? poolQueue.Count : 0; + + counts.Add(pair.Key, count); + totalCount += count; + } + } + } + } + } + + /////////////////////////////////////////////////////////////////////// + + /// + /// Disposes of all pooled connections associated with the specified + /// database file name. + /// + /// + /// The database file name. + /// + internal static void ClearPool(string fileName) + { + ISQLiteConnectionPool connectionPool = GetConnectionPool(); + + if (connectionPool != null) + { + connectionPool.ClearPool(fileName); + } + else + { + lock (_syncRoot) + { + PoolQueue queue; + + if (_queueList.TryGetValue(fileName, out queue)) + { + queue.PoolVersion++; + + QueuepoolQueue = queue.Queue; + if (poolQueue == null) return; + + while (poolQueue.Count > 0) + { + WeakReference connection = poolQueue.Dequeue(); + + if (connection == null) continue; + + SQLiteConnectionHandle handle = + connection.Target as SQLiteConnectionHandle; + + if (handle != null) + handle.Dispose(); + + GC.KeepAlive(handle); + } + } + } + } + } + + /////////////////////////////////////////////////////////////////////// + + /// + /// Disposes of all pooled connections. + /// + internal static void ClearAllPools() + { + ISQLiteConnectionPool connectionPool = GetConnectionPool(); + + if (connectionPool != null) + { + connectionPool.ClearAllPools(); + } + else + { + lock (_syncRoot) + { + foreach (KeyValuePairpoolQueue = pair.Value.Queue; + + while (poolQueue.Count > 0) + { + WeakReference connection = poolQueue.Dequeue(); + + if (connection == null) continue; + + SQLiteConnectionHandle handle = + connection.Target as SQLiteConnectionHandle; + + if (handle != null) + handle.Dispose(); + + GC.KeepAlive(handle); + } + + // + // NOTE: Keep track of the highest revision so we can + // go one higher when we are finished. + // + if (_poolVersion <= pair.Value.PoolVersion) + _poolVersion = pair.Value.PoolVersion + 1; + } + + // + // NOTE: All pools are cleared and we have a new highest + // version number to force all old version active + // items to get discarded instead of going back to + // the queue when they are closed. We can get away + // with this because we have pumped up the pool + // version out of range of all active connections, + // so they will all get discarded when they try to + // put themselves back into their pools. + // + _queueList.Clear(); + } + } + } + + /////////////////////////////////////////////////////////////////////// + + /// + /// Adds a connection to the pool of those associated with the + /// specified database file name. + /// + /// + /// The database file name. + /// + /// + /// The database connection handle. + /// + /// + /// The connection pool version at the point the database connection + /// handle was received from the connection pool. This is also the + /// connection pool version that the database connection handle was + /// created under. + /// + internal static void Add( + string fileName, + SQLiteConnectionHandle handle, + int version + ) + { + ISQLiteConnectionPool connectionPool = GetConnectionPool(); + + if (connectionPool != null) + { + connectionPool.Add(fileName, handle, version); + } + else + { + lock (_syncRoot) + { + // + // NOTE: If the queue does not exist in the pool, then it + // must have been cleared sometime after the + // connection was created. + // + PoolQueue queue; + + if (_queueList.TryGetValue(fileName, out queue) && + (version == queue.PoolVersion)) + { + ResizePool(queue, true); + + QueuepoolQueue = queue.Queue; + if (poolQueue == null) return; + + poolQueue.Enqueue(new WeakReference(handle, false)); + Interlocked.Increment(ref _poolClosed); + } + else + { + handle.Close(); + } + + GC.KeepAlive(handle); + } + } + } + + /////////////////////////////////////////////////////////////////////// + + /// + /// Removes a connection from the pool of those associated with the + /// specified database file name with the intent of using it to + /// interact with the database. + /// + /// + /// The database file name. + /// + /// + /// The new maximum size of the connection pool for the specified + /// database file name. + /// + /// + /// The connection pool version associated with the returned database + /// connection handle, if any. + /// + ///+ /// The database connection handle associated with the specified + /// database file name or null if it cannot be obtained. + /// + internal static SQLiteConnectionHandle Remove( + string fileName, + int maxPoolSize, + out int version + ) + { + ISQLiteConnectionPool connectionPool = GetConnectionPool(); + + if (connectionPool != null) + { + return connectionPool.Remove(fileName, maxPoolSize, + out version) as SQLiteConnectionHandle; + } + else + { + int localVersion; + QueuepoolQueue; + + // + // NOTE: This lock cannot be held while checking the queue for + // available connections because other methods of this + // class are called from the GC finalizer thread and we + // use the WaitForPendingFinalizers method (below). + // Holding this lock while calling that method would + // therefore result in a deadlock. Instead, this lock + // is held only while a temporary copy of the queue is + // created, and if necessary, when committing changes + // back to that original queue prior to returning from + // this method. + // + lock (_syncRoot) + { + PoolQueue queue; + + // + // NOTE: Default to the highest pool version. + // + version = _poolVersion; + + // + // NOTE: If we didn't find a pool for this file, create one + // even though it will be empty. We have to do this + // here because otherwise calling ClearPool() on the + // file will not work for active connections that have + // never seen the pool yet. + // + if (!_queueList.TryGetValue(fileName, out queue)) + { + queue = new PoolQueue(_poolVersion, maxPoolSize); + _queueList.Add(fileName, queue); + + return null; + } + + // + // NOTE: We found a pool for this file, so use its version + // number. + // + version = localVersion = queue.PoolVersion; + queue.MaxPoolSize = maxPoolSize; + + // + // NOTE: Now, resize the pool to the new maximum size, if + // necessary. + // + ResizePool(queue, false); + + // + // NOTE: Try and get a pooled connection from the queue. + // + poolQueue = queue.Queue; + if (poolQueue == null) return null; + + // + // NOTE: Temporarily tranfer the queue for this file into + // a local variable. The queue for this file will + // be modified and then committed back to the real + // pool list (below) prior to returning from this + // method. + // + _queueList.Remove(fileName); + poolQueue = new Queue (poolQueue); + } + + try + { + while (poolQueue.Count > 0) + { + WeakReference connection = poolQueue.Dequeue(); + + if (connection == null) continue; + + SQLiteConnectionHandle handle = + connection.Target as SQLiteConnectionHandle; + + if (handle == null) continue; + + // + // BUGFIX: For ticket [996d13cd87], step #1. After + // this point, make sure that the finalizer for + // the connection handle just obtained from the + // queue cannot START running (i.e. it may + // still be pending but it will no longer start + // after this point). + // + GC.SuppressFinalize(handle); + + try + { + // + // BUGFIX: For ticket [996d13cd87], step #2. Now, + // we must wait for all pending finalizers + // which have STARTED running and have not + // yet COMPLETED. This must be done just + // in case the finalizer for the connection + // handle just obtained from the queue has + // STARTED running at some point before + // SuppressFinalize was called on it. + // + // After this point, checking properties of + // the connection handle (e.g. IsClosed) + // should work reliably without having to + // worry that they will (due to the + // finalizer) change out from under us. + // + GC.WaitForPendingFinalizers(); + + // + // BUGFIX: For ticket [996d13cd87], step #3. Next, + // verify that the connection handle is + // actually valid and [still?] not closed + // prior to actually returning it to our + // caller. + // + if (!handle.IsInvalid && !handle.IsClosed) + { + Interlocked.Increment(ref _poolOpened); + return handle; + } + } + finally + { + // + // BUGFIX: For ticket [996d13cd87], step #4. Next, + // we must re-register the connection + // handle for finalization now that we have + // a strong reference to it (i.e. the + // finalizer will not run at least until + // the connection is subsequently closed). + // + GC.ReRegisterForFinalize(handle); + } + + GC.KeepAlive(handle); + } + } + finally + { + // + // BUGFIX: For ticket [996d13cd87], step #5. Finally, + // commit any changes to the pool/queue for this + // database file. + // + lock (_syncRoot) + { + // + // NOTE: We must check [again] if a pool exists for + // this file because one may have been added + // while the search for an available connection + // was in progress (above). + // + PoolQueue queue; + Queue newPoolQueue; + bool addPool; + + if (_queueList.TryGetValue(fileName, out queue)) + { + addPool = false; + } + else + { + addPool = true; + queue = new PoolQueue(localVersion, maxPoolSize); + } + + newPoolQueue = queue.Queue; + + while (poolQueue.Count > 0) + newPoolQueue.Enqueue(poolQueue.Dequeue()); + + ResizePool(queue, false); + + if (addPool) + _queueList.Add(fileName, queue); + } + } + + return null; + } + } + #endregion + + /////////////////////////////////////////////////////////////////////// + + #region Private Helper Methods + /// + /// This method is used to obtain a reference to the custom connection + /// pool implementation currently in use, if any. + /// + ///+ /// The custom connection pool implementation or null if the default + /// connection pool implementation should be used. + /// + internal static ISQLiteConnectionPool GetConnectionPool() + { + lock (_syncRoot) + { + return _connectionPool; + } + } + + /////////////////////////////////////////////////////////////////////// + + ///+ /// This method is used to set the reference to the custom connection + /// pool implementation to use, if any. + /// + /// + /// The custom connection pool implementation to use or null if the + /// default connection pool implementation should be used. + /// + internal static void SetConnectionPool( + ISQLiteConnectionPool connectionPool + ) + { + lock (_syncRoot) + { + _connectionPool = connectionPool; + } + } + + /////////////////////////////////////////////////////////////////////// + + ///+ /// We do not have to thread-lock anything in this function, because it + /// is only called by other functions above which already take the lock. + /// + /// + /// The pool queue to resize. + /// + /// + /// If a function intends to add to the pool, this is true, which + /// forces the resize to take one more than it needs from the pool. + /// + private static void ResizePool( + PoolQueue queue, + bool add + ) + { + int target = queue.MaxPoolSize; + + if (add && target > 0) target--; + + QueuepoolQueue = queue.Queue; + if (poolQueue == null) return; + + while (poolQueue.Count > target) + { + WeakReference connection = poolQueue.Dequeue(); + + if (connection == null) continue; + + SQLiteConnectionHandle handle = + connection.Target as SQLiteConnectionHandle; + + if (handle != null) + handle.Dispose(); + + GC.KeepAlive(handle); + } + } + #endregion + } + #endregion +} Index: System.Data.SQLite/SQLiteConnectionStringBuilder.cs ================================================================== --- System.Data.SQLite/SQLiteConnectionStringBuilder.cs +++ System.Data.SQLite/SQLiteConnectionStringBuilder.cs @@ -1,212 +1,212 @@ -/******************************************************** - * ADO.NET 2.0 Data Provider for SQLite Version 3.X - * Written by Robert Simpson (robert@blackcastlesoft.com) - * - * Released to the public domain, use at your own risk! - ********************************************************/ - -namespace System.Data.SQLite -{ - using System; - using System.Data.Common; - using System.ComponentModel; - using System.Collections; - using System.Globalization; - using System.Reflection; - -#if !PLATFORM_COMPACTFRAMEWORK - /// - /// SQLite implementation of DbConnectionStringBuilder. - /// - [DefaultProperty("DataSource")] - [DefaultMember("Item")] - public sealed class SQLiteConnectionStringBuilder : DbConnectionStringBuilder - { - ///- /// Properties of this class - /// - private Hashtable _properties; - - ///- /// Constructs a new instance of the class - /// - ///- /// Default constructor - /// - public SQLiteConnectionStringBuilder() - { - Initialize(null); - } - - ///- /// Constructs a new instance of the class using the specified connection string. - /// - /// The connection string to parse - public SQLiteConnectionStringBuilder(string connectionString) - { - Initialize(connectionString); - } - - ///- /// Private initializer, which assigns the connection string and resets the builder - /// - /// The connection string to assign - private void Initialize(string cnnString) - { - _properties = new Hashtable(StringComparer.OrdinalIgnoreCase); - try - { - base.GetProperties(_properties); - } - catch(NotImplementedException) - { - FallbackGetProperties(_properties); - } - - if (String.IsNullOrEmpty(cnnString) == false) - ConnectionString = cnnString; - } - - ///- /// Gets/Sets the default version of the SQLite engine to instantiate. Currently the only valid value is 3, indicating version 3 of the sqlite library. - /// - [Browsable(true)] - [DefaultValue(3)] - public int Version - { - get - { - object value; - TryGetValue("version", out value); - return Convert.ToInt32(value, CultureInfo.CurrentCulture); - } - set - { - if (value != 3) - throw new NotSupportedException(); - - this["version"] = value; - } - } - - ///- /// Gets/Sets the synchronization mode (file flushing) of the connection string. Default is "Normal". - /// - [DisplayName("Synchronous")] - [Browsable(true)] - [DefaultValue(SynchronizationModes.Normal)] - public SynchronizationModes SyncMode - { - get - { - object value; - TryGetValue("synchronous", out value); - if (value is string) - return (SynchronizationModes)TypeDescriptor.GetConverter(typeof(SynchronizationModes)).ConvertFrom(value); - else return (SynchronizationModes)value; - } - set - { - this["synchronous"] = value; - } - } - - ///- /// Gets/Sets the encoding for the connection string. The default is "False" which indicates UTF-8 encoding. - /// - [Browsable(true)] - [DefaultValue(false)] - public bool UseUTF16Encoding - { - get - { - object value; - TryGetValue("useutf16encoding", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["useutf16encoding"] = value; - } - } - - ///- /// Gets/Sets whether or not to use connection pooling. The default is "False" - /// - [Browsable(true)] - [DefaultValue(false)] - public bool Pooling - { - get - { - object value; - TryGetValue("pooling", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["pooling"] = value; - } - } - - ///- /// Gets/Sets whethor not to store GUID's in binary format. The default is True - /// which saves space in the database. - /// - [Browsable(true)] - [DefaultValue(true)] - public bool BinaryGUID - { - get - { - object value; - TryGetValue("binaryguid", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["binaryguid"] = value; - } - } - - ///- /// Gets/Sets the filename to open on the connection string. - /// - [DisplayName("Data Source")] - [Browsable(true)] - [DefaultValue("")] - public string DataSource - { - get - { - object value; - TryGetValue("data source", out value); - return value.ToString(); - } - set - { - this["data source"] = value; - } - } - - ///- /// An alternate to the data source property - /// - [Browsable(false)] - public string Uri - { - get - { - object value; - TryGetValue("uri", out value); - return value.ToString(); - } - set - { - this["uri"] = value; - } +/******************************************************** + * ADO.NET 2.0 Data Provider for SQLite Version 3.X + * Written by Robert Simpson (robert@blackcastlesoft.com) + * + * Released to the public domain, use at your own risk! + ********************************************************/ + +namespace System.Data.SQLite +{ + using System; + using System.Data.Common; + using System.ComponentModel; + using System.Collections; + using System.Globalization; + using System.Reflection; + +#if !PLATFORM_COMPACTFRAMEWORK + ///+ /// SQLite implementation of DbConnectionStringBuilder. + /// + [DefaultProperty("DataSource")] + [DefaultMember("Item")] + public sealed class SQLiteConnectionStringBuilder : DbConnectionStringBuilder + { + ///+ /// Properties of this class + /// + private Hashtable _properties; + + ///+ /// Constructs a new instance of the class + /// + ///+ /// Default constructor + /// + public SQLiteConnectionStringBuilder() + { + Initialize(null); + } + + ///+ /// Constructs a new instance of the class using the specified connection string. + /// + /// The connection string to parse + public SQLiteConnectionStringBuilder(string connectionString) + { + Initialize(connectionString); + } + + ///+ /// Private initializer, which assigns the connection string and resets the builder + /// + /// The connection string to assign + private void Initialize(string cnnString) + { + _properties = new Hashtable(StringComparer.OrdinalIgnoreCase); + try + { + base.GetProperties(_properties); + } + catch(NotImplementedException) + { + FallbackGetProperties(_properties); + } + + if (String.IsNullOrEmpty(cnnString) == false) + ConnectionString = cnnString; + } + + ///+ /// Gets/Sets the default version of the SQLite engine to instantiate. Currently the only valid value is 3, indicating version 3 of the sqlite library. + /// + [Browsable(true)] + [DefaultValue(3)] + public int Version + { + get + { + object value; + TryGetValue("version", out value); + return Convert.ToInt32(value, CultureInfo.CurrentCulture); + } + set + { + if (value != 3) + throw new NotSupportedException(); + + this["version"] = value; + } + } + + ///+ /// Gets/Sets the synchronization mode (file flushing) of the connection string. Default is "Normal". + /// + [DisplayName("Synchronous")] + [Browsable(true)] + [DefaultValue(SynchronizationModes.Normal)] + public SynchronizationModes SyncMode + { + get + { + object value; + TryGetValue("synchronous", out value); + if (value is string) + return (SynchronizationModes)TypeDescriptor.GetConverter(typeof(SynchronizationModes)).ConvertFrom(value); + else return (SynchronizationModes)value; + } + set + { + this["synchronous"] = value; + } + } + + ///+ /// Gets/Sets the encoding for the connection string. The default is "False" which indicates UTF-8 encoding. + /// + [Browsable(true)] + [DefaultValue(false)] + public bool UseUTF16Encoding + { + get + { + object value; + TryGetValue("useutf16encoding", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["useutf16encoding"] = value; + } + } + + ///+ /// Gets/Sets whether or not to use connection pooling. The default is "False" + /// + [Browsable(true)] + [DefaultValue(false)] + public bool Pooling + { + get + { + object value; + TryGetValue("pooling", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["pooling"] = value; + } + } + + ///+ /// Gets/Sets whethor not to store GUID's in binary format. The default is True + /// which saves space in the database. + /// + [Browsable(true)] + [DefaultValue(true)] + public bool BinaryGUID + { + get + { + object value; + TryGetValue("binaryguid", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["binaryguid"] = value; + } + } + + ///+ /// Gets/Sets the filename to open on the connection string. + /// + [DisplayName("Data Source")] + [Browsable(true)] + [DefaultValue("")] + public string DataSource + { + get + { + object value; + TryGetValue("data source", out value); + return value.ToString(); + } + set + { + this["data source"] = value; + } + } + + ///+ /// An alternate to the data source property + /// + [Browsable(false)] + public string Uri + { + get + { + object value; + TryGetValue("uri", out value); + return value.ToString(); + } + set + { + this["uri"] = value; + } } ////// An alternate to the data source property that uses the SQLite URI syntax. /// @@ -221,196 +221,224 @@ } set { this["fulluri"] = value; } - } - - ///- /// Gets/sets the default command timeout for newly-created commands. This is especially useful for - /// commands used internally such as inside a SQLiteTransaction, where setting the timeout is not possible. - /// - [DisplayName("Default Timeout")] - [Browsable(true)] - [DefaultValue(30)] - public int DefaultTimeout - { - get - { - object value; - TryGetValue("default timeout", out value); - return Convert.ToInt32(value, CultureInfo.CurrentCulture); - } - set - { - this["default timeout"] = value; - } - } - - ///- /// Determines whether or not the connection will automatically participate - /// in the current distributed transaction (if one exists) - /// - [Browsable(true)] - [DefaultValue(true)] - public bool Enlist - { - get - { - object value; - TryGetValue("enlist", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["enlist"] = value; - } - } - - ///- /// If set to true, will throw an exception if the database specified in the connection - /// string does not exist. If false, the database will be created automatically. - /// - [Browsable(true)] - [DefaultValue(false)] - public bool FailIfMissing - { - get - { - object value; - TryGetValue("failifmissing", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["failifmissing"] = value; - } - } - - ///- /// If enabled, uses the legacy 3.xx format for maximum compatibility, but results in larger - /// database sizes. - /// - [DisplayName("Legacy Format")] - [Browsable(true)] - [DefaultValue(false)] - public bool LegacyFormat - { - get - { - object value; - TryGetValue("legacy format", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["legacy format"] = value; - } - } - - ///- /// When enabled, the database will be opened for read-only access and writing will be disabled. - /// - [DisplayName("Read Only")] - [Browsable(true)] - [DefaultValue(false)] - public bool ReadOnly - { - get - { - object value; - TryGetValue("read only", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["read only"] = value; - } - } - - ///- /// Gets/sets the database encryption password - /// - [Browsable(true)] - [PasswordPropertyText(true)] - [DefaultValue("")] - public string Password - { - get - { - object value; - TryGetValue("password", out value); - return value.ToString(); - } - set - { - this["password"] = value; - } - } - - ///- /// Gets/Sets the page size for the connection. - /// - [DisplayName("Page Size")] - [Browsable(true)] - [DefaultValue(1024)] - public int PageSize - { - get - { - object value; - TryGetValue("page size", out value); - return Convert.ToInt32(value, CultureInfo.CurrentCulture); - } - set - { - this["page size"] = value; - } - } - - ///- /// Gets/Sets the maximum number of pages the database may hold - /// - [DisplayName("Max Page Count")] - [Browsable(true)] - [DefaultValue(0)] - public int MaxPageCount - { - get - { - object value; - TryGetValue("max page count", out value); - return Convert.ToInt32(value, CultureInfo.CurrentCulture); - } - set - { - this["max page count"] = value; - } - } - - ///- /// Gets/Sets the cache size for the connection. - /// - [DisplayName("Cache Size")] - [Browsable(true)] - [DefaultValue(2000)] - public int CacheSize - { - get - { - object value; - TryGetValue("cache size", out value); - return Convert.ToInt32(value, CultureInfo.CurrentCulture); - } - set - { - this["cache size"] = value; - } - } - - ///- /// Gets/Sets the DateTime format for the connection. + } + + /// Full = 2 } + + ///+ /// Gets/sets the default command timeout for newly-created commands. This is especially useful for + /// commands used internally such as inside a SQLiteTransaction, where setting the timeout is not possible. + /// + [DisplayName("Default Timeout")] + [Browsable(true)] + [DefaultValue(30)] + public int DefaultTimeout + { + get + { + object value; + TryGetValue("default timeout", out value); + return Convert.ToInt32(value, CultureInfo.CurrentCulture); + } + set + { + this["default timeout"] = value; + } + } + + ///+ /// Determines whether or not the connection will automatically participate + /// in the current distributed transaction (if one exists) + /// + [Browsable(true)] + [DefaultValue(true)] + public bool Enlist + { + get + { + object value; + TryGetValue("enlist", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["enlist"] = value; + } + } + + ///+ /// If set to true, will throw an exception if the database specified in the connection + /// string does not exist. If false, the database will be created automatically. + /// + [Browsable(true)] + [DefaultValue(false)] + public bool FailIfMissing + { + get + { + object value; + TryGetValue("failifmissing", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["failifmissing"] = value; + } + } + + ///+ /// If enabled, uses the legacy 3.xx format for maximum compatibility, but results in larger + /// database sizes. + /// + [DisplayName("Legacy Format")] + [Browsable(true)] + [DefaultValue(false)] + public bool LegacyFormat + { + get + { + object value; + TryGetValue("legacy format", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["legacy format"] = value; + } + } + + ///+ /// When enabled, the database will be opened for read-only access and writing will be disabled. + /// + [DisplayName("Read Only")] + [Browsable(true)] + [DefaultValue(false)] + public bool ReadOnly + { + get + { + object value; + TryGetValue("read only", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["read only"] = value; + } + } + + ///+ /// Gets/sets the database encryption password + /// + [Browsable(true)] + [PasswordPropertyText(true)] + [DefaultValue("")] + public string Password + { + get + { + object value; + TryGetValue("password", out value); + return value.ToString(); + } + set + { + this["password"] = value; + } + } + + ///+ /// Gets/sets the database encryption hexadecimal password + /// + [Browsable(true)] + [PasswordPropertyText(true)] + [DefaultValue(null)] + public byte[] HexPassword + { + get + { + object value; + + if (TryGetValue("hexpassword", out value)) + { + if (value is string) + return SQLiteConnection.FromHexString((string)value); + else if (value != null) + return (byte[])value; + } + + return null; + } + set + { + this["hexpassword"] = SQLiteConnection.ToHexString(value); + } + } + + ///+ /// Gets/Sets the page size for the connection. + /// + [DisplayName("Page Size")] + [Browsable(true)] + [DefaultValue(1024)] + public int PageSize + { + get + { + object value; + TryGetValue("page size", out value); + return Convert.ToInt32(value, CultureInfo.CurrentCulture); + } + set + { + this["page size"] = value; + } + } + + ///+ /// Gets/Sets the maximum number of pages the database may hold + /// + [DisplayName("Max Page Count")] + [Browsable(true)] + [DefaultValue(0)] + public int MaxPageCount + { + get + { + object value; + TryGetValue("max page count", out value); + return Convert.ToInt32(value, CultureInfo.CurrentCulture); + } + set + { + this["max page count"] = value; + } + } + + ///+ /// Gets/Sets the cache size for the connection. + /// + [DisplayName("Cache Size")] + [Browsable(true)] + [DefaultValue(2000)] + public int CacheSize + { + get + { + object value; + TryGetValue("cache size", out value); + return Convert.ToInt32(value, CultureInfo.CurrentCulture); + } + set + { + this["cache size"] = value; + } + } + + ///+ /// Gets/Sets the DateTime format for the connection. /// [Browsable(true)] [DefaultValue(SQLiteDateFormats.Default)] public SQLiteDateFormats DateTimeFormat { @@ -487,76 +515,76 @@ } set { this["baseschemaname"] = value; } - } - - ///- /// Determines how SQLite handles the transaction journal file. - /// - [Browsable(true)] - [DefaultValue(SQLiteJournalModeEnum.Default)] - [DisplayName("Journal Mode")] - public SQLiteJournalModeEnum JournalMode - { - get - { - object value; - TryGetValue("journal mode", out value); - if (value is string) - return (SQLiteJournalModeEnum)TypeDescriptor.GetConverter(typeof(SQLiteJournalModeEnum)).ConvertFrom(value); - else - return (SQLiteJournalModeEnum)value; - } - set - { - this["journal mode"] = value; - } - } - - ///- /// Sets the default isolation level for transactions on the connection. - /// - [Browsable(true)] - [DefaultValue(IsolationLevel.Serializable)] - [DisplayName("Default Isolation Level")] - public IsolationLevel DefaultIsolationLevel - { - get - { - object value; - TryGetValue("default isolationlevel", out value); - if (value is string) - return (IsolationLevel)TypeDescriptor.GetConverter(typeof(IsolationLevel)).ConvertFrom(value); - else - return (IsolationLevel)value; - } - set - { - this["default isolationlevel"] = value; - } - } - - ///- /// If enabled, use foreign key constraints - /// - [DisplayName("Foreign Keys")] - [Browsable(true)] - [DefaultValue(false)] - public bool ForeignKeys - { - get - { - object value; - TryGetValue("foreign keys", out value); - return SQLiteConvert.ToBoolean(value); - } - set - { - this["foreign keys"] = value; - } + } + + ///+ /// Determines how SQLite handles the transaction journal file. + /// + [Browsable(true)] + [DefaultValue(SQLiteJournalModeEnum.Default)] + [DisplayName("Journal Mode")] + public SQLiteJournalModeEnum JournalMode + { + get + { + object value; + TryGetValue("journal mode", out value); + if (value is string) + return (SQLiteJournalModeEnum)TypeDescriptor.GetConverter(typeof(SQLiteJournalModeEnum)).ConvertFrom(value); + else + return (SQLiteJournalModeEnum)value; + } + set + { + this["journal mode"] = value; + } + } + + ///+ /// Sets the default isolation level for transactions on the connection. + /// + [Browsable(true)] + [DefaultValue(IsolationLevel.Serializable)] + [DisplayName("Default Isolation Level")] + public IsolationLevel DefaultIsolationLevel + { + get + { + object value; + TryGetValue("default isolationlevel", out value); + if (value is string) + return (IsolationLevel)TypeDescriptor.GetConverter(typeof(IsolationLevel)).ConvertFrom(value); + else + return (IsolationLevel)value; + } + set + { + this["default isolationlevel"] = value; + } + } + + ///+ /// If enabled, use foreign key constraints + /// + [DisplayName("Foreign Keys")] + [Browsable(true)] + [DefaultValue(false)] + public bool ForeignKeys + { + get + { + object value; + TryGetValue("foreign keys", out value); + return SQLiteConvert.ToBoolean(value); + } + set + { + this["foreign keys"] = value; + } } ////// Gets/Sets the extra behavioral flags. /// @@ -623,59 +651,59 @@ set { this["tofullpath"] = value; } } - - ///- /// Helper function for retrieving values from the connectionstring - /// - /// The keyword to retrieve settings for - /// The resulting parameter value - ///Returns true if the value was found and returned - public override bool TryGetValue(string keyword, out object value) - { - bool b = base.TryGetValue(keyword, out value); - - if (!_properties.ContainsKey(keyword)) return b; - - PropertyDescriptor pd = _properties[keyword] as PropertyDescriptor; - - if (pd == null) return b; - - // Attempt to coerce the value into something more solid - if (b) - { - if (pd.PropertyType == typeof(Boolean)) - value = SQLiteConvert.ToBoolean(value); - else - value = TypeDescriptor.GetConverter(pd.PropertyType).ConvertFrom(value); - } - else - { - DefaultValueAttribute att = pd.Attributes[typeof(DefaultValueAttribute)] as DefaultValueAttribute; - if (att != null) - { - value = att.Value; - b = true; - } - } - return b; - } - - ///- /// Fallback method for MONO, which doesn't implement DbConnectionStringBuilder.GetProperties() - /// - /// The hashtable to fill with property descriptors - private void FallbackGetProperties(Hashtable propertyList) - { - foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(this, true)) - { - if (descriptor.Name != "ConnectionString" && propertyList.ContainsKey(descriptor.DisplayName) == false) - { - propertyList.Add(descriptor.DisplayName, descriptor); - } - } - } - } -#endif -} + + ///+ /// Helper function for retrieving values from the connectionstring + /// + /// The keyword to retrieve settings for + /// The resulting parameter value + ///Returns true if the value was found and returned + public override bool TryGetValue(string keyword, out object value) + { + bool b = base.TryGetValue(keyword, out value); + + if (!_properties.ContainsKey(keyword)) return b; + + PropertyDescriptor pd = _properties[keyword] as PropertyDescriptor; + + if (pd == null) return b; + + // Attempt to coerce the value into something more solid + if (b) + { + if (pd.PropertyType == typeof(Boolean)) + value = SQLiteConvert.ToBoolean(value); + else if (pd.PropertyType != typeof(byte[])) + value = TypeDescriptor.GetConverter(pd.PropertyType).ConvertFrom(value); + } + else + { + DefaultValueAttribute att = pd.Attributes[typeof(DefaultValueAttribute)] as DefaultValueAttribute; + if (att != null) + { + value = att.Value; + b = true; + } + } + return b; + } + + ///+ /// Fallback method for MONO, which doesn't implement DbConnectionStringBuilder.GetProperties() + /// + /// The hashtable to fill with property descriptors + private void FallbackGetProperties(Hashtable propertyList) + { + foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(this, true)) + { + if (descriptor.Name != "ConnectionString" && propertyList.ContainsKey(descriptor.DisplayName) == false) + { + propertyList.Add(descriptor.DisplayName, descriptor); + } + } + } + } +#endif +} Index: System.Data.SQLite/SQLiteConvert.cs ================================================================== --- System.Data.SQLite/SQLiteConvert.cs +++ System.Data.SQLite/SQLiteConvert.cs @@ -1,9 +1,9 @@ /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) - * + * * Released to the public domain, use at your own risk! ********************************************************/ namespace System.Data.SQLite { @@ -170,11 +170,11 @@ nativestringlen++; } while (Marshal.ReadByte(nativestring, nativestringlen) != 0); } byte[] byteArray = new byte[nativestringlen]; - + Marshal.Copy(nativestring, byteArray, 0, nativestringlen); return _utf8.GetString(byteArray, 0, nativestringlen); } @@ -572,18 +572,18 @@ else return SQLiteConvert.DbTypeToType(t.Type); } private static Type[] _affinitytotype = { - typeof(object), - typeof(Int64), - typeof(Double), - typeof(string), - typeof(byte[]), - typeof(object), - typeof(DateTime), - typeof(object) + typeof(object), // Uninitialized (0) + typeof(Int64), // Int64 (1) + typeof(Double), // Double (2) + typeof(string), // Text (3) + typeof(byte[]), // Blob (4) + typeof(DBNull), // Null (5) + typeof(DateTime), // DateTime (10) + typeof(object) // None (11) }; ////// For a given intrinsic type, return a DbType /// @@ -600,29 +600,29 @@ } return _typetodbtype[(int)tc]; } private static DbType[] _typetodbtype = { - DbType.Object, - DbType.Binary, - DbType.Object, - DbType.Boolean, - DbType.SByte, - DbType.SByte, - DbType.Byte, - DbType.Int16, // 7 - DbType.UInt16, - DbType.Int32, - DbType.UInt32, - DbType.Int64, // 11 - DbType.UInt64, - DbType.Single, - DbType.Double, - DbType.Decimal, - DbType.DateTime, - DbType.Object, - DbType.String, + DbType.Object, // Empty (0) + DbType.Binary, // Object (1) + DbType.Object, // DBNull (2) + DbType.Boolean, // Boolean (3) + DbType.SByte, // Char (4) + DbType.SByte, // SByte (5) + DbType.Byte, // Byte (6) + DbType.Int16, // Int16 (7) + DbType.UInt16, // UInt16 (8) + DbType.Int32, // Int32 (9) + DbType.UInt32, // UInt32 (10) + DbType.Int64, // Int64 (11) + DbType.UInt64, // UInt64 (12) + DbType.Single, // Single (13) + DbType.Double, // Double (14) + DbType.Decimal, // Decimal (15) + DbType.DateTime, // DateTime (16) + DbType.Object, // ?? (17) + DbType.String // String (18) }; ////// Returns the ColumnSize for the given DbType /// @@ -632,102 +632,104 @@ { return _dbtypetocolumnsize[(int)typ]; } private static int[] _dbtypetocolumnsize = { - 2147483647, // 0 - 2147483647, // 1 - 1, // 2 - 1, // 3 - 8, // 4 - 8, // 5 - 8, // 6 - 8, // 7 - 8, // 8 - 16, // 9 - 2, - 4, - 8, - 2147483647, - 1, - 4, - 2147483647, - 8, - 2, - 4, - 8, - 8, - 2147483647, - 2147483647, - 2147483647, - 2147483647, // 25 (Xml) + int.MaxValue, // AnsiString (0) + int.MaxValue, // Binary (1) + 1, // Byte (2) + 1, // Boolean (3) + 8, // Currency (4) + 8, // Date (5) + 8, // DateTime (6) + 8, // Decimal (7) + 8, // Double (8) + 16, // Guid (9) + 2, // Int16 (10) + 4, // Int32 (11) + 8, // Int64 (12) + int.MaxValue, // Object (13) + 1, // SByte (14) + 4, // Single (15) + int.MaxValue, // String (16) + 8, // Time (17) + 2, // UInt16 (18) + 4, // UInt32 (19) + 8, // UInt64 (20) + 8, // VarNumeric (21) + int.MaxValue, // AnsiStringFixedLength (22) + int.MaxValue, // StringFixedLength (23) + int.MaxValue, // ?? (24) + int.MaxValue // Xml (25) }; internal static object DbTypeToNumericPrecision(DbType typ) { return _dbtypetonumericprecision[(int)typ]; } private static object[] _dbtypetonumericprecision = { - DBNull.Value, // 0 - DBNull.Value, // 1 - 3, - DBNull.Value, - 19, - DBNull.Value, // 5 - DBNull.Value, // 6 - 53, - 53, - DBNull.Value, - 5, - 10, - 19, - DBNull.Value, - 3, - 24, - DBNull.Value, - DBNull.Value, - 5, - 10, - 19, - 53, - DBNull.Value, - DBNull.Value, - DBNull.Value + DBNull.Value, // AnsiString (0) + DBNull.Value, // Binary (1) + 3, // Byte (2) + DBNull.Value, // Boolean (3) + 19, // Currency (4) + DBNull.Value, // Date (5) + DBNull.Value, // DateTime (6) + 53, // Decimal (7) + 53, // Double (8) + DBNull.Value, // Guid (9) + 5, // Int16 (10) + 10, // Int32 (11) + 19, // Int64 (12) + DBNull.Value, // Object (13) + 3, // SByte (14) + 24, // Single (15) + DBNull.Value, // String (16) + DBNull.Value, // Time (17) + 5, // UInt16 (18) + 10, // UInt32 (19) + 19, // UInt64 (20) + 53, // VarNumeric (21) + DBNull.Value, // AnsiStringFixedLength (22) + DBNull.Value, // StringFixedLength (23) + DBNull.Value, // ?? (24) + DBNull.Value // Xml (25) }; internal static object DbTypeToNumericScale(DbType typ) { return _dbtypetonumericscale[(int)typ]; } private static object[] _dbtypetonumericscale = { - DBNull.Value, // 0 - DBNull.Value, // 1 - 0, - DBNull.Value, - 4, - DBNull.Value, // 5 - DBNull.Value, // 6 - DBNull.Value, - DBNull.Value, - DBNull.Value, - 0, - 0, - 0, - DBNull.Value, - 0, - DBNull.Value, - DBNull.Value, - DBNull.Value, - 0, - 0, - 0, - 0, - DBNull.Value, - DBNull.Value, - DBNull.Value + DBNull.Value, // AnsiString (0) + DBNull.Value, // Binary (1) + 0, // Byte (2) + DBNull.Value, // Boolean (3) + 4, // Currency (4) + DBNull.Value, // Date (5) + DBNull.Value, // DateTime (6) + DBNull.Value, // Decimal (7) + DBNull.Value, // Double (8) + DBNull.Value, // Guid (9) + 0, // Int16 (10) + 0, // Int32 (11) + 0, // Int64 (12) + DBNull.Value, // Object (13) + 0, // SByte (14) + DBNull.Value, // Single (15) + DBNull.Value, // String (16) + DBNull.Value, // Time (17) + 0, // UInt16 (18) + 0, // UInt32 (19) + 0, // UInt64 (20) + 0, // VarNumeric (21) + DBNull.Value, // AnsiStringFixedLength (22) + DBNull.Value, // StringFixedLength (23) + DBNull.Value, // ?? (24) + DBNull.Value // Xml (25) }; internal static string DbTypeToTypeName(DbType typ) { for (int n = 0; n < _dbtypeNames.Length; n++) @@ -745,27 +747,12 @@ #endif return defaultTypeName; } - private static SQLiteTypeNames[] _dbtypeNames = { - new SQLiteTypeNames("INTEGER", DbType.Int64), - new SQLiteTypeNames("TINYINT", DbType.Byte), - new SQLiteTypeNames("INT", DbType.Int32), - new SQLiteTypeNames("VARCHAR", DbType.AnsiString), - new SQLiteTypeNames("NVARCHAR", DbType.String), - new SQLiteTypeNames("CHAR", DbType.AnsiStringFixedLength), - new SQLiteTypeNames("NCHAR", DbType.StringFixedLength), - new SQLiteTypeNames("FLOAT", DbType.Double), - new SQLiteTypeNames("REAL", DbType.Double), - new SQLiteTypeNames("BIT", DbType.Boolean), - new SQLiteTypeNames("DECIMAL", DbType.Decimal), - new SQLiteTypeNames("DATETIME", DbType.DateTime), - new SQLiteTypeNames("BLOB", DbType.Binary), - new SQLiteTypeNames("UNIQUEIDENTIFIER", DbType.Guid), - new SQLiteTypeNames("SMALLINT", DbType.Int16), - }; + private static SQLiteTypeNames[] _dbtypeNames = GetSQLiteTypeNames(); + ////// Convert a DbType to a Type /// /// The DbType to convert from ///The closest-match .NET type @@ -773,36 +760,36 @@ { return _dbtypeToType[(int)typ]; } private static Type[] _dbtypeToType = { - typeof(string), // 0 - typeof(byte[]), // 1 - typeof(byte), // 2 - typeof(bool), // 3 - typeof(decimal), // 4 - typeof(DateTime), // 5 - typeof(DateTime), // 6 - typeof(decimal), // 7 - typeof(double), // 8 - typeof(Guid), // 9 - typeof(Int16), - typeof(Int32), - typeof(Int64), - typeof(object), - typeof(sbyte), - typeof(float), - typeof(string), - typeof(DateTime), - typeof(UInt16), - typeof(UInt32), - typeof(UInt64), - typeof(double), - typeof(string), - typeof(string), - typeof(string), - typeof(string), // 25 (Xml) + typeof(string), // AnsiString (0) + typeof(byte[]), // Binary (1) + typeof(byte), // Byte (2) + typeof(bool), // Boolean (3) + typeof(decimal), // Currency (4) + typeof(DateTime), // Date (5) + typeof(DateTime), // DateTime (6) + typeof(decimal), // Decimal (7) + typeof(double), // Double (8) + typeof(Guid), // Guid (9) + typeof(Int16), // Int16 (10) + typeof(Int32), // Int32 (11) + typeof(Int64), // Int64 (12) + typeof(object), // Object (13) + typeof(sbyte), // SByte (14) + typeof(float), // Single (15) + typeof(string), // String (16) + typeof(DateTime), // Time (17) + typeof(UInt16), // UInt16 (18) + typeof(UInt32), // UInt32 (19) + typeof(UInt64), // UInt64 (20) + typeof(double), // VarNumeric (21) + typeof(string), // AnsiStringFixedLength (22) + typeof(string), // StringFixedLength (23) + typeof(string), // ?? (24) + typeof(string), // Xml (25) }; ////// For a given type, return the closest-match SQLite TypeAffinity, which only understands a very limited subset of types. /// @@ -820,30 +807,111 @@ } return _typecodeAffinities[(int)tc]; } private static TypeAffinity[] _typecodeAffinities = { - TypeAffinity.Null, - TypeAffinity.Blob, - TypeAffinity.Null, - TypeAffinity.Int64, - TypeAffinity.Int64, - TypeAffinity.Int64, - TypeAffinity.Int64, - TypeAffinity.Int64, // 7 - TypeAffinity.Int64, - TypeAffinity.Int64, - TypeAffinity.Int64, - TypeAffinity.Int64, // 11 - TypeAffinity.Int64, - TypeAffinity.Double, - TypeAffinity.Double, - TypeAffinity.Double, - TypeAffinity.DateTime, - TypeAffinity.Null, - TypeAffinity.Text, + TypeAffinity.Null, // Empty (0) + TypeAffinity.Blob, // Object (1) + TypeAffinity.Null, // DBNull (2) + TypeAffinity.Int64, // Boolean (3) + TypeAffinity.Int64, // Char (4) + TypeAffinity.Int64, // SByte (5) + TypeAffinity.Int64, // Byte (6) + TypeAffinity.Int64, // Int16 (7) + TypeAffinity.Int64, // UInt16 (8) + TypeAffinity.Int64, // Int32 (9) + TypeAffinity.Int64, // UInt32 (10) + TypeAffinity.Int64, // Int64 (11) + TypeAffinity.Int64, // UInt64 (12) + TypeAffinity.Double, // Single (13) + TypeAffinity.Double, // Double (14) + TypeAffinity.Double, // Decimal (15) + TypeAffinity.DateTime, // DateTime (16) + TypeAffinity.Null, // ?? (17) + TypeAffinity.Text // String (18) }; + + ///+ /// Builds and returns an array containing the database column types + /// recognized by this provider. + /// + ///+ /// An array containing the database column types recognized by this + /// provider. + /// + private static SQLiteTypeNames[] GetSQLiteTypeNames() + { + return new SQLiteTypeNames[] { + new SQLiteTypeNames("BIGINT", DbType.Int64), + new SQLiteTypeNames("BIGUINT", DbType.UInt64), + new SQLiteTypeNames("BINARY", DbType.Binary), + new SQLiteTypeNames("BIT", DbType.Boolean), + new SQLiteTypeNames("BLOB", DbType.Binary), + new SQLiteTypeNames("BOOL", DbType.Boolean), + new SQLiteTypeNames("BOOLEAN", DbType.Boolean), + new SQLiteTypeNames("CHAR", DbType.AnsiStringFixedLength), + new SQLiteTypeNames("COUNTER", DbType.Int64), + new SQLiteTypeNames("CURRENCY", DbType.Decimal), + new SQLiteTypeNames("DATE", DbType.DateTime), + new SQLiteTypeNames("DATETIME", DbType.DateTime), + new SQLiteTypeNames("DECIMAL", DbType.Decimal), + new SQLiteTypeNames("DOUBLE", DbType.Double), + new SQLiteTypeNames("FLOAT", DbType.Double), + new SQLiteTypeNames("GENERAL", DbType.Binary), + new SQLiteTypeNames("GUID", DbType.Guid), + new SQLiteTypeNames("IDENTITY", DbType.Int64), + new SQLiteTypeNames("IMAGE", DbType.Binary), + new SQLiteTypeNames("INT", DbType.Int32), + new SQLiteTypeNames("INT8", DbType.SByte), + new SQLiteTypeNames("INT16", DbType.Int16), + new SQLiteTypeNames("INT32", DbType.Int32), + new SQLiteTypeNames("INT64", DbType.Int64), + new SQLiteTypeNames("INTEGER", DbType.Int64), + new SQLiteTypeNames("INTEGER8", DbType.SByte), + new SQLiteTypeNames("INTEGER16", DbType.Int16), + new SQLiteTypeNames("INTEGER32", DbType.Int32), + new SQLiteTypeNames("INTEGER64", DbType.Int64), + new SQLiteTypeNames("LOGICAL", DbType.Boolean), + new SQLiteTypeNames("LONG", DbType.Int64), + new SQLiteTypeNames("LONGCHAR", DbType.String), + new SQLiteTypeNames("LONGTEXT", DbType.String), + new SQLiteTypeNames("LONGVARCHAR", DbType.String), + new SQLiteTypeNames("MEMO", DbType.String), + new SQLiteTypeNames("MONEY", DbType.Decimal), + new SQLiteTypeNames("NCHAR", DbType.StringFixedLength), + new SQLiteTypeNames("NOTE", DbType.String), + new SQLiteTypeNames("NTEXT", DbType.String), + new SQLiteTypeNames("NUMERIC", DbType.Decimal), + new SQLiteTypeNames("NVARCHAR", DbType.String), + new SQLiteTypeNames("OLEOBJECT", DbType.Binary), + new SQLiteTypeNames("REAL", DbType.Double), + new SQLiteTypeNames("SMALLDATE", DbType.DateTime), + new SQLiteTypeNames("SMALLINT", DbType.Int16), + new SQLiteTypeNames("SMALLUINT", DbType.UInt16), + new SQLiteTypeNames("STRING", DbType.String), + new SQLiteTypeNames("TEXT", DbType.String), + new SQLiteTypeNames("TIME", DbType.DateTime), + new SQLiteTypeNames("TIMESTAMP", DbType.DateTime), + new SQLiteTypeNames("TINYINT", DbType.Byte), + new SQLiteTypeNames("TINYSINT", DbType.SByte), + new SQLiteTypeNames("UINT", DbType.UInt32), + new SQLiteTypeNames("UINT8", DbType.Byte), + new SQLiteTypeNames("UINT16", DbType.UInt16), + new SQLiteTypeNames("UINT32", DbType.UInt32), + new SQLiteTypeNames("UINT64", DbType.UInt64), + new SQLiteTypeNames("ULONG", DbType.UInt64), + new SQLiteTypeNames("UNIQUEIDENTIFIER", DbType.Guid), + new SQLiteTypeNames("UNSIGNEDINTEGER", DbType.UInt64), + new SQLiteTypeNames("UNSIGNEDINTEGER8", DbType.Byte), + new SQLiteTypeNames("UNSIGNEDINTEGER16", DbType.UInt16), + new SQLiteTypeNames("UNSIGNEDINTEGER32", DbType.UInt32), + new SQLiteTypeNames("UNSIGNEDINTEGER64", DbType.UInt64), + new SQLiteTypeNames("VARBINARY", DbType.Binary), + new SQLiteTypeNames("VARCHAR", DbType.AnsiString), + new SQLiteTypeNames("YESNO", DbType.Boolean) + }; + } ////// For a given type name, return a closest-match .NET type /// /// The name of the type to match @@ -855,61 +923,12 @@ if (_typeNames == null) { _typeNames = new Dictionary/// ISO8601 is more compatible, readable, fully-processable, but less accurate as it doesn't provide time down to fractions of a second. /// JulianDay is the numeric format the SQLite uses internally and is arguably the most compatible with 3rd party tools. It is /// not readable as text without post-processing. /// Ticks less compatible with 3rd party tools that query the database, and renders the DateTime field unreadable as text without post-processing. - /// - /// The preferred order of choosing a datetime format is JulianDay, ISO8601, and then Ticks. Ticks is mainly present for legacy + /// + /// The preferred order of choosing a datetime format is JulianDay, ISO8601, and then Ticks. Ticks is mainly present for legacy /// code support. /// public enum SQLiteDateFormats { ///@@ -1102,11 +1121,11 @@ /// ////// By default SQLite will create and delete the journal file when needed during a transaction. /// However, for some computers running certain filesystem monitoring tools, the rapid /// creation and deletion of the journal file can cause those programs to fail, or to interfere with SQLite. - /// + /// /// If a program or virus scanner is interfering with SQLite's journal file, you may receive errors like "unable to open database file" /// when starting a transaction. If this is happening, you may want to change the default journal mode to Persist. /// public enum SQLiteJournalModeEnum { @@ -1182,10 +1201,48 @@ /// corrupt the database. FULL synchronous is very safe, but it is also /// slower. ///+ /// The requested command execution type. This controls which method of the + /// + public enum SQLiteExecuteType + { + ///object will be called. + /// + /// Do nothing. No method will be called. + /// + None = 0, + + ///+ /// The command is not expected to return a result -OR- the result is not + /// needed. The + NonQuery = 1, + + ///method will + /// be called. + /// + /// The command is expected to return a scalar result -OR- the result should + /// be limited to a scalar result. The + Scalar = 2, + + ///+ /// method will be called. + /// + /// The command is expected to return + Reader = 3, + + ///result. + /// The method will be called. + /// + /// Use the default command execution type. Using this value is the same + /// as using the + Default = NonQuery /* TODO: Good default? */ + } ///value. + /// /// Struct used internally to determine the datatype of a column in a resultset /// internal class SQLiteType @@ -1229,12 +1286,12 @@ string value ) { // // NOTE: The only thing that we must guarantee here, according - // to the MSDN documentation for IEqualityComparer, is - // that for two given strings, if Equals return true then + // to the MSDN documentation for IEqualityComparer, is + // that for two given strings, if Equals return true then // the two strings must hash to the same value. // if (value != null) #if !PLATFORM_COMPACTFRAMEWORK return value.ToLowerInvariant().GetHashCode(); Index: System.Data.SQLite/SQLiteDataAdapter.cs ================================================================== --- System.Data.SQLite/SQLiteDataAdapter.cs +++ System.Data.SQLite/SQLiteDataAdapter.cs @@ -22,49 +22,105 @@ public sealed class SQLiteDataAdapter : DbDataAdapter { private static object _updatingEventPH = new object(); private static object _updatedEventPH = new object(); + /////////////////////////////////////////////////////////////////////////////////////////////// + + #region Public Constructors ///- /// This class is just a shell around the DbDataAdapter. Nothing from DbDataAdapter is overridden here, just a few constructors are defined. + /// This class is just a shell around the DbDataAdapter. Nothing from + /// DbDataAdapter is overridden here, just a few constructors are defined. /// ////// Default constructor. /// public SQLiteDataAdapter() { } + /////////////////////////////////////////////////////////////////////////////////////////////// + ////// Constructs a data adapter using the specified select command. /// - /// The select command to associate with the adapter. + /// + /// The select command to associate with the adapter. + /// public SQLiteDataAdapter(SQLiteCommand cmd) { SelectCommand = cmd; } + /////////////////////////////////////////////////////////////////////////////////////////////// + ///- /// Constructs a data adapter with the supplied select command text and associated with the specified connection. + /// Constructs a data adapter with the supplied select command text and + /// associated with the specified connection. /// - /// The select command text to associate with the data adapter. - /// The connection to associate with the select command. + /// + /// The select command text to associate with the data adapter. + /// + /// + /// The connection to associate with the select command. + /// public SQLiteDataAdapter(string commandText, SQLiteConnection connection) { SelectCommand = new SQLiteCommand(commandText, connection); } + /////////////////////////////////////////////////////////////////////////////////////////////// + + ///+ /// Constructs a data adapter with the specified select command text, + /// and using the specified database connection string. + /// + /// + /// The select command text to use to construct a select command. + /// + /// + /// A connection string suitable for passing to a new SQLiteConnection, + /// which is associated with the select command. + /// + public SQLiteDataAdapter( + string commandText, + string connectionString + ) + : this(commandText, connectionString, false) + { + // do nothing. + } + + /////////////////////////////////////////////////////////////////////////////////////////////// + ///- /// Constructs a data adapter with the specified select command text, and using the specified database connection string. + /// Constructs a data adapter with the specified select command text, + /// and using the specified database connection string. /// - /// The select command text to use to construct a select command. - /// A connection string suitable for passing to a new SQLiteConnection, which is associated with the select command. - public SQLiteDataAdapter(string commandText, string connectionString) + /// + /// The select command text to use to construct a select command. + /// + /// + /// A connection string suitable for passing to a new SQLiteConnection, + /// which is associated with the select command. + /// + /// + /// Non-zero to parse the connection string using the built-in (i.e. + /// framework provided) parser when opening the connection. + /// + public SQLiteDataAdapter( + string commandText, + string connectionString, + bool parseViaFramework + ) { - SQLiteConnection cnn = new SQLiteConnection(connectionString); + SQLiteConnection cnn = new SQLiteConnection( + connectionString, parseViaFramework); + SelectCommand = new SQLiteCommand(commandText, cnn); } + #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; @@ -82,16 +138,40 @@ { try { if (!disposed) { - //if (disposing) - //{ - // //////////////////////////////////// - // // dispose managed resources here... - // //////////////////////////////////// - //} + if (disposing) + { + //////////////////////////////////// + // dispose managed resources here... + //////////////////////////////////// + + if (SelectCommand != null) + { + SelectCommand.Dispose(); + SelectCommand = null; + } + + if (InsertCommand != null) + { + InsertCommand.Dispose(); + InsertCommand = null; + } + + if (UpdateCommand != null) + { + UpdateCommand.Dispose(); + UpdateCommand = null; + } + + if (DeleteCommand != null) + { + DeleteCommand.Dispose(); + DeleteCommand = null; + } + } ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// Index: System.Data.SQLite/SQLiteDataReader.cs ================================================================== --- System.Data.SQLite/SQLiteDataReader.cs +++ System.Data.SQLite/SQLiteDataReader.cs @@ -643,12 +643,12 @@ /// The name of the column to retrieve ///The int i of the column public override int GetOrdinal(string name) { CheckDisposed(); - CheckClosed(); - SQLiteCommand.Check(_command); + CheckClosed(); + if (_throwOnDisposed) SQLiteCommand.Check(_command); // // NOTE: First, check if the column name cache has been initialized yet. // If not, do it now. // @@ -851,12 +851,12 @@ } } internal DataTable GetSchemaTable(bool wantUniqueInfo, bool wantDefaultValue) { - CheckClosed(); - SQLiteCommand.Check(_command); + CheckClosed(); + if (_throwOnDisposed) SQLiteCommand.Check(_command); // // BUGFIX: We need to quickly scan all the fields in the current // "result set" to see how many distinct tables are actually // involved. This information is necessary so that some @@ -1218,12 +1218,12 @@ ///True if the command was successful and a new resultset is available, False otherwise. public override bool NextResult() { CheckDisposed(); - CheckClosed(); - SQLiteCommand.Check(_command); + CheckClosed(); + if (_throwOnDisposed) SQLiteCommand.Check(_command); SQLiteStatement stmt = null; int fieldCount; while (true) @@ -1344,12 +1344,12 @@ /// - Updated to SQLite 3.7.16. +
- Skip checking loaded assemblies for types tagged with the SQLiteFunction attribute when the No_SQLiteFunctions environment variable is set. Pursuant to [e4c8121f7b]. +
- Add HexPassword connection string property to work around the inability to include a literal semicolon in a connection string property value. Pursuant to [1c456ae75f]. +
- Add static Execute method to the SQLiteCommand class. +
- Support custom connection pool implementations by adding the ISQLiteConnectionPool interface, the static SQLiteConnection.ConnectionPool property, and the static CreateHandle method in addition to modifying the SQLiteConnectionPool class. Pursuant to [393d954be0]. +
- Add public constructor to the SQLiteDataAdapter class that allows passing the parseViaFramework parameter to the SQLiteConnection constructor. +
- When built with the CHECK_STATE compile-time option, skip throwing exceptions from the SQLiteDataReader class when the object is being disposed. +
- Support automatic value conversions for columns with a declared type of BIGUINT, INTEGER8, INTEGER16, INTEGER32, INTEGER64, SMALLUINT, TINYSINT, UNSIGNEDINTEGER, UNSIGNEDINTEGER8, UNSIGNEDINTEGER16, UNSIGNEDINTEGER32, UNSIGNEDINTEGER64, INT8, INT16, INT32, INT64, UINT, UINT8, UINT16, UINT32, UINT64, or ULONG. +
- Add BindUInt32AsInt64 connection flag to force binding of UInt32 values as Int64 instead. Pursuant to [c010fa6584]. +
- Add BindAllAsText connection flag to force binding of all values as text. +
- Remove AUTOINCREMENT from the column type name map. ** Potentially Incompatible Change ** +
- Avoid throwing overflow exceptions from the SQLite3.GetValue method for integral column types. Partial fix for [c010fa6584]. ** Potentially Incompatible Change ** +
- Use the legacy connection closing algorithm when built with the INTEROP_LEGACY_CLOSE compile-time option. +
- Support using the directory containing the primary managed-only assembly as the basis for native library pre-loading. +
- Updated to SQLite 3.7.15.2. +
- Explicitly dispose of all SQLiteCommand objects managed by the DbDataAdapter class. Fix for [6434e23a0f]. +
- Add Cancel method to the SQLiteConnection class to interrupt a long running query. +
- Improve thread safety of the SQLiteLog.LogMessage method. +
- Updated to SQLite 3.7.15.1.
- Add Visual Studio 2012 support to all the applicable solution/project files, their associated supporting files, and the test suite.
- Add Visual Studio 2012 support to the redesigned designer support installer. Index: test/AssemblyInfo.cs ================================================================== --- test/AssemblyInfo.cs +++ test/AssemblyInfo.cs @@ -36,7 +36,7 @@ // Major Version // Minor Version // Build Number // Revision // -[assembly: AssemblyVersion("1.0.83.0")] -[assembly: AssemblyFileVersion("1.0.83.0")] +[assembly: AssemblyVersion("1.0.85.0")] +[assembly: AssemblyFileVersion("1.0.85.0")] Index: test/app.config ================================================================== --- test/app.config +++ test/app.config @@ -1,8 +1,8 @@
- <root>\readme.htm
- <root>\SQLite.nuspec +
- <root>\SQLite.Beta.nuspec
- <root>\SQLite.MSIL.nuspec
- <root>\SQLite.x86.nuspec
- <root>\SQLite.x64.nuspec
- <root>\Doc\Extra\dbfactorysupport.html
- <root>\Doc\Extra\welcome.html Index: www/downloads.wiki ================================================================== --- www/downloads.wiki +++ www/downloads.wiki @@ -253,20 +253,109 @@
Distributing the Binaries (Compact Framework)
Both the System.Data.SQLite.DLL and SQLite.Interop.XXX.DLL files must be deployed on the Compact Framework. The XXX is the build number of - the System.Data.SQLite library (e.g. "083"). The + the System.Data.SQLite library (e.g. "085"). The SQLite.Interop.XXX.DLL file is a fully native assembly compiled for the ARM processor, and System.Data.SQLite is the fully-managed Compact Framework assembly.
Index: Doc/SQLite.NET.chm
==================================================================
--- Doc/SQLite.NET.chm
+++ Doc/SQLite.NET.chm
cannot compute difference between binary files
Index: Externals/Eagle/bin/EagleShell.exe.mda.config
==================================================================
--- Externals/Eagle/bin/EagleShell.exe.mda.config
+++ Externals/Eagle/bin/EagleShell.exe.mda.config
@@ -11,11 +11,12 @@
* RCS: @(#) $Id: $
*
-->
-
+ ++-->
Index: Externals/Eagle/lib/Eagle1.0/init.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/init.eagle
+++ Externals/Eagle/lib/Eagle1.0/init.eagle
@@ -141,11 +141,11 @@
proc lappendArgs { args } {
#
# NOTE: This should work properly in both Tcl and Eagle.
#
- eval lappend result $args
+ set result [list]; eval lappend result $args
}
proc getDictionaryValue { dictionary name {default ""} {wrap ""} } {
#
# NOTE: Locate the named value we are interested in. The dictionary must
@@ -1045,47 +1045,28 @@
#
# NOTE: Next, figure out what type of download is being
# requested.
#
switch -exact -nocase -- $type {
- source {
- #
- # NOTE: Source code download. This may be a RAR or an EXE
- # file. Append the appropriate file name and then
- # join all the URI components to form the final URI.
- #
- set fileName [appendArgs EagleSource $patchLevel $extension]
- lappend components $fileName
-
- set result [list [eval uri join $components] \
- [file join $directory $fileName]]
- }
- setup {
- #
- # NOTE: Windows setup download. Always append an ".exe"
- # extension because we never distribute the setup as
- # a RAR file. Append the appropriate file name and
- # then join all the URI components to form the final
- # URI.
- #
- set fileName [appendArgs EagleSetup $patchLevel .exe]
- lappend components $fileName
-
- set result [list [eval uri join $components] \
- [file join $directory $fileName]]
- }
- binary {
- #
- # NOTE: Binary file download. This may be a RAR or an EXE
- # file. Append the appropriate file name and then
- # join all the URI components to form the final URI.
- #
- set fileName [appendArgs EagleBinary $patchLevel $extension]
- lappend components $fileName
-
- set result [list [eval uri join $components] \
- [file join $directory $fileName]]
+ source -
+ setup -
+ binary {
+ #
+ # NOTE: Source code, setup, or binary download. This may be
+ # a RAR or an EXE file. Append the appropriate file
+ # name and then join all the URI components to form the
+ # final URI.
+ #
+ set fileName [appendArgs \
+ [info engine] [string totitle $type] $patchLevel \
+ [expr {[string tolower $type] eq "setup" ? ".exe" : \
+ $extension}]]
+
+ lappend components $fileName
+
+ set result [list [eval uri join $components] [file join \
+ $directory $fileName]]
}
}
}
}
}
@@ -1554,25 +1535,48 @@
#
# NOTE: This should work properly in both Tcl and Eagle.
#
catch {puts stderr $string}
}
+
+ proc makeVariableFast { name fast } {
+ #
+ # NOTE: This should work properly in Eagle only.
+ #
+ catch {
+ uplevel 1 [list object invoke -flags +NonPublic \
+ Interpreter.GetActive MakeVariableFast $name $fast]
+ }
+ }
proc findDirectories { pattern } {
+ #
+ # NOTE: Block non-Windows platforms since this is Windows specific.
+ #
+ if {$::tcl_platform(platform) ne "windows"} then {
+ error "not supported on this operating system"
+ }
+
#
# NOTE: This should work properly in Eagle only.
#
- set result [list]
+ set dir ""; set result [list]
+
+ #
+ # HACK: Optimize the variable access in this procedure to be
+ # as fast as possible.
+ #
+ makeVariableFast dir true; makeVariableFast result true
foreach dir [split [exec -unicode $::env(ComSpec) /u /c dir \
/ad /b [appendArgs \" [file nativename $pattern] \"]] \n] {
set dir [string trim $dir]
if {[string length $dir] > 0} then {
set dir [getDirResultPath $pattern $dir]
- if {[lsearch -exact -nocase $result $dir] == -1} then {
+ if {[lsearch -variable -exact -nocase result $dir] == -1} then {
lappend result $dir
}
}
}
@@ -1581,33 +1585,46 @@
set dir [string trim $dir]
if {[string length $dir] > 0} then {
set dir [getDirResultPath $pattern $dir]
- if {[lsearch -exact -nocase $result $dir] == -1} then {
+ if {[lsearch -variable -exact -nocase result $dir] == -1} then {
lappend result $dir
}
}
}
return $result
}
proc findFiles { pattern } {
+ #
+ # NOTE: Block non-Windows platforms since this is Windows specific.
+ #
+ if {$::tcl_platform(platform) ne "windows"} then {
+ error "not supported on this operating system"
+ }
+
#
# NOTE: This should work properly in Eagle only.
#
- set result [list]
+ set fileName ""; set result [list]
+
+ #
+ # HACK: Optimize the variable access in this procedure to be
+ # as fast as possible.
+ #
+ makeVariableFast fileName true; makeVariableFast result true
foreach fileName [split [exec -unicode $::env(ComSpec) /u /c dir \
/a-d /b [appendArgs \" [file nativename $pattern] \"]] \n] {
set fileName [string trim $fileName]
if {[string length $fileName] > 0} then {
set fileName [getDirResultPath $pattern $fileName]
- if {[lsearch -exact -nocase $result $fileName] == -1} then {
+ if {[lsearch -variable -exact -nocase result $fileName] == -1} then {
lappend result $fileName
}
}
}
@@ -1616,33 +1633,46 @@
set fileName [string trim $fileName]
if {[string length $fileName] > 0} then {
set fileName [getDirResultPath $pattern $fileName]
- if {[lsearch -exact -nocase $result $fileName] == -1} then {
+ if {[lsearch -variable -exact -nocase result $fileName] == -1} then {
lappend result $fileName
}
}
}
return $result
}
proc findFilesRecursive { pattern } {
+ #
+ # NOTE: Block non-Windows platforms since this is Windows specific.
+ #
+ if {$::tcl_platform(platform) ne "windows"} then {
+ error "not supported on this operating system"
+ }
+
#
# NOTE: This should work properly in Eagle only.
#
- set result [list]
+ set fileName ""; set result [list]
+
+ #
+ # HACK: Optimize the variable access in this procedure to be
+ # as fast as possible.
+ #
+ makeVariableFast fileName true; makeVariableFast result true
foreach fileName [split [exec -unicode $::env(ComSpec) /u /c dir \
/a-d /s /b [appendArgs \" [file nativename $pattern] \"]] \n] {
set fileName [string trim $fileName]
if {[string length $fileName] > 0} then {
set fileName [getDirResultPath $pattern $fileName]
- if {[lsearch -exact -nocase $result $fileName] == -1} then {
+ if {[lsearch -variable -exact -nocase result $fileName] == -1} then {
lappend result $fileName
}
}
}
@@ -1651,11 +1681,11 @@
set fileName [string trim $fileName]
if {[string length $fileName] > 0} then {
set fileName [getDirResultPath $pattern $fileName]
- if {[lsearch -exact -nocase $result $fileName] == -1} then {
+ if {[lsearch -variable -exact -nocase result $fileName] == -1} then {
lappend result $fileName
}
}
}
@@ -1709,10 +1739,17 @@
return $result
}
proc findFilesRecursive { pattern } {
+ #
+ # NOTE: Block non-Windows platforms since this is Windows specific.
+ #
+ if {$::tcl_platform(platform) ne "windows"} then {
+ error "not supported on this operating system"
+ }
+
#
# NOTE: This should work properly in Tcl only.
#
set result [list]
@@ -1796,14 +1833,19 @@
#
# NOTE: Exports the necessary commands from this package and import them
# into the global namespace.
#
exportAndImportPackageCommands [namespace current] [list \
- exportAndImportPackageCommands isEagle isMono getEnvironmentVariable \
- getPluginPath getDictionaryValue getColumnValue getRowColumnValue \
- appendArgs haveGaruda lappendArgs readFile writeFile filter map \
- reduce getPlatformInfo execShell combineFlags tqputs tqlog] false false
+ isEagle haveGaruda isMono getEnvironmentVariable combineFlags \
+ getCompileInfo getPlatformInfo getPluginPath appendArgs lappendArgs \
+ getDictionaryValue getColumnValue getRowColumnValue tqputs tqlog \
+ readFile readSharedFile writeFile appendFile appendLogFile \
+ appendSharedFile appendSharedLogFile readAsciiFile writeAsciiFile \
+ readUnicodeFile writeUnicodeFile getDirResultPath addToPath \
+ removeFromPath execShell ldifference filter map reduce \
+ getLengthModifier debug findDirectories findFiles findFilesRecursive \
+ exportAndImportPackageCommands] false false
###########################################################################
############################## END Tcl ONLY ###############################
###########################################################################
}
Index: Externals/Eagle/lib/Eagle1.0/test.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/test.eagle
+++ Externals/Eagle/lib/Eagle1.0/test.eagle
@@ -386,12 +386,12 @@
#
# TODO: Add more support for standard tcltest options here.
#
set options [list -configuration -constraints -exitOnComplete -file \
- -logFile -match -no -notFile -postTest -preTest -skip -stopOnFailure \
- -suffix -tclsh -threshold]
+ -logFile -machine -match -no -notFile -platform -postTest -preTest \
+ -skip -stopOnFailure -suffix -tclsh -threshold]
foreach {name value} $args {
#
# NOTE: Use the [tqputs] command here just in case the test log file
# has not been setup yet (i.e. by default, this procedure is
@@ -488,14 +488,22 @@
}
}
proc getFiles { directory pattern } {
if {[isEagle]} then {
- return [lsort -dictionary [file list $directory $pattern]]
+ set result [list]
+
+ foreach fileName [lsort -dictionary [file list $directory $pattern]] {
+ if {[file isfile $fileName] && [file readable $fileName]} then {
+ lappend result $fileName
+ }
+ }
+
+ return $result
} else {
return [lsort -dictionary [glob -directory $directory -types \
- {b c f p s} -nocomplain -- $pattern]]
+ {f r} -nocomplain -- $pattern]]
}
}
proc getTestFiles { directories matchFilePatterns skipFilePatterns } {
set result [list]
@@ -1267,23 +1275,10 @@
#
# NOTE: We evaluated another test file.
#
incr count
- #
- # NOTE: In terms of files, not tests, what percent done are we now?
- #
- set percent [formatDecimal \
- [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
-
- if {$percent != $lastPercent} then {
- reportTestPercent $channel $percent \
- [llength $failed] [llength $leaked]
-
- set lastPercent $percent
- }
-
#
# NOTE: Record failed test count after this file.
#
if {[isEagle]} then {
set after $::eagle_tests(failed)
@@ -1295,10 +1290,23 @@
# NOTE: Did this file have any failing tests?
#
if {$after > $before} then {
lappend failed [file tail $fileName]
}
+
+ #
+ # NOTE: In terms of files, not tests, what percent done are we now?
+ #
+ set percent [formatDecimal \
+ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]]
+
+ if {$percent != $lastPercent} then {
+ reportTestPercent $channel $percent \
+ [llength $failed] [llength $leaked]
+
+ set lastPercent $percent
+ }
#
# NOTE: Unset the current test file name, it is no longer
# needed.
#
@@ -1318,10 +1326,16 @@
# output diagnostics as necessary if they have.
#
reportTestStatistics $channel $fileName leaks leaked
}
} else {
+ #
+ # NOTE: This entire file has been skipped. Record that fact in the
+ # test suite log file.
+ #
+ tputs $channel [appendArgs "==== \"" $fileName "\" NON_TEST_FILE\n"]
+
#
# NOTE: This file does not actually count towards the total (i.e.
# it contains no actual tests).
#
incr total -1
@@ -1347,10 +1361,16 @@
#
if {$stop} then {
break
}
} else {
+ #
+ # NOTE: This entire file has been skipped. Record that fact in the
+ # test suite log file.
+ #
+ tputs $channel [appendArgs "==== \"" $fileName "\" SKIPPED\n"]
+
#
# NOTE: This file does not actually count towards the total (i.e.
# it is part of the test suite infrastructure).
#
incr total -1
@@ -1761,10 +1781,78 @@
proc getTkVersion {} {
return [testExecTclScript {
puts -nonewline stdout [package require Tk]; exit
}]
}
+
+ proc getTestMachine {} {
+ #
+ # NOTE: Determine the effective test machine and return it. If the
+ # test machine cannot be determined, return an empty string.
+ #
+ if {[info exists ::test_flags(-machine)] && \
+ [string length $::test_flags(-machine)] > 0} then {
+ #
+ # NOTE: The test machine has been manually overridden via the test
+ # flags; therefore, use it.
+ #
+ return $::test_flags(-machine)
+ } elseif {[info exists ::test_machine]} then {
+ #
+ # NOTE: Use the test machine. The default value is set by the test
+ # suite prologue; however, this may have been overridden.
+ #
+ return $::test_machine
+ } elseif {[info exists ::tcl_platform(machine)]} then {
+ #
+ # NOTE: Use the build machine of Eagle itself.
+ #
+ return $::tcl_platform(machine)
+ } else {
+ #
+ # NOTE: We are missing the machine, return nothing.
+ #
+ return ""
+ }
+ }
+
+ proc getTestPlatform {} {
+ #
+ # NOTE: Determine the effective test platform and return it. If the
+ # test platform cannot be determined, return an empty string.
+ #
+ if {[info exists ::test_flags(-platform)] && \
+ [string length $::test_flags(-platform)] > 0} then {
+ #
+ # NOTE: The test platform has been manually overridden via the test
+ # flags; therefore, use it.
+ #
+ return $::test_flags(-platform)
+ } elseif {[info exists ::test_platform]} then {
+ #
+ # NOTE: Use the test platform. The default value is set by the test
+ # suite prologue; however, this may have been overridden.
+ #
+ return $::test_platform
+ } else {
+ set machine [getTestMachine]
+
+ if {[string length $machine] > 0} then {
+ #
+ # NOTE: Use the machine architecture to figure out the platform
+ # and then return it.
+ #
+ return [machineToPlatform $machine]
+ } else {
+ #
+ # NOTE: We are missing the machine and we cannot figure out the
+ # platform without it; therefore, return nothing.
+ #
+ return ""
+ }
+ }
+ }
proc getTestConfiguration {} {
#
# NOTE: Determine the effective test configuration and return it. If
# the test configuration cannot be determined, return an empty
@@ -1777,19 +1865,18 @@
# test flags; therefore, use it.
#
return $::test_flags(-configuration)
} elseif {[info exists ::test_configuration]} then {
#
- # NOTE: Use the test configuration. The default value is "Release",
- # as set by the test suite prologue; however, this may have
- # been overridden.
+ # NOTE: Use the test configuration. The default value is set by the
+ # test suite prologue; however, this may have been overridden.
#
return $::test_configuration
} elseif {[info exists ::eagle_platform(configuration)]} then {
#
# NOTE: Use the build configuration of Eagle itself. This value will
- # always be "Debug" or "Release".
+ # most likely be either "Debug" or "Release".
#
return $::eagle_platform(configuration)
} else {
#
# NOTE: We are missing the configuration, return nothing.
@@ -2053,19 +2140,23 @@
#
# NOTE: We need several of our test related commands in the global
# namespace as well.
#
- exportAndImportPackageCommands [namespace current] [list addConstraint \
- calculateRelativePerformance haveConstraint haveOrAddConstraint \
- processTestArguments getTemporaryPath getTestLog getTestLogId getFiles \
- getConstraints getTestFiles getTestRunId execTestShell runTestPrologue \
- runTestEpilogue runTest runAllTests fixConstraints sourceIfValid \
- isExitOnComplete getPassPercentage getSkipPercentage testExec tlog \
- returnInfoScript tputs formatDecimal formatList configureTcltest \
- calculateBogoCops removeConstraint machineToPlatform tsource testShim \
- getTestConfiguration getTestSuffix getTclShellFileName] false false
+ exportAndImportPackageCommands [namespace current] [list \
+ tputs tlog getSoftwareRegistryKey haveConstraint addConstraint \
+ haveOrAddConstraint getConstraints removeConstraint fixConstraints \
+ calculateBogoCops calculateRelativePerformance sourceIfValid \
+ processTestArguments getTclShellFileName getTemporaryPath getFiles \
+ getTestFiles getTestRunId getTestLogId getTestLog testExec \
+ testClrExec execTestShell isStopOnFailure isExitOnComplete \
+ returnInfoScript runTestPrologue runTestEpilogue hookPuts unhookPuts \
+ runTest testShim tsource recordTestStatistics reportTestStatistics \
+ formatList formatListAsDict pathToRegexp inverseLsearchGlob \
+ removePathFromFileNames formatDecimal clearTestPercent \
+ reportTestPercent runAllTests configureTcltest machineToPlatform \
+ getPassPercentage getSkipPercentage] false false
###########################################################################
############################## END Tcl ONLY ###############################
###########################################################################
}
Index: Externals/Eagle/lib/Eagle1.0/vendor.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/vendor.eagle
+++ Externals/Eagle/lib/Eagle1.0/vendor.eagle
@@ -42,13 +42,15 @@
}
incr result
if {!$quiet} then {
- tqputs $channel [appendArgs \
- "---- found vendor-specific test override \"" $varName \
- "\" with value \"" [uplevel 1 [list set $varName]] \"\n]
+ catch {
+ tqputs $channel [appendArgs \
+ "---- found vendor-specific test override \"" $varName \
+ "\" with value \"" [uplevel 1 [list set $varName]] \"\n]
+ }
}
}
#
# NOTE: Keep track of the list of test override variables, for later
@@ -108,13 +110,15 @@
[lsearch -exact $::env(EAGLELIBPATH) $dir2] == -1} then {
#
# NOTE: If we have NOT been instructed to be quiet, report now.
#
if {!$quiet} then {
- tqputs $channel [appendArgs \
- "---- found vendor-specific test package directory \"" \
- $dir2 "\", adding...\n"]
+ catch {
+ tqputs $channel [appendArgs \
+ "---- found vendor-specific test package directory \"" \
+ $dir2 "\", adding...\n"]
+ }
}
#
# NOTE: Append the directory to the necessary environment variable
# so that it will get picked up when Eagle actually rebuilds
@@ -143,12 +147,14 @@
#
# NOTE: If we have NOT been instructed to be quiet, report now.
#
if {!$quiet} then {
- tqputs $channel \
- "---- could not find vendor-specific test package directory\n"
+ catch {
+ tqputs $channel \
+ "---- could not find vendor-specific test package directory\n"
+ }
}
#
# NOTE: Directory not found, return failure.
#
@@ -161,12 +167,14 @@
if {$dir ne $testPath} then {
object invoke -flags +NonPublic Interpreter.GetActive TestPath $dir
if {!$quiet} then {
- tqputs $channel [appendArgs \
- "---- set interpreter test path to \"" $dir \"\n]
+ catch {
+ tqputs $channel [appendArgs \
+ "---- set interpreter test path to \"" $dir \"\n]
+ }
}
}
}
#
@@ -175,11 +183,12 @@
#
checkForTestOverrides stdout [expr {[info exists test_overrides] ? \
$test_overrides : [list binary_directory build_base_directory \
build_directory common_directory connection_flags database_directory \
datetime_format scratch_directory temporary_directory \
- test_configuration test_constraints test_overrides test_year \
+ test_configuration test_configurations test_constraints \
+ test_machine test_overrides test_platform test_year test_years \
test_year_clr_v2 test_year_clr_v4 vendor_directory]}] false
#
# NOTE: This variable will contain the name of the directory containing the
# vendor-specific testing infrastructure. If the variable does not
Index: Externals/Eagle/lib/Test1.0/constraints.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/constraints.eagle
+++ Externals/Eagle/lib/Test1.0/constraints.eagle
@@ -18,10 +18,21 @@
# NOTE: Use our own namespace here because even though we do not directly
# support namespaces ourselves, we do not want to pollute the global
# namespace if this script actually ends up being evaluated in Tcl.
#
namespace eval ::Eagle {
+ proc getKnownMonoVersions {} {
+ #
+ # NOTE: This job of this procedure is to return the list of "known"
+ # versions of Mono supported by the test suite infrastructure.
+ #
+ return [list \
+ [list 2 0] [list 2 2] [list 2 4] [list 2 6] [list 2 8] [list 2 10] \
+ [list 2 11] [list 2 12] [list 3 0] [list 3 1] [list 3 2] [list 3 3] \
+ [list 3 4] [list 3 5] [list 3 6]]
+ }
+
proc checkForPlatform { channel } {
tputs $channel "---- checking for platform... "
if {[info exists ::tcl_platform(platform)]} then {
addConstraint $::tcl_platform(platform)
@@ -42,14 +53,16 @@
#
# NOTE: Add the necessary constraints for each version of Mono that
# we know about.
#
- foreach version [list 20 22 24 26 28 210 211 212 30] {
- addConstraint [appendArgs monoToDo $version]
- addConstraint [appendArgs monoBug $version]
- addConstraint [appendArgs monoCrash $version]
+ foreach monoVersion [getKnownMonoVersions] {
+ set constraintVersion [join $monoVersion ""]
+
+ addConstraint [appendArgs monoToDo $constraintVersion]
+ addConstraint [appendArgs monoBug $constraintVersion]
+ addConstraint [appendArgs monoCrash $constraintVersion]
}
#
# NOTE: Also add just the generic Mono constraints that do not have
# a trailing version.
@@ -594,10 +607,36 @@
tputs $channel yes\n
} else {
tputs $channel no\n
}
}
+
+ proc checkForTestMachine { channel } {
+ tputs $channel "---- checking for test machine... "
+
+ if {[info exists ::test_machine] && \
+ [string length $::test_machine] > 0} then {
+ addConstraint [appendArgs machine. $::test_machine]
+
+ tputs $channel [appendArgs $::test_machine \n]
+ } else {
+ tputs $channel unknown\n
+ }
+ }
+
+ proc checkForTestPlatform { channel } {
+ tputs $channel "---- checking for test platform... "
+
+ if {[info exists ::test_platform] && \
+ [string length $::test_platform] > 0} then {
+ addConstraint [appendArgs platform. $::test_platform]
+
+ tputs $channel [appendArgs $::test_platform \n]
+ } else {
+ tputs $channel unknown\n
+ }
+ }
proc checkForTestConfiguration { channel } {
tputs $channel "---- checking for test configuration... "
if {[info exists ::test_configuration] && \
@@ -941,10 +980,25 @@
tputs $channel yes\n
} else {
tputs $channel no\n
}
}
+
+ proc checkForStackIntensive { channel } {
+ tputs $channel "---- checking for stack intensive testing... "
+
+ #
+ # NOTE: Are we allowed to do stack intensive testing?
+ #
+ if {![info exists ::no(stackIntensive)]} then {
+ addConstraint stackIntensive
+
+ tputs $channel yes\n
+ } else {
+ tputs $channel no\n
+ }
+ }
proc checkForInteractive { channel } {
tputs $channel "---- checking for interactive user... "
#
@@ -1116,10 +1170,100 @@
tputs $channel trusted\n
} else {
tputs $channel untrusted\n
}
}
+
+ proc checkForManagedDebuggingAssistants { channel } {
+ set fileName [file normalize [appendArgs [info nameofexecutable] \
+ .mda.config]]
+
+ tputs $channel [appendArgs \
+ "---- checking for managed debugging assistants enabled via \"" \
+ $fileName "\"... "]
+
+ if {[file exists $fileName]} then {
+ #
+ # NOTE: Since the System.Xml assembly may not be loaded, wrap the
+ # detection in a [catch] block.
+ #
+ if {[catch {
+ #
+ # NOTE: Create and load an XML document based on the data from the
+ # MDA configuration file associated with the executable that
+ # started this process.
+ #
+ set document [object create -alias System.Xml.XmlDocument]
+ $document LoadXml [readFile $fileName]
+
+ #
+ # NOTE: Setup the XML namespace manager for use when using XPath
+ # to query the XML document.
+ #
+ set nameTable [$document NameTable]
+
+ set namespaceManager [object create \
+ -alias System.Xml.XmlNamespaceManager $nameTable]
+
+ $namespaceManager AddNamespace mda \
+ http://schemas.microsoft.com/CLR/2004/10/mda
+
+ #
+ # NOTE: Select all nodes underneath the location where they should
+ # reside in the MDA configuration XML document.
+ #
+ set nodes [$document SelectNodes \
+ /mda:mdaConfig/mda:assistants/* $namespaceManager]
+
+ #
+ # NOTE: Populate the local result variable with the names of
+ # all the XML nodes found.
+ #
+ set names [object lmap -alias node $nodes {
+ $node Name
+ }]
+ }] == 0} then {
+ #
+ # NOTE: Ok, the XML configuration file was loaded and parsed
+ # correctly, see if any managed debugging assistants were
+ # found enabled within it.
+ #
+ if {[info exists names] && [llength $names] > 0} then {
+ #
+ # NOTE: Add a test constraint for each managed debugging
+ # assistant that appears to be enabled.
+ #
+ addConstraint mda
+
+ foreach name $names {
+ addConstraint [appendArgs mda. $name]
+ }
+
+ #
+ # NOTE: Save the list of managed debugging assistants for
+ # later use by the test suite.
+ #
+ if {![info exists ::no(setMdas)]} then {
+ set ::test_mdas $names
+ }
+
+ #
+ # NOTE: Yes, it appears that at least one managed debugging
+ # assistant is enabled.
+ #
+ tputs $channel [appendArgs "yes (" $names ")\n"]
+
+ #
+ # NOTE: We are done here, return now.
+ #
+ return
+ }
+ }
+ }
+
+ tputs $channel no\n
+ }
proc checkForStrongName { channel } {
tputs $channel "---- checking for strong name... "
if {[catch {object invoke Interpreter.GetActive GetStrongName} \
@@ -1293,10 +1437,42 @@
" " ( $dotVersion ) \n]
} else {
tputs $channel no\n
}
}
+
+ proc checkForFrameworkVersion { channel } {
+ tputs $channel "---- checking for framework version... "
+
+ if {[info exists ::eagle_platform(frameworkVersion)] && \
+ [string length $::eagle_platform(frameworkVersion)] > 0} then {
+ #
+ # NOTE: Get the major and minor portions of the version only.
+ #
+ set dotVersion [join [lrange [split \
+ $::eagle_platform(frameworkVersion) .] 0 1] .]
+
+ #
+ # NOTE: Now create a version string for use in the constraint name
+ # (remove the periods).
+ #
+ set version [string map [list . ""] $dotVersion]
+
+ #
+ # NOTE: If the framework version was found, add a test constraint
+ # for it now.
+ #
+ if {[string length $version] > 0} then {
+ addConstraint [appendArgs framework $version]
+ }
+
+ tputs $channel [appendArgs $::eagle_platform(frameworkVersion) \
+ " " ( $dotVersion ) \n]
+ } else {
+ tputs $channel no\n
+ }
+ }
proc checkForRuntimeVersion { channel } {
tputs $channel "---- checking for runtime version... "
if {[info exists ::eagle_platform(runtimeVersion)] && \
@@ -1312,124 +1488,95 @@
# (remove the periods).
#
set version [string map [list . ""] $dotVersion]
if {[isMono]} then {
+ #
+ # NOTE: If the runtime version was found, add a test constraint
+ # for it now.
+ #
if {[string length $version] > 0} then {
#
# NOTE: We are running on Mono. Keep track of the specific
# version for usage in test constraints.
#
addConstraint [appendArgs mono $version]
- }
-
- if {[string length $dotVersion] > 0 && \
- [regexp -- {^(\d+)\.(\d+)$} $dotVersion dummy \
- majorVersion minorVersion]} then {
- set monoVersions [list]
-
- #
- # NOTE: Check for any Mono version 2.x or higher.
- #
- if {$majorVersion >= 2} then {
- #
- # NOTE: Check for any Mono version higher than 2.0.
- #
- if {$majorVersion > 2 || $minorVersion > 0} then {
- lappend monoVersions 20
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.2.
- #
- if {$majorVersion > 2 || $minorVersion > 2} then {
- lappend monoVersions 22
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.4.
- #
- if {$majorVersion > 2 || $minorVersion > 4} then {
- lappend monoVersions 24
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.6.
- #
- if {$majorVersion > 2 || $minorVersion > 6} then {
- lappend monoVersions 26
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.8.
- #
- if {$majorVersion > 2 || $minorVersion > 8} then {
- lappend monoVersions 28
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.10.
- #
- if {$majorVersion > 2 || $minorVersion > 10} then {
- lappend monoVersions 210
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.11.
- #
- if {$majorVersion > 2 || $minorVersion > 11} then {
- lappend monoVersions 211
- }
-
- #
- # NOTE: Check for any Mono version higher than 2.12.
- #
- if {$majorVersion > 2 || $minorVersion > 12} then {
- lappend monoVersions 212
- }
- }
-
- #
- # NOTE: Check for any Mono version 3.x or higher.
- #
- if {$majorVersion >= 3} then {
- #
- # NOTE: Check for any Mono version higher than 3.0.
- #
- if {$majorVersion > 3 || $minorVersion > 0} then {
- lappend monoVersions 30
- }
- }
-
- #
- # NOTE: Add the necessary constraints for each version of Mono we
- # should NOT skip bugs for.
- #
- foreach monoVersion $monoVersions {
- addConstraint [appendArgs monoToDo $monoVersion]
- addConstraint [appendArgs monoBug $monoVersion]
- addConstraint [appendArgs monoCrash $monoVersion]
- }
- }
- } else {
+ addConstraint [appendArgs mono $version OrHigher]
+ }
+
+ #
+ # NOTE: Attempt to parse the version into its major and minor
+ # components.
+ #
+ if {[string length $dotVersion] > 0 && [regexp -- {^(\d+)\.(\d+)$} \
+ $dotVersion dummy majorVersion minorVersion]} then {
+ #
+ # NOTE: This is the list of Mono versions to add test
+ # constraints for.
+ #
+ set monoVersions [list]
+
+ #
+ # NOTE: Check each Mono version "known" to the test suite.
+ #
+ foreach monoVersion [getKnownMonoVersions] {
+ #
+ # NOTE: Check for any Mono major version X or higher.
+ #
+ if {$majorVersion >= [lindex $monoVersion 0]} then {
+ #
+ # NOTE: Check for any Mono major/minor version higher
+ # than X.Y.
+ #
+ if {$majorVersion > [lindex $monoVersion 0] || \
+ $minorVersion > [lindex $monoVersion 1]} then {
+ #
+ # NOTE: Add this "known" version of Mono.
+ #
+ lappend monoVersions $monoVersion
+ }
+ }
+ }
+
+ #
+ # NOTE: Add the necessary constraints for each version of Mono
+ # we should NOT skip bugs for.
+ #
+ foreach monoVersion $monoVersions {
+ set constraintVersion [join $monoVersion ""]
+
+ addConstraint [appendArgs mono $constraintVersion OrHigher]
+ addConstraint [appendArgs monoToDo $constraintVersion]
+ addConstraint [appendArgs monoBug $constraintVersion]
+ addConstraint [appendArgs monoCrash $constraintVersion]
+ }
+ }
+ } else {
+ #
+ # NOTE: If the runtime version was found, add a test constraint
+ # for it now.
+ #
if {[string length $version] > 0} then {
#
# NOTE: We are running on the .NET Framework. Keep track of the
# specific version for usage in test constraints.
#
addConstraint [appendArgs dotNet $version]
+ addConstraint [appendArgs dotNet $version OrHigher]
}
#
# NOTE: We do not want to skip any Mono bugs on .NET. Add the
# necessary constraints for each version of Mono we know
# about.
#
- foreach monoVersion [list 20 22 24 26 28 210 211 212 30] {
- addConstraint [appendArgs monoToDo $monoVersion]
- addConstraint [appendArgs monoBug $monoVersion]
- addConstraint [appendArgs monoCrash $monoVersion]
+ foreach monoVersion [getKnownMonoVersions] {
+ set constraintVersion [join $monoVersion ""]
+
+ addConstraint [appendArgs monoToDo $constraintVersion]
+ addConstraint [appendArgs monoBug $constraintVersion]
+ addConstraint [appendArgs monoCrash $constraintVersion]
}
}
tputs $channel [appendArgs $::eagle_platform(runtimeVersion) \
" " ( $dotVersion ) \n]
@@ -2026,11 +2173,13 @@
#
# NOTE: Save the directory for later usage by
# the test itself.
#
- set ::test_wix $directory
+ if {![info exists ::no(setWix)]} then {
+ set ::test_wix $directory
+ }
#
# NOTE: Show where we found it.
#
tputs $channel [appendArgs "yes (" $version ", via " $where ", \"" \
@@ -2043,10 +2192,37 @@
}
}
tputs $channel no\n
}
+
+ proc checkForTargetFramework { channel } {
+ tputs $channel "---- checking for target framework... "
+
+ if {[info exists ::eagle_platform(targetFramework)] && \
+ [string length $::eagle_platform(targetFramework)] > 0} then {
+ #
+ # NOTE: Now create a string for use in the constraint name (remove
+ # the invalid characters). For example:
+ #
+ # ".NETFramework,Version=v2.0" --> "NETFramework.Version.v2.0"
+ #
+ set targetFramework [string trimleft [string map [list , . = .] \
+ $::eagle_platform(targetFramework)] .]
+
+ #
+ # NOTE: Keep track of the specific target framework for usage in test
+ # constraints.
+ #
+ addConstraint [appendArgs targetFramework. $targetFramework]
+
+ tputs $channel [appendArgs $::eagle_platform(targetFramework) \
+ " " ( $targetFramework ) \n]
+ } else {
+ tputs $channel no\n
+ }
+ }
proc checkForNetFx45 { channel } {
tputs $channel "---- checking for .NET Framework 4.5... "
#
@@ -2146,11 +2322,13 @@
#
# NOTE: Save the directory for later usage by
# the test itself.
#
- set ::test_visual_studio [file dirname $fileName]
+ if {![info exists ::no(setVisualStudio)]} then {
+ set ::test_visual_studio [file dirname $fileName]
+ }
}
}
}
if {[llength $visualStudioVersions] > 0} then {
@@ -2269,20 +2447,22 @@
#
# NOTE: We need several of our test constraint related commands in the
# global namespace.
#
- exportAndImportPackageCommands [namespace current] [list checkForPlatform \
- checkForEagle checkForGaruda checkForShell checkForDebug checkForTk \
- checkForVersion checkForCommand checkForFile checkForNativeCode \
- checkForTip127 checkForTip194 checkForTip241 checkForTip285 \
- checkForTip405 checkForPerformance checkForTiming checkForInteractive \
- checkForSymbols checkForLogFile checkForNetwork checkForCompileOption \
- checkForInteractiveCommand checkForWindowsCommandProcessor \
- checkForUserInteraction checkForTclOptions checkForTestConfiguration \
- checkForTestSuffix checkForVariable checkForScriptLibrary \
- checkForFossil] false false
+ exportAndImportPackageCommands [namespace current] [list \
+ getKnownMonoVersions checkForPlatform checkForScriptLibrary \
+ checkForVariable checkForTclOptions checkForWindowsCommandProcessor \
+ checkForFossil checkForEagle checkForSymbols checkForLogFile \
+ checkForGaruda checkForShell checkForDebug checkForTk checkForVersion \
+ checkForCommand checkForTestMachine checkForTestPlatform \
+ checkForTestConfiguration checkForTestSuffix checkForFile \
+ checkForPathFile checkForNativeCode checkForTip127 checkForTip194 \
+ checkForTip241 checkForTip285 checkForTip405 checkForTiming \
+ checkForPerformance checkForStackIntensive checkForInteractive \
+ checkForInteractiveCommand checkForUserInteraction checkForNetwork \
+ checkForCompileOption] false false
###########################################################################
############################## END Tcl ONLY ###############################
###########################################################################
}
Index: Externals/Eagle/lib/Test1.0/prologue.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/prologue.eagle
+++ Externals/Eagle/lib/Test1.0/prologue.eagle
@@ -238,10 +238,12 @@
#############################################################################
#
# NOTE: If command line arguments were supplied, process them now.
#
+ set test_flags(-machine) ""; # machine architecture, default to empty.
+ set test_flags(-platform) ""; # build platform, default to empty.
set test_flags(-configuration) ""; # build configuration, default to empty.
set test_flags(-suffix) ""; # build suffix, default to empty.
set test_flags(-file) [list *.eagle]; # default to running all test files.
set test_flags(-notFile) [list l.*.eagle]; # COMPAT: Tcl.
set test_flags(-match) [list *]; # default to running all tests.
@@ -324,10 +326,25 @@
# NOTE: Set the pre-test script to the one provided by the command line.
#
set test_script(post) $test_flags(-postTest)
}
}
+
+ #
+ # NOTE: Set the default test machine (e.g. amd64, intel, etc), if necessary.
+ #
+ if {![info exists test_machine]} then {
+ set test_machine [expr {[info exists tcl_platform(machine)] ? \
+ $tcl_platform(machine) : ""}]
+ }
+
+ #
+ # NOTE: Set the default test platform (e.g. x86, x64, etc), if necessary.
+ #
+ if {![info exists test_platform]} then {
+ set test_platform [machineToPlatform $test_machine true]
+ }
#
# NOTE: Set the default test configuration (i.e. Debug or Release), if
# necessary.
#
@@ -442,10 +459,18 @@
tputs $test_channel [appendArgs "---- processId: " \
[pid] \n]
tputs $test_channel [appendArgs "---- test channel: " \
$test_channel \n]
+
+ tputs $test_channel [appendArgs "---- test machine: " \
+ [expr {[info exists test_machine] ? \
+ $test_machine : ""}] \n]
+
+ tputs $test_channel [appendArgs "---- test platform: " \
+ [expr {[info exists test_platform] ? \
+ $test_platform : ""}] \n]
tputs $test_channel [appendArgs "---- test configuration: " \
[expr {[info exists test_configuration] ? \
$test_configuration : ""}] \n]
@@ -683,20 +708,28 @@
if {![info exists no(runtime)]} then {
checkForRuntime $test_channel
}
#
- # NOTE: Check the runtime version (i.e. what version of the runtime
- # are we currently running on?).
+ # NOTE: Check the variant and/or version of the CLR that we are
+ # currently running on.
#
if {![info exists no(runtimeVersion)]} then {
checkForRuntimeVersion $test_channel
}
#
- # NOTE: Check the image runtime version (i.e. what version of the
- # runtime was this assembly compiled against?).
+ # NOTE: Check the framework version (i.e. regardless of runtime) that
+ # we are currently running on.
+ #
+ if {![info exists no(frameworkVersion)]} then {
+ checkForFrameworkVersion $test_channel
+ }
+
+ #
+ # NOTE: Check the image runtime version (i.e. the runtime version that
+ # this assembly compiled against).
#
if {![info exists no(imageRuntimeVersion)]} then {
checkForImageRuntimeVersion $test_channel
}
@@ -1369,10 +1402,19 @@
# NOTE: For test "object-4.1".
#
checkForObjectMember $test_channel Eagle._Tests.Default \
*TestExpr*
+ #
+ # NOTE: For test "array-4.1".
+ #
+ checkForObjectMember $test_channel Eagle._Tests.Default \
+ *TestTwoByteArrays*
+
+ checkForObjectMember $test_channel Eagle._Tests.Default \
+ *TestReturnByteArray*
+
#
# NOTE: For test "object-7.1".
#
checkForObjectMember $test_channel Eagle._Tests.Default \
*TestByRefValueTypeMethod*
@@ -1523,10 +1565,17 @@
# NOTE: For test "object-12.1.*".
#
checkForNetFx45 $test_channel
}
+ #
+ # NOTE: Has target framework testing support been disabled?
+ #
+ if {![info exists no(targetFramework)]} then {
+ checkForTargetFramework $test_channel
+ }
+
#
# NOTE: Has Visual Studio testing support been disabled?
#
if {![info exists no(visualStudio)]} then {
checkForVisualStudio $test_channel
@@ -1546,10 +1595,18 @@
# NOTE: Has managed debugger testing support been disabled?
#
if {![info exists no(managedDebugger)]} then {
checkForManagedDebugger $test_channel
}
+
+ #
+ # NOTE: Has managed debugging assistants testing support been
+ # disabled?
+ #
+ if {![info exists no(managedDebuggingAssistants)]} then {
+ checkForManagedDebuggingAssistants $test_channel
+ }
#
# NOTE: Has script debugger testing support been disabled?
#
if {![info exists no(scriptDebugger)]} then {
@@ -1655,10 +1712,24 @@
####################### BEGIN Tcl & Eagle Constraints #######################
#############################################################################
tputs $test_channel [appendArgs \
"---- start of common (Tcl & Eagle) test constraints...\n"]
+
+ #
+ # NOTE: Has checking for the test machine been disabled?
+ #
+ if {![info exists no(testMachine)]} then {
+ checkForTestMachine $test_channel
+ }
+
+ #
+ # NOTE: Has checking for the test platform been disabled?
+ #
+ if {![info exists no(testPlatform)]} then {
+ checkForTestPlatform $test_channel
+ }
#
# NOTE: Has checking for the test configuration been disabled?
#
if {![info exists no(testConfiguration)]} then {
@@ -1848,18 +1919,17 @@
#
# NOTE: Did we manage to find the native SQLite library? If not, do we
# at least know the machine type?
#
- if {![haveConstraint file_sqlite3.dll] && \
- [info exists tcl_platform(machine)]} then {
+ if {![haveConstraint file_sqlite3.dll]} then {
#
# NOTE: Ok, now try to check for the machine specific native SQLite
# library.
#
checkForFile $test_channel [file join $bin_path [machineToPlatform \
- $tcl_platform(machine) true] sqlite3.dll]
+ $test_machine true] sqlite3.dll]
#
# NOTE: Did we manage to find the native SQLite library yet?
#
if {![haveConstraint file_sqlite3.dll]} then {
@@ -1866,11 +1936,11 @@
#
# NOTE: Ok, now try to check for the platform specific native SQLite
# library.
#
checkForFile $test_channel [file join $bin_path [machineToPlatform \
- $tcl_platform(machine) false] sqlite3.dll]
+ $test_machine false] sqlite3.dll]
}
}
}
if {![info exists no(System.Data.SQLite.dll)]} then {
@@ -1895,10 +1965,14 @@
}
if {![info exists no(tclOptions)]} then {
checkForTclOptions $test_channel
}
+
+ if {![info exists no(stackIntensive)]} then {
+ checkForStackIntensive $test_channel
+ }
if {![info exists no(windowsCommandProcessor)]} then {
checkForWindowsCommandProcessor $test_channel cmd.exe
}
@@ -2210,10 +2284,13 @@
tputs $test_channel [appendArgs "---- strongName: " \
[getPlatformInfo strongName ] \n]
tputs $test_channel [appendArgs "---- certificate: " \
[getPlatformInfo certificate ] \n]
+
+ tputs $test_channel [appendArgs "---- targetFramework: " \
+ [getPlatformInfo targetFramework ] \n]
}
#
# NOTE: Show the current test file name, if any.
#
Index: Membership/Properties/AssemblyInfo.cs
==================================================================
--- Membership/Properties/AssemblyInfo.cs
+++ Membership/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.83.0")]
-[assembly: AssemblyFileVersion("1.0.83.0")]
+[assembly: AssemblyVersion("1.0.85.0")]
+[assembly: AssemblyFileVersion("1.0.85.0")]
ADDED SQLite.Beta.nuspec
Index: SQLite.Beta.nuspec
==================================================================
--- /dev/null
+++ SQLite.Beta.nuspec
@@ -0,0 +1,39 @@
+
+
+
+
+ System.Data.SQLite.Beta
+ System.Data.SQLite (x86/x64) Beta
+ 1.0.85.0
+ SQLite Development Team
+ The official SQLite database engine for both x86 and x64 along with the ADO.NET provider.
+ en-US
+ http://system.data.sqlite.org/
+ http://system.data.sqlite.org/images/sqlite32.png
+ http://www.sqlite.org/copyright.html
+ sqlite database ado.net provider interop
+ Public Domain
+
+
+
+
Index: SQLite.Designer/AssemblyInfo.cs
==================================================================
--- SQLite.Designer/AssemblyInfo.cs
+++ SQLite.Designer/AssemblyInfo.cs
@@ -41,7 +41,7 @@
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.83.0")]
-[assembly: AssemblyFileVersion("1.0.83.0")]
+[assembly: AssemblyVersion("1.0.85.0")]
+[assembly: AssemblyFileVersion("1.0.85.0")]
Index: SQLite.Designer/source.extension.vsixmanifest
==================================================================
--- SQLite.Designer/source.extension.vsixmanifest
+++ SQLite.Designer/source.extension.vsixmanifest
@@ -1,11 +1,11 @@
System.Data.SQLite Designer
http://system.data.sqlite.org/
- 1.0.83.0
+ 1.0.85.0
ADO.NET Data Designer for SQLite
1033
false
Index: SQLite.Interop/props/SQLite.Interop.2005.vsprops
==================================================================
--- SQLite.Interop/props/SQLite.Interop.2005.vsprops
+++ SQLite.Interop/props/SQLite.Interop.2005.vsprops
@@ -17,26 +17,26 @@
Value="2005"
PerformEnvironmentSet="true"
/>
2010
- 083
+ 085
1.0
- 1.0.83.0
- 1,0,83,0
+ 1.0.85.0
+ 1,0,85,0
INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1
INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp
$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk
SQLite.Interop
Index: SQLite.Interop/props/SQLite.Interop.2012.props
==================================================================
--- SQLite.Interop/props/SQLite.Interop.2012.props
+++ SQLite.Interop/props/SQLite.Interop.2012.props
@@ -8,14 +8,14 @@
*
-->
2012
- 083
+ 085
1.0
- 1.0.83.0
- 1,0,83,0
+ 1.0.85.0
+ 1,0,85,0
INTEROP_DEBUG=0x31F;INTEROP_LOG=1;INTEROP_TEST_EXTENSION=1
INTEROP_EXTENSION_FUNCTIONS=1;INTEROP_CODEC=1
/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp
$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk
SQLite.Interop
Index: SQLite.Interop/props/sqlite3.props
==================================================================
--- SQLite.Interop/props/sqlite3.props
+++ SQLite.Interop/props/sqlite3.props
@@ -7,12 +7,12 @@
* Released to the public domain, use at your own risk!
*
-->
- 3.7.15.1
- 3,7,15,1
+ 3.7.16
+ 3,7,16
_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_USE_URI=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_ENABLE_STAT3=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_LOAD_EXTENSION=1;SQLITE_ENABLE_RTREE=1;SQLITE_SOUNDEX=1
SQLITE_HAS_CODEC=1
SQLITE_OMIT_WAL=1
SQLITE_DEBUG=1;SQLITE_MEMDEBUG=1;SQLITE_ENABLE_EXPENSIVE_ASSERT=1
SQLITE_WIN32_MALLOC=1
Index: SQLite.Interop/props/sqlite3.vsprops
==================================================================
--- SQLite.Interop/props/sqlite3.vsprops
+++ SQLite.Interop/props/sqlite3.vsprops
@@ -12,16 +12,16 @@
Version="8.00"
Name="sqlite3"
>
#include
#include
-#ifndef _WIN32_WCE
+#if !defined(_WIN32_WCE) || defined(HAVE_ERRNO_H)
#include /* LMH 2007-03-25 */
#else
int errno;
#define strerror(x) ""
#endif
Index: SQLite.Interop/src/core/sqlite3.c
==================================================================
--- SQLite.Interop/src/core/sqlite3.c
+++ SQLite.Interop/src/core/sqlite3.c
@@ -1,8 +1,8 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.7.15.1. By combining all the individual C code files into this
+** version 3.7.16. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
** of 5% or more are commonly seen when SQLite is compiled as a single
** translation unit.
@@ -671,13 +671,13 @@
**
** See also: [sqlite3_libversion()],
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.7.15.1"
-#define SQLITE_VERSION_NUMBER 3007015
-#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318"
+#define SQLITE_VERSION "3.7.16"
+#define SQLITE_VERSION_NUMBER 3007016
+#define SQLITE_SOURCE_ID "2013-02-15 04:21:01 843e1c543aabab8cd62f28742d5818887d36bcb7"
/*
** CAPI3REF: Run-Time Library Version Numbers
** KEYWORDS: sqlite3_version, sqlite3_sourceid
**
@@ -1048,10 +1048,19 @@
#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3<<8))
#define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8))
#define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8))
#define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8))
#define SQLITE_ABORT_ROLLBACK (SQLITE_ABORT | (2<<8))
+#define SQLITE_CONSTRAINT_CHECK (SQLITE_CONSTRAINT | (1<<8))
+#define SQLITE_CONSTRAINT_COMMITHOOK (SQLITE_CONSTRAINT | (2<<8))
+#define SQLITE_CONSTRAINT_FOREIGNKEY (SQLITE_CONSTRAINT | (3<<8))
+#define SQLITE_CONSTRAINT_FUNCTION (SQLITE_CONSTRAINT | (4<<8))
+#define SQLITE_CONSTRAINT_NOTNULL (SQLITE_CONSTRAINT | (5<<8))
+#define SQLITE_CONSTRAINT_PRIMARYKEY (SQLITE_CONSTRAINT | (6<<8))
+#define SQLITE_CONSTRAINT_TRIGGER (SQLITE_CONSTRAINT | (7<<8))
+#define SQLITE_CONSTRAINT_UNIQUE (SQLITE_CONSTRAINT | (8<<8))
+#define SQLITE_CONSTRAINT_VTAB (SQLITE_CONSTRAINT | (9<<8))
/*
** CAPI3REF: Flags For File Open Operations
**
** These bit values are intended for use in the
@@ -8238,10 +8247,15 @@
** A convenience macro that returns the number of elements in
** an array.
*/
#define ArraySize(X) ((int)(sizeof(X)/sizeof(X[0])))
+/*
+** Determine if the argument is a power of two
+*/
+#define IsPowerOfTwo(X) (((X)&((X)-1))==0)
+
/*
** The following value as a destructor means to use sqlite3DbFree().
** The sqlite3DbFree() routine requires two parameters instead of the
** one parameter that destructors normally want. So we have to introduce
** this magic value that the code knows to handle differently. Any
@@ -10013,11 +10027,11 @@
#define SQLITE_NullCallback 0x00000020 /* Invoke the callback once if the */
/* result set is empty */
#define SQLITE_SqlTrace 0x00000040 /* Debug print SQL as it executes */
#define SQLITE_VdbeListing 0x00000080 /* Debug listings of VDBE programs */
#define SQLITE_WriteSchema 0x00000100 /* OK to update SQLITE_MASTER */
- /* 0x00000200 Unused */
+#define SQLITE_VdbeAddopTrace 0x00000200 /* Trace sqlite3VdbeAddOp() calls */
#define SQLITE_IgnoreChecks 0x00000400 /* Do not enforce check constraints */
#define SQLITE_ReadUncommitted 0x0000800 /* For shared-cache mode */
#define SQLITE_LegacyFileFmt 0x00001000 /* Create new databases in format 1 */
#define SQLITE_FullFSync 0x00002000 /* Use full fsync on the backend */
#define SQLITE_CkptFullFSync 0x00004000 /* Use full fsync for checkpoint */
@@ -10042,10 +10056,11 @@
#define SQLITE_IdxRealAsInt 0x0010 /* Store REAL as INT in indices */
#define SQLITE_DistinctOpt 0x0020 /* DISTINCT using indexes */
#define SQLITE_CoverIdxScan 0x0040 /* Covering index scans */
#define SQLITE_OrderByIdxJoin 0x0080 /* ORDER BY of joins via index */
#define SQLITE_SubqCoroutine 0x0100 /* Evaluate subqueries as coroutines */
+#define SQLITE_Transitive 0x0200 /* Transitive constraints */
#define SQLITE_AllOpts 0xffff /* All optimizations */
/*
** Macros for testing whether or not optimizations are enabled or disabled.
*/
@@ -10553,24 +10568,24 @@
** and the value of Index.onError indicate the which conflict resolution
** algorithm to employ whenever an attempt is made to insert a non-unique
** element.
*/
struct Index {
- char *zName; /* Name of this index */
- int *aiColumn; /* Which columns are used by this index. 1st is 0 */
- tRowcnt *aiRowEst; /* Result of ANALYZE: Est. rows selected by each column */
- Table *pTable; /* The SQL table being indexed */
- char *zColAff; /* String defining the affinity of each column */
- Index *pNext; /* The next index associated with the same table */
- Schema *pSchema; /* Schema containing this index */
- u8 *aSortOrder; /* Array of size Index.nColumn. True==DESC, False==ASC */
- char **azColl; /* Array of collation sequence names for index */
- int nColumn; /* Number of columns in the table used by this index */
- int tnum; /* Page containing root of this index in database file */
- u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
- u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */
- u8 bUnordered; /* Use this index for == or IN queries only */
+ char *zName; /* Name of this index */
+ int *aiColumn; /* Which columns are used by this index. 1st is 0 */
+ tRowcnt *aiRowEst; /* From ANALYZE: Est. rows selected by each column */
+ Table *pTable; /* The SQL table being indexed */
+ char *zColAff; /* String defining the affinity of each column */
+ Index *pNext; /* The next index associated with the same table */
+ Schema *pSchema; /* Schema containing this index */
+ u8 *aSortOrder; /* for each column: True==DESC, False==ASC */
+ char **azColl; /* Array of collation sequence names for index */
+ int tnum; /* DB Page containing root of this index */
+ u16 nColumn; /* Number of columns in table used by this index */
+ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
+ unsigned autoIndex:2; /* 1==UNIQUE, 2==PRIMARY KEY, 0==CREATE INDEX */
+ unsigned bUnordered:1; /* Use this index for == or IN queries only */
#ifdef SQLITE_ENABLE_STAT3
int nSample; /* Number of elements in aSample[] */
tRowcnt avgEq; /* Average nEq value for key values not in aSample */
IndexSample *aSample; /* Samples of the left-most key */
#endif
@@ -10840,22 +10855,31 @@
** name. An expr/name combination can be used in several ways, such
** as the list of "expr AS ID" fields following a "SELECT" or in the
** list of "ID = expr" items in an UPDATE. A list of expressions can
** also be used as the argument to a function, in which case the a.zName
** field is not used.
+**
+** By default the Expr.zSpan field holds a human-readable description of
+** the expression that is used in the generation of error messages and
+** column labels. In this case, Expr.zSpan is typically the text of a
+** column expression as it exists in a SELECT statement. However, if
+** the bSpanIsTab flag is set, then zSpan is overloaded to mean the name
+** of the result column in the form: DATABASE.TABLE.COLUMN. This later
+** form is used for name resolution with nested FROM clauses.
*/
struct ExprList {
int nExpr; /* Number of expressions on the list */
int iECursor; /* VDBE Cursor associated with this ExprList */
struct ExprList_item { /* For each expression in the list */
- Expr *pExpr; /* The list of expressions */
- char *zName; /* Token associated with this expression */
- char *zSpan; /* Original text of the expression */
- u8 sortOrder; /* 1 for DESC or 0 for ASC */
- u8 done; /* A flag to indicate when processing is finished */
- u16 iOrderByCol; /* For ORDER BY, column number in result set */
- u16 iAlias; /* Index into Parse.aAlias[] for zName */
+ Expr *pExpr; /* The list of expressions */
+ char *zName; /* Token associated with this expression */
+ char *zSpan; /* Original text of the expression */
+ u8 sortOrder; /* 1 for DESC or 0 for ASC */
+ unsigned done :1; /* A flag to indicate when processing is finished */
+ unsigned bSpanIsTab :1; /* zSpan holds DB.TABLE.COLUMN */
+ u16 iOrderByCol; /* For ORDER BY, column number in result set */
+ u16 iAlias; /* Index into Parse.aAlias[] for zName */
} *a; /* Alloc a power of two greater or equal to nExpr */
};
/*
** An instance of this structure is used by the parser to record both
@@ -11019,10 +11043,11 @@
struct {
int nIn; /* Number of entries in aInLoop[] */
struct InLoop {
int iCur; /* The VDBE cursor used by this IN operator */
int addrInTop; /* Top of the IN loop */
+ u8 eEndLoopOp; /* IN Loop terminator. OP_Next or OP_Prev */
} *aInLoop; /* Information about each nested IN operator */
} in; /* Used when plan.wsFlags&WHERE_IN_ABLE */
Index *pCovidx; /* Possible covering index for WHERE_MULTI_OR */
} u;
double rOptCost; /* "Optimal" cost for this level */
@@ -11171,10 +11196,11 @@
#define SF_Expanded 0x0010 /* sqlite3SelectExpand() called on this */
#define SF_HasTypeInfo 0x0020 /* FROM subqueries have Table metadata */
#define SF_UseSorter 0x0040 /* Sort using a sorter */
#define SF_Values 0x0080 /* Synthesized from VALUES clause */
#define SF_Materialize 0x0100 /* Force materialization of views */
+#define SF_NestedFrom 0x0200 /* Part of a parenthesized FROM clause */
/*
** The results of a select can be distributed in several ways. The
** "SRT" prefix means "SELECT Result Type".
@@ -11883,11 +11909,11 @@
SQLITE_PRIVATE Index *sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*,
Token*, int, int);
SQLITE_PRIVATE void sqlite3DropIndex(Parse*, SrcList*, int);
SQLITE_PRIVATE int sqlite3Select(Parse*, Select*, SelectDest*);
SQLITE_PRIVATE Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
- Expr*,ExprList*,int,Expr*,Expr*);
+ Expr*,ExprList*,u16,Expr*,Expr*);
SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3*, Select*);
SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*);
SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int);
SQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);
#if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY)
@@ -11957,11 +11983,11 @@
SQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*, Table*, int, int, int*, int, int, int);
SQLITE_PRIVATE int sqlite3OpenTableAndIndices(Parse*, Table*, int, int);
SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse*, int, int);
SQLITE_PRIVATE void sqlite3MultiWrite(Parse*);
SQLITE_PRIVATE void sqlite3MayAbort(Parse*);
-SQLITE_PRIVATE void sqlite3HaltConstraint(Parse*, int, char*, int);
+SQLITE_PRIVATE void sqlite3HaltConstraint(Parse*, int, int, char*, int);
SQLITE_PRIVATE Expr *sqlite3ExprDup(sqlite3*,Expr*,int);
SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3*,ExprList*,int);
SQLITE_PRIVATE SrcList *sqlite3SrcListDup(sqlite3*,SrcList*,int);
SQLITE_PRIVATE IdList *sqlite3IdListDup(sqlite3*,IdList*);
SQLITE_PRIVATE Select *sqlite3SelectDup(sqlite3*,Select*,int);
@@ -12140,10 +12166,11 @@
SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *);
SQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...);
SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*);
SQLITE_PRIVATE int sqlite3CodeSubselect(Parse *, Expr *, int, int);
SQLITE_PRIVATE void sqlite3SelectPrep(Parse*, Select*, NameContext*);
+SQLITE_PRIVATE int sqlite3MatchSpanName(const char*, const char*, const char*, const char*);
SQLITE_PRIVATE int sqlite3ResolveExprNames(NameContext*, Expr*);
SQLITE_PRIVATE void sqlite3ResolveSelectNames(Parse*, Select*, NameContext*);
SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *, Table *, int, int);
SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *, Token *);
@@ -12278,12 +12305,14 @@
#define sqlite3FkOldmask(a,b) 0
#define sqlite3FkRequired(a,b,c,d) 0
#endif
#ifndef SQLITE_OMIT_FOREIGN_KEY
SQLITE_PRIVATE void sqlite3FkDelete(sqlite3 *, Table*);
+SQLITE_PRIVATE int sqlite3FkLocateIndex(Parse*,Table*,FKey*,Index**,int**);
#else
#define sqlite3FkDelete(a,b)
+ #define sqlite3FkLocateIndex(a,b,c,d,e)
#endif
/*
** Available fault injectors. Should be numbered beginning with 0.
@@ -13189,11 +13218,11 @@
Mem *aMem; /* Array of memory cells for parent frame */
u8 *aOnceFlag; /* Array of OP_Once flags for parent frame */
VdbeCursor **apCsr; /* Array of Vdbe cursors for parent frame */
void *token; /* Copy of SubProgram.token */
i64 lastRowid; /* Last insert rowid (sqlite3.lastRowid) */
- u16 nCursor; /* Number of entries in apCsr */
+ int nCursor; /* Number of entries in apCsr */
int pc; /* Program Counter in parent (calling) frame */
int nOp; /* Size of aOp array */
int nMem; /* Number of entries in aMem */
int nOnceFlag; /* Number of entries in aOnceFlag */
int nChildMem; /* Number of memory cells for child frame */
@@ -13375,11 +13404,11 @@
int nOp; /* Number of instructions in the program */
int nOpAlloc; /* Number of slots allocated for aOp[] */
int nLabel; /* Number of labels used */
int *aLabel; /* Space to hold the labels */
u16 nResColumn; /* Number of columns in one row of the result set */
- u16 nCursor; /* Number of slots in apCsr[] */
+ int nCursor; /* Number of slots in apCsr[] */
u32 magic; /* Magic number for sanity checking */
char *zErrMsg; /* Error message written here */
Vdbe *pPrev,*pNext; /* Linked list of VDBEs with the same Vdbe.db */
VdbeCursor **apCsr; /* One element of this array for each open cursor */
Mem *aVar; /* Values for the OP_Variable opcode. */
@@ -23286,15 +23315,11 @@
{ "pwrite64", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osPwrite64 ((ssize_t(*)(int,const void*,size_t,off_t))\
aSyscall[13].pCurrent)
-#if SQLITE_ENABLE_LOCKING_STYLE
{ "fchmod", (sqlite3_syscall_ptr)fchmod, 0 },
-#else
- { "fchmod", (sqlite3_syscall_ptr)0, 0 },
-#endif
#define osFchmod ((int(*)(int,mode_t))aSyscall[14].pCurrent)
#if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
{ "fallocate", (sqlite3_syscall_ptr)posix_fallocate, 0 },
#else
@@ -23315,13 +23340,10 @@
#define osRmdir ((int(*)(const char*))aSyscall[19].pCurrent)
{ "fchown", (sqlite3_syscall_ptr)posixFchown, 0 },
#define osFchown ((int(*)(int,uid_t,gid_t))aSyscall[20].pCurrent)
- { "umask", (sqlite3_syscall_ptr)umask, 0 },
-#define osUmask ((mode_t(*)(mode_t))aSyscall[21].pCurrent)
-
}; /* End of the overrideable system calls */
/*
** This is the xSetSystemCall() method of sqlite3_vfs for all of the
** "unix" VFSes. Return SQLITE_OK opon successfully updating the
@@ -23422,31 +23444,29 @@
** process that is able to write to the database will also be able to
** recover the hot journals.
*/
static int robust_open(const char *z, int f, mode_t m){
int fd;
- mode_t m2;
- mode_t origM = 0;
- if( m==0 ){
- m2 = SQLITE_DEFAULT_FILE_PERMISSIONS;
- }else{
- m2 = m;
- origM = osUmask(0);
- }
+ mode_t m2 = m ? m : SQLITE_DEFAULT_FILE_PERMISSIONS;
do{
#if defined(O_CLOEXEC)
fd = osOpen(z,f|O_CLOEXEC,m2);
#else
fd = osOpen(z,f,m2);
#endif
}while( fd<0 && errno==EINTR );
- if( m ){
- osUmask(origM);
- }
+ if( fd>=0 ){
+ if( m!=0 ){
+ struct stat statbuf;
+ if( osFstat(fd, &statbuf)==0 && (statbuf.st_mode&0777)!=m ){
+ osFchmod(fd, m);
+ }
+ }
#if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0)
- if( fd>=0 ) osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
+ osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC);
#endif
+ }
return fd;
}
/*
** Helper functions to obtain and relinquish the global mutex. The
@@ -29868,11 +29888,11 @@
};
unsigned int i; /* Loop counter */
/* Double-check that the aSyscall[] array has been constructed
** correctly. See ticket [bb3a86e890c8e96ab] */
- assert( ArraySize(aSyscall)==22 );
+ assert( ArraySize(aSyscall)==21 );
/* Register all VFSes defined in the aVfs[] array */
for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){
sqlite3_vfs_register(&aVfs[i], i==0);
}
@@ -31089,11 +31109,11 @@
/*
** This function outputs the specified (ANSI) string to the Win32 debugger
** (if available).
*/
-SQLITE_API void sqlite3_win32_write_debug(char *zBuf, int nBuf){
+SQLITE_API void sqlite3_win32_write_debug(const char *zBuf, int nBuf){
char zDbgBuf[SQLITE_WIN32_DBG_BUF_SIZE];
int nMin = MIN(nBuf, (SQLITE_WIN32_DBG_BUF_SIZE - 1)); /* may be negative. */
if( nMin<-1 ) nMin = -1; /* all negative values become -1. */
assert( nMin==-1 || nMin==0 || nMin */
struct tm *__cdecl localtime(const time_t *t)
{
static struct tm y;
@@ -31748,10 +31769,11 @@
y.tm_hour = pTm.wHour;
y.tm_min = pTm.wMinute;
y.tm_sec = pTm.wSecond;
return &y;
}
+#endif
#define HANDLE_TO_WINFILE(a) (winFile*)&((char*)a)[-(int)offsetof(winFile,h)]
/*
** Acquire a lock on the handle h
@@ -31769,19 +31791,21 @@
/*
** Create the mutex and shared memory used for locking in the file
** descriptor pFile
*/
-static BOOL winceCreateLock(const char *zFilename, winFile *pFile){
+static int winceCreateLock(const char *zFilename, winFile *pFile){
LPWSTR zTok;
LPWSTR zName;
+ DWORD lastErrno;
+ BOOL bLogged = FALSE;
BOOL bInit = TRUE;
zName = utf8ToUnicode(zFilename);
if( zName==0 ){
/* out of memory */
- return FALSE;
+ return SQLITE_IOERR_NOMEM;
}
/* Initialize the local lockdata */
memset(&pFile->local, 0, sizeof(pFile->local));
@@ -31794,13 +31818,14 @@
/* Create/open the named mutex */
pFile->hMutex = osCreateMutexW(NULL, FALSE, zName);
if (!pFile->hMutex){
pFile->lastErrno = osGetLastError();
- winLogError(SQLITE_ERROR, pFile->lastErrno, "winceCreateLock1", zFilename);
+ winLogError(SQLITE_IOERR, pFile->lastErrno,
+ "winceCreateLock1", zFilename);
sqlite3_free(zName);
- return FALSE;
+ return SQLITE_IOERR;
}
/* Acquire the mutex before continuing */
winceMutexAcquire(pFile->hMutex);
@@ -31813,45 +31838,53 @@
PAGE_READWRITE, 0, sizeof(winceLock),
zName);
/* Set a flag that indicates we're the first to create the memory so it
** must be zero-initialized */
- if (osGetLastError() == ERROR_ALREADY_EXISTS){
+ lastErrno = osGetLastError();
+ if (lastErrno == ERROR_ALREADY_EXISTS){
bInit = FALSE;
}
sqlite3_free(zName);
/* If we succeeded in making the shared memory handle, map it. */
- if (pFile->hShared){
+ if( pFile->hShared ){
pFile->shared = (winceLock*)osMapViewOfFile(pFile->hShared,
FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, sizeof(winceLock));
/* If mapping failed, close the shared memory handle and erase it */
- if (!pFile->shared){
+ if( !pFile->shared ){
pFile->lastErrno = osGetLastError();
- winLogError(SQLITE_ERROR, pFile->lastErrno,
- "winceCreateLock2", zFilename);
+ winLogError(SQLITE_IOERR, pFile->lastErrno,
+ "winceCreateLock2", zFilename);
+ bLogged = TRUE;
osCloseHandle(pFile->hShared);
pFile->hShared = NULL;
}
}
/* If shared memory could not be created, then close the mutex and fail */
- if (pFile->hShared == NULL){
+ if( pFile->hShared==NULL ){
+ if( !bLogged ){
+ pFile->lastErrno = lastErrno;
+ winLogError(SQLITE_IOERR, pFile->lastErrno,
+ "winceCreateLock3", zFilename);
+ bLogged = TRUE;
+ }
winceMutexRelease(pFile->hMutex);
osCloseHandle(pFile->hMutex);
pFile->hMutex = NULL;
- return FALSE;
+ return SQLITE_IOERR;
}
/* Initialize the shared memory if we're supposed to */
- if (bInit) {
+ if( bInit ){
memset(pFile->shared, 0, sizeof(winceLock));
}
winceMutexRelease(pFile->hMutex);
- return TRUE;
+ return SQLITE_OK;
}
/*
** Destroy the part of winFile that deals with wince locks
*/
@@ -32164,10 +32197,11 @@
assert( id!=0 );
#ifndef SQLITE_OMIT_WAL
assert( pFile->pShm==0 );
#endif
OSTRACE(("CLOSE %d\n", pFile->h));
+ assert( pFile->h!=NULL && pFile->h!=INVALID_HANDLE_VALUE );
do{
rc = osCloseHandle(pFile->h);
/* SimulateIOError( rc=0; cnt=MX_CLOSE_ATTEMPT; ); */
}while( rc==0 && ++cnt < MX_CLOSE_ATTEMPT && (sqlite3_win32_sleep(100), 1) );
#if SQLITE_OS_WINCE
@@ -32856,11 +32890,11 @@
a[1] = win32IoerrRetryDelay;
}
return SQLITE_OK;
}
case SQLITE_FCNTL_TEMPFILENAME: {
- char *zTFile = sqlite3_malloc( pFile->pVfs->mxPathname );
+ char *zTFile = sqlite3MallocZero( pFile->pVfs->mxPathname );
if( zTFile ){
getTempname(pFile->pVfs->mxPathname, zTFile);
*(char**)pArg = zTFile;
}
return SQLITE_OK;
@@ -33080,11 +33114,11 @@
bRc = osCloseHandle(p->aRegion[i].hMap);
OSTRACE(("SHM-PURGE pid-%d close region=%d %s\n",
(int)osGetCurrentProcessId(), i,
bRc ? "ok" : "failed"));
}
- if( p->hFile.h != INVALID_HANDLE_VALUE ){
+ if( p->hFile.h!=NULL && p->hFile.h!=INVALID_HANDLE_VALUE ){
SimulateIOErrorBenign(1);
winClose((sqlite3_file *)&p->hFile);
SimulateIOErrorBenign(0);
}
if( deleteFlag ){
@@ -33775,27 +33809,27 @@
|| eType==SQLITE_OPEN_MAIN_JOURNAL || eType==SQLITE_OPEN_TEMP_JOURNAL
|| eType==SQLITE_OPEN_SUBJOURNAL || eType==SQLITE_OPEN_MASTER_JOURNAL
|| eType==SQLITE_OPEN_TRANSIENT_DB || eType==SQLITE_OPEN_WAL
);
- assert( id!=0 );
- UNUSED_PARAMETER(pVfs);
+ assert( pFile!=0 );
+ memset(pFile, 0, sizeof(winFile));
+ pFile->h = INVALID_HANDLE_VALUE;
#if SQLITE_OS_WINRT
if( !sqlite3_temp_directory ){
sqlite3_log(SQLITE_ERROR,
"sqlite3_temp_directory variable should be set for WinRT");
}
#endif
- pFile->h = INVALID_HANDLE_VALUE;
-
/* If the second argument to this function is NULL, generate a
** temporary file name to use
*/
if( !zUtf8Name ){
assert(isDelete && !isOpenJournal);
+ memset(zTmpname, 0, MAX_PATH+2);
rc = getTempname(MAX_PATH+2, zTmpname);
if( rc!=SQLITE_OK ){
return rc;
}
zUtf8Name = zTmpname;
@@ -33928,38 +33962,34 @@
}else{
*pOutFlags = SQLITE_OPEN_READONLY;
}
}
- memset(pFile, 0, sizeof(*pFile));
- pFile->pMethod = &winIoMethod;
- pFile->h = h;
- pFile->lastErrno = NO_ERROR;
- pFile->pVfs = pVfs;
-#ifndef SQLITE_OMIT_WAL
- pFile->pShm = 0;
-#endif
- pFile->zPath = zName;
- if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){
- pFile->ctrlFlags |= WINFILE_PSOW;
- }
-
#if SQLITE_OS_WINCE
if( isReadWrite && eType==SQLITE_OPEN_MAIN_DB
- && !winceCreateLock(zName, pFile)
+ && (rc = winceCreateLock(zName, pFile))!=SQLITE_OK
){
osCloseHandle(h);
sqlite3_free(zConverted);
- return SQLITE_CANTOPEN_BKPT;
+ return rc;
}
if( isTemp ){
pFile->zDeleteOnClose = zConverted;
}else
#endif
{
sqlite3_free(zConverted);
}
+
+ pFile->pMethod = &winIoMethod;
+ pFile->pVfs = pVfs;
+ pFile->h = h;
+ if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){
+ pFile->ctrlFlags |= WINFILE_PSOW;
+ }
+ pFile->lastErrno = NO_ERROR;
+ pFile->zPath = zName;
OpenCounter(+1);
return rc;
}
@@ -56334,11 +56364,11 @@
sqlite3BtreeLeave(p);
return 0;
}
i = PENDING_BYTE_PAGE(pBt);
if( i<=sCheck.nPage ) setPageReferenced(&sCheck, i);
- sqlite3StrAccumInit(&sCheck.errMsg, zErr, sizeof(zErr), 20000);
+ sqlite3StrAccumInit(&sCheck.errMsg, zErr, sizeof(zErr), SQLITE_MAX_LENGTH);
sCheck.errMsg.useMalloc = 2;
/* Check the integrity of the freelist
*/
checkList(&sCheck, 1, get4byte(&pBt->pPage1->aData[32]),
@@ -56869,11 +56899,16 @@
/*
** Parameter zSrcData points to a buffer containing the data for
** page iSrcPg from the source database. Copy this data into the
** destination database.
*/
-static int backupOnePage(sqlite3_backup *p, Pgno iSrcPg, const u8 *zSrcData){
+static int backupOnePage(
+ sqlite3_backup *p, /* Backup handle */
+ Pgno iSrcPg, /* Source database page to backup */
+ const u8 *zSrcData, /* Source database page data */
+ int bUpdate /* True for an update, false otherwise */
+){
Pager * const pDestPager = sqlite3BtreePager(p->pDest);
const int nSrcPgsz = sqlite3BtreeGetPageSize(p->pSrc);
int nDestPgsz = sqlite3BtreeGetPageSize(p->pDest);
const int nCopy = MIN(nSrcPgsz, nDestPgsz);
const i64 iEnd = (i64)iSrcPg*(i64)nSrcPgsz;
@@ -56942,10 +56977,13 @@
** cached parse of the page). MemPage.isInit is marked
** "MUST BE FIRST" for this purpose.
*/
memcpy(zOut, zIn, nCopy);
((u8 *)sqlite3PagerGetExtra(pDestPg))[0] = 0;
+ if( iOff==0 && bUpdate==0 ){
+ sqlite3Put4byte(&zOut[28], sqlite3BtreeLastPage(p->pSrc));
+ }
}
sqlite3PagerUnref(pDestPg);
}
return rc;
@@ -57048,11 +57086,11 @@
const Pgno iSrcPg = p->iNext; /* Source page number */
if( iSrcPg!=PENDING_BYTE_PAGE(p->pSrc->pBt) ){
DbPage *pSrcPg; /* Source page object */
rc = sqlite3PagerGet(pSrcPager, iSrcPg, &pSrcPg);
if( rc==SQLITE_OK ){
- rc = backupOnePage(p, iSrcPg, sqlite3PagerGetData(pSrcPg));
+ rc = backupOnePage(p, iSrcPg, sqlite3PagerGetData(pSrcPg), 0);
sqlite3PagerUnref(pSrcPg);
}
}
p->iNext++;
}
@@ -57296,11 +57334,11 @@
** the new data into the backup.
*/
int rc;
assert( p->pDestDb );
sqlite3_mutex_enter(p->pDestDb->mutex);
- rc = backupOnePage(p, iPage, aData);
+ rc = backupOnePage(p, iPage, aData, 1);
sqlite3_mutex_leave(p->pDestDb->mutex);
assert( rc!=SQLITE_BUSY && rc!=SQLITE_LOCKED );
if( rc!=SQLITE_OK ){
p->rc = rc;
}
@@ -58564,22 +58602,10 @@
** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) Prior
** to version 2.8.7, all this code was combined into the vdbe.c source file.
** But that file was getting too big so this subroutines were split out.
*/
-
-
-/*
-** When debugging the code generator in a symbolic debugger, one can
-** set the sqlite3VdbeAddopTrace to 1 and all opcodes will be printed
-** as they are added to the instruction stream.
-*/
-#ifdef SQLITE_DEBUG
-SQLITE_PRIVATE int sqlite3VdbeAddopTrace = 0;
-#endif
-
-
/*
** Create a new virtual database engine.
*/
SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){
Vdbe *p;
@@ -58705,11 +58731,13 @@
pOp->p3 = p3;
pOp->p4.p = 0;
pOp->p4type = P4_NOTUSED;
#ifdef SQLITE_DEBUG
pOp->zComment = 0;
- if( sqlite3VdbeAddopTrace ) sqlite3VdbePrintOp(0, i, &p->aOp[i]);
+ if( p->db->flags & SQLITE_VdbeAddopTrace ){
+ sqlite3VdbePrintOp(0, i, &p->aOp[i]);
+ }
#endif
#ifdef VDBE_PROFILE
pOp->cycles = 0;
pOp->cnt = 0;
#endif
@@ -58924,11 +58952,11 @@
if( opcode==OP_Destroy || opcode==OP_VUpdate || opcode==OP_VRename
#ifndef SQLITE_OMIT_FOREIGN_KEY
|| (opcode==OP_FkCounter && pOp->p1==0 && pOp->p2==1)
#endif
|| ((opcode==OP_Halt || opcode==OP_HaltIfNull)
- && (pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort))
+ && ((pOp->p1&0xff)==SQLITE_CONSTRAINT && pOp->p2==OE_Abort))
){
hasAbort = 1;
break;
}
}
@@ -59059,11 +59087,11 @@
pOut->p4type = P4_NOTUSED;
pOut->p4.p = 0;
pOut->p5 = 0;
#ifdef SQLITE_DEBUG
pOut->zComment = 0;
- if( sqlite3VdbeAddopTrace ){
+ if( p->db->flags & SQLITE_VdbeAddopTrace ){
sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]);
}
#endif
}
p->nOp += nOp;
@@ -60085,11 +60113,11 @@
}
zCsr = p->pFree;
zEnd = &zCsr[nByte];
}while( nByte && !db->mallocFailed );
- p->nCursor = (u16)nCursor;
+ p->nCursor = nCursor;
p->nOnceFlag = nOnce;
if( p->aVar ){
p->nVar = (ynVar)nVar;
for(n=0; naVar[n].flags = MEM_Null;
@@ -60327,11 +60355,11 @@
/* If there are any write-transactions at all, invoke the commit hook */
if( needXcommit && db->xCommitCallback ){
rc = db->xCommitCallback(db->pCommitArg);
if( rc ){
- return SQLITE_CONSTRAINT;
+ return SQLITE_CONSTRAINT_COMMITHOOK;
}
}
/* The simple case - no more than one database file (not counting the
** TEMP database) has a transaction active. There is no need for the
@@ -60619,18 +60647,18 @@
** handle associated with the VM passed as an argument is about to be
** committed. If there are outstanding deferred foreign key constraint
** violations, return SQLITE_ERROR. Otherwise, SQLITE_OK.
**
** If there are outstanding FK violations and this function returns
-** SQLITE_ERROR, set the result of the VM to SQLITE_CONSTRAINT and write
-** an error message to it. Then return SQLITE_ERROR.
+** SQLITE_ERROR, set the result of the VM to SQLITE_CONSTRAINT_FOREIGNKEY
+** and write an error message to it. Then return SQLITE_ERROR.
*/
#ifndef SQLITE_OMIT_FOREIGN_KEY
SQLITE_PRIVATE int sqlite3VdbeCheckFk(Vdbe *p, int deferred){
sqlite3 *db = p->db;
if( (deferred && db->nDeferredCons>0) || (!deferred && p->nFkConstraint>0) ){
- p->rc = SQLITE_CONSTRAINT;
+ p->rc = SQLITE_CONSTRAINT_FOREIGNKEY;
p->errorAction = OE_Abort;
sqlite3SetString(&p->zErrMsg, db, "foreign key constraint failed");
return SQLITE_ERROR;
}
return SQLITE_OK;
@@ -60741,11 +60769,11 @@
if( rc!=SQLITE_OK ){
if( NEVER(p->readOnly) ){
sqlite3VdbeLeave(p);
return SQLITE_ERROR;
}
- rc = SQLITE_CONSTRAINT;
+ rc = SQLITE_CONSTRAINT_FOREIGNKEY;
}else{
/* The auto-commit flag is true, the vdbe program was successful
** or hit an 'OR FAIL' constraint and there are no deferred foreign
** key constraints to hold up the transaction. This means a commit
** is required. */
@@ -60784,11 +60812,11 @@
** current statement error code.
*/
if( eStatementOp ){
rc = sqlite3VdbeCloseStatement(p, eStatementOp);
if( rc ){
- if( p->rc==SQLITE_OK || p->rc==SQLITE_CONSTRAINT ){
+ if( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT ){
p->rc = rc;
sqlite3DbFree(db, p->zErrMsg);
p->zErrMsg = 0;
}
sqlite3RollbackAll(db, SQLITE_ABORT_ROLLBACK);
@@ -61025,11 +61053,11 @@
sqlite3DbFree(db, p->aLabel);
sqlite3DbFree(db, p->aColName);
sqlite3DbFree(db, p->zSql);
sqlite3DbFree(db, p->pFree);
#if defined(SQLITE_ENABLE_TREE_EXPLAIN)
- sqlite3_free(p->zExplain);
+ sqlite3DbFree(db, p->zExplain);
sqlite3DbFree(db, p->pExplain);
#endif
}
/*
@@ -64781,11 +64809,11 @@
rc = sqlite3VdbeHalt(p);
assert( rc==SQLITE_BUSY || rc==SQLITE_OK || rc==SQLITE_ERROR );
if( rc==SQLITE_BUSY ){
p->rc = rc = SQLITE_BUSY;
}else{
- assert( rc==SQLITE_OK || p->rc==SQLITE_CONSTRAINT );
+ assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
assert( rc==SQLITE_OK || db->nDeferredCons>0 );
rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
}
goto vdbe_return;
}
@@ -70113,11 +70141,11 @@
importVtabErrMsg(p, u.cr.pVtab);
if( rc==SQLITE_OK && pOp->p1 ){
assert( u.cr.nArg>1 && u.cr.apArg[0] && (u.cr.apArg[0]->flags&MEM_Null) );
db->lastRowid = lastRowid = u.cr.rowid;
}
- if( rc==SQLITE_CONSTRAINT && pOp->p4.pVtab->bConstraint ){
+ if( (rc&0xff)==SQLITE_CONSTRAINT && pOp->p4.pVtab->bConstraint ){
if( pOp->p5==OE_Ignore ){
rc = SQLITE_OK;
}else{
p->errorAction = ((pOp->p5==OE_Replace) ? OE_Abort : pOp->p5);
}
@@ -71890,10 +71918,18 @@
p->pReal = pReal;
if( p->iSize>0 ){
assert(p->iSize<=p->nBuf);
rc = sqlite3OsWrite(p->pReal, p->zBuf, p->iSize, 0);
}
+ if( rc!=SQLITE_OK ){
+ /* If an error occurred while writing to the file, close it before
+ ** returning. This way, SQLite uses the in-memory journal data to
+ ** roll back changes made to the internal page-cache before this
+ ** function was called. */
+ sqlite3OsClose(pReal);
+ p->pReal = 0;
+ }
}
}
return rc;
}
@@ -72636,10 +72672,39 @@
}
}
return 0;
}
+/*
+** Subqueries stores the original database, table and column names for their
+** result sets in ExprList.a[].zSpan, in the form "DATABASE.TABLE.COLUMN".
+** Check to see if the zSpan given to this routine matches the zDb, zTab,
+** and zCol. If any of zDb, zTab, and zCol are NULL then those fields will
+** match anything.
+*/
+SQLITE_PRIVATE int sqlite3MatchSpanName(
+ const char *zSpan,
+ const char *zCol,
+ const char *zTab,
+ const char *zDb
+){
+ int n;
+ for(n=0; ALWAYS(zSpan[n]) && zSpan[n]!='.'; n++){}
+ if( zDb && sqlite3StrNICmp(zSpan, zDb, n)!=0 ){
+ return 0;
+ }
+ zSpan += n+1;
+ for(n=0; ALWAYS(zSpan[n]) && zSpan[n]!='.'; n++){}
+ if( zTab && sqlite3StrNICmp(zSpan, zTab, n)!=0 ){
+ return 0;
+ }
+ zSpan += n+1;
+ if( zCol && sqlite3StrICmp(zSpan, zCol)!=0 ){
+ return 0;
+ }
+ return 1;
+}
/*
** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
** that name in the set of source tables in pSrcList and make the pExpr
** expression node refer back to that source column. The following changes
@@ -72691,44 +72756,63 @@
/* Initialize the node to no-match */
pExpr->iTable = -1;
pExpr->pTab = 0;
ExprSetIrreducible(pExpr);
+
+ /* Translate the schema name in zDb into a pointer to the corresponding
+ ** schema. If not found, pSchema will remain NULL and nothing will match
+ ** resulting in an appropriate error message toward the end of this routine
+ */
+ if( zDb ){
+ for(i=0; inDb; i++){
+ assert( db->aDb[i].zName );
+ if( sqlite3StrICmp(db->aDb[i].zName,zDb)==0 ){
+ pSchema = db->aDb[i].pSchema;
+ break;
+ }
+ }
+ }
/* Start at the inner-most context and move outward until a match is found */
while( pNC && cnt==0 ){
ExprList *pEList;
SrcList *pSrcList = pNC->pSrcList;
if( pSrcList ){
for(i=0, pItem=pSrcList->a; inSrc; i++, pItem++){
Table *pTab;
- int iDb;
Column *pCol;
pTab = pItem->pTab;
assert( pTab!=0 && pTab->zName!=0 );
- iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
assert( pTab->nCol>0 );
+ if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
+ int hit = 0;
+ pEList = pItem->pSelect->pEList;
+ for(j=0; jnExpr; j++){
+ if( sqlite3MatchSpanName(pEList->a[j].zSpan, zCol, zTab, zDb) ){
+ cnt++;
+ cntTab = 2;
+ pMatch = pItem;
+ pExpr->iColumn = j;
+ hit = 1;
+ }
+ }
+ if( hit || zTab==0 ) continue;
+ }
+ if( zDb && pTab->pSchema!=pSchema ){
+ continue;
+ }
if( zTab ){
- if( pItem->zAlias ){
- char *zTabName = pItem->zAlias;
- if( sqlite3StrICmp(zTabName, zTab)!=0 ) continue;
- }else{
- char *zTabName = pTab->zName;
- if( NEVER(zTabName==0) || sqlite3StrICmp(zTabName, zTab)!=0 ){
- continue;
- }
- if( zDb!=0 && sqlite3StrICmp(db->aDb[iDb].zName, zDb)!=0 ){
- continue;
- }
+ const char *zTabName = pItem->zAlias ? pItem->zAlias : pTab->zName;
+ assert( zTabName!=0 );
+ if( sqlite3StrICmp(zTabName, zTab)!=0 ){
+ continue;
}
}
if( 0==(cntTab++) ){
- pExpr->iTable = pItem->iCursor;
- pExpr->pTab = pTab;
- pSchema = pTab->pSchema;
pMatch = pItem;
}
for(j=0, pCol=pTab->aCol; jnCol; j++, pCol++){
if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
/* If there has been exactly one prior match and this match
@@ -72738,21 +72822,23 @@
if( cnt==1 ){
if( pItem->jointype & JT_NATURAL ) continue;
if( nameInUsingClause(pItem->pUsing, zCol) ) continue;
}
cnt++;
- pExpr->iTable = pItem->iCursor;
- pExpr->pTab = pTab;
pMatch = pItem;
- pSchema = pTab->pSchema;
/* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */
pExpr->iColumn = j==pTab->iPKey ? -1 : (i16)j;
break;
}
}
}
- }
+ if( pMatch ){
+ pExpr->iTable = pMatch->iCursor;
+ pExpr->pTab = pMatch->pTab;
+ pSchema = pExpr->pTab->pSchema;
+ }
+ } /* if( pSrcList ) */
#ifndef SQLITE_OMIT_TRIGGER
/* If we have not already resolved the name, then maybe
** it is a new.* or old.* trigger argument reference
*/
@@ -73083,11 +73169,11 @@
#endif
if( is_agg && (pNC->ncFlags & NC_AllowAgg)==0 ){
sqlite3ErrorMsg(pParse, "misuse of aggregate function %.*s()", nId,zId);
pNC->nErr++;
is_agg = 0;
- }else if( no_such_func ){
+ }else if( no_such_func && pParse->db->init.busy==0 ){
sqlite3ErrorMsg(pParse, "no such function: %.*s", nId, zId);
pNC->nErr++;
}else if( wrong_num_args ){
sqlite3ErrorMsg(pParse,"wrong number of arguments to function %.*s()",
nId, zId);
@@ -73519,27 +73605,10 @@
if( sqlite3ResolveExprNames(&sNC, p->pLimit) ||
sqlite3ResolveExprNames(&sNC, p->pOffset) ){
return WRC_Abort;
}
- /* Set up the local name-context to pass to sqlite3ResolveExprNames() to
- ** resolve the result-set expression list.
- */
- sNC.ncFlags = NC_AllowAgg;
- sNC.pSrcList = p->pSrc;
- sNC.pNext = pOuterNC;
-
- /* Resolve names in the result set. */
- pEList = p->pEList;
- assert( pEList!=0 );
- for(i=0; inExpr; i++){
- Expr *pX = pEList->a[i].pExpr;
- if( sqlite3ResolveExprNames(&sNC, pX) ){
- return WRC_Abort;
- }
- }
-
/* Recursively resolve names in all subqueries
*/
for(i=0; ipSrc->nSrc; i++){
struct SrcList_item *pItem = &p->pSrc->a[i];
if( pItem->pSelect ){
@@ -73562,10 +73631,27 @@
for(pNC=pOuterNC; pNC; pNC=pNC->pNext) nRef -= pNC->nRef;
assert( pItem->isCorrelated==0 && nRef<=0 );
pItem->isCorrelated = (nRef!=0);
}
}
+
+ /* Set up the local name-context to pass to sqlite3ResolveExprNames() to
+ ** resolve the result-set expression list.
+ */
+ sNC.ncFlags = NC_AllowAgg;
+ sNC.pSrcList = p->pSrc;
+ sNC.pNext = pOuterNC;
+
+ /* Resolve names in the result set. */
+ pEList = p->pEList;
+ assert( pEList!=0 );
+ for(i=0; inExpr; i++){
+ Expr *pX = pEList->a[i].pExpr;
+ if( sqlite3ResolveExprNames(&sNC, pX) ){
+ return WRC_Abort;
+ }
+ }
/* If there are no aggregate functions in the result-set, and no GROUP BY
** expression, do not allow aggregates in any of the other expressions.
*/
assert( (p->selFlags & SF_Aggregate)==0 );
@@ -76700,11 +76786,12 @@
assert( !ExprHasProperty(pExpr, EP_IntValue) );
if( pExpr->affinity==OE_Ignore ){
sqlite3VdbeAddOp4(
v, OP_Halt, SQLITE_OK, OE_Ignore, 0, pExpr->u.zToken,0);
}else{
- sqlite3HaltConstraint(pParse, pExpr->affinity, pExpr->u.zToken, 0);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_TRIGGER,
+ pExpr->affinity, pExpr->u.zToken, 0);
}
break;
}
#endif
@@ -77046,10 +77133,16 @@
for(i=0; inExpr; i++){
sqlite3ExplainPrintf(pOut, "item[%d] = ", i);
sqlite3ExplainPush(pOut);
sqlite3ExplainExpr(pOut, pList->a[i].pExpr);
sqlite3ExplainPop(pOut);
+ if( pList->a[i].zName ){
+ sqlite3ExplainPrintf(pOut, " AS %s", pList->a[i].zName);
+ }
+ if( pList->a[i].bSpanIsTab ){
+ sqlite3ExplainPrintf(pOut, " (%s)", pList->a[i].zSpan);
+ }
if( inExpr-1 ){
sqlite3ExplainNL(pOut);
}
}
sqlite3ExplainPop(pOut);
@@ -83165,12 +83258,12 @@
if( pIndex->onError!=OE_None ){
int j2 = sqlite3VdbeCurrentAddr(v) + 3;
sqlite3VdbeAddOp2(v, OP_Goto, 0, j2);
addr2 = sqlite3VdbeCurrentAddr(v);
sqlite3VdbeAddOp3(v, OP_SorterCompare, iSorter, j2, regRecord);
- sqlite3HaltConstraint(
- pParse, OE_Abort, "indexed columns are not unique", P4_STATIC
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_UNIQUE,
+ OE_Abort, "indexed columns are not unique", P4_STATIC
);
}else{
addr2 = sqlite3VdbeCurrentAddr(v);
}
sqlite3VdbeAddOp2(v, OP_SorterData, iSorter, regRecord);
@@ -83192,12 +83285,12 @@
** opcode use the values stored within seems dangerous. However, since
** we can be sure that no other temp registers have been allocated
** since sqlite3ReleaseTempRange() was called, it is safe to do so.
*/
sqlite3VdbeAddOp4(v, OP_IsUnique, iIdx, j2, regRowid, pRegKey, P4_INT32);
- sqlite3HaltConstraint(
- pParse, OE_Abort, "indexed columns are not unique", P4_STATIC);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_UNIQUE,
+ "indexed columns are not unique", P4_STATIC);
}
sqlite3VdbeAddOp3(v, OP_IdxInsert, iIdx, regRecord, 0);
sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
#endif
sqlite3ReleaseTempReg(pParse, regRecord);
@@ -84410,16 +84503,23 @@
/*
** Code an OP_Halt that causes the vdbe to return an SQLITE_CONSTRAINT
** error. The onError parameter determines which (if any) of the statement
** and/or current transaction is rolled back.
*/
-SQLITE_PRIVATE void sqlite3HaltConstraint(Parse *pParse, int onError, char *p4, int p4type){
+SQLITE_PRIVATE void sqlite3HaltConstraint(
+ Parse *pParse, /* Parsing context */
+ int errCode, /* extended error code */
+ int onError, /* Constraint type */
+ char *p4, /* Error message */
+ int p4type /* P4_STATIC or P4_TRANSIENT */
+){
Vdbe *v = sqlite3GetVdbe(pParse);
+ assert( (errCode&0xff)==SQLITE_CONSTRAINT );
if( onError==OE_Abort ){
sqlite3MayAbort(pParse);
}
- sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, onError, 0, p4, p4type);
+ sqlite3VdbeAddOp4(v, OP_Halt, errCode, onError, 0, p4, p4type);
}
/*
** Check to see if pIndex uses the collating sequence pColl. Return
** true if it does and false if it does not.
@@ -87402,12 +87502,13 @@
/*
** Deferred and Immediate FKs
** --------------------------
**
** Foreign keys in SQLite come in two flavours: deferred and immediate.
-** If an immediate foreign key constraint is violated, SQLITE_CONSTRAINT
-** is returned and the current statement transaction rolled back. If a
+** If an immediate foreign key constraint is violated,
+** SQLITE_CONSTRAINT_FOREIGNKEY is returned and the current
+** statement transaction rolled back. If a
** deferred foreign key constraint is violated, no action is taken
** immediately. However if the application attempts to commit the
** transaction before fixing the constraint violation, the attempt fails.
**
** Deferred constraints are implemented using a simple counter associated
@@ -87467,11 +87568,12 @@
** row is inserted.
**
** Immediate constraints are usually handled similarly. The only difference
** is that the counter used is stored as part of each individual statement
** object (struct Vdbe). If, after the statement has run, its immediate
-** constraint counter is greater than zero, it returns SQLITE_CONSTRAINT
+** constraint counter is greater than zero,
+** it returns SQLITE_CONSTRAINT_FOREIGNKEY
** and the statement transaction is rolled back. An exception is an INSERT
** statement that inserts a single row only (no triggers). In this case,
** instead of using a counter, an exception is thrown immediately if the
** INSERT violates a foreign key constraint. This is necessary as such
** an INSERT does not open a statement transaction.
@@ -87523,11 +87625,11 @@
/*
** A foreign key constraint requires that the key columns in the parent
** table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
** Given that pParent is the parent table for foreign key constraint pFKey,
-** search the schema a unique index on the parent key columns.
+** search the schema for a unique index on the parent key columns.
**
** If successful, zero is returned. If the parent key is an INTEGER PRIMARY
** KEY column, then output variable *ppIdx is set to NULL. Otherwise, *ppIdx
** is set to point to the unique index.
**
@@ -87559,11 +87661,11 @@
**
** then non-zero is returned, and a "foreign key mismatch" error loaded
** into pParse. If an OOM error occurs, non-zero is returned and the
** pParse->db->mallocFailed flag is set.
*/
-static int locateFkeyIndex(
+SQLITE_PRIVATE int sqlite3FkLocateIndex(
Parse *pParse, /* Parse context to store any error in */
Table *pParent, /* Parent table of FK constraint pFKey */
FKey *pFKey, /* Foreign key to find index for */
Index **ppIdx, /* OUT: Unique index on parent table */
int **paiCol /* OUT: Map of index columns in pFKey */
@@ -87656,11 +87758,13 @@
}
}
if( !pIdx ){
if( !pParse->disableTriggers ){
- sqlite3ErrorMsg(pParse, "foreign key mismatch");
+ sqlite3ErrorMsg(pParse,
+ "foreign key mismatch - \"%w\" referencing \"%w\"",
+ pFKey->pFrom->zName, pFKey->zTo);
}
sqlite3DbFree(pParse->db, aiCol);
return 1;
}
@@ -87805,12 +87909,12 @@
/* Special case: If this is an INSERT statement that will insert exactly
** one row into the table, raise a constraint immediately instead of
** incrementing a counter. This is necessary as the VM code is being
** generated for will not open a statement transaction. */
assert( nIncr==1 );
- sqlite3HaltConstraint(
- pParse, OE_Abort, "foreign key constraint failed", P4_STATIC
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_FOREIGNKEY,
+ OE_Abort, "foreign key constraint failed", P4_STATIC
);
}else{
if( nIncr>0 && pFKey->isDeferred==0 ){
sqlite3ParseToplevel(pParse)->mayAbort = 1;
}
@@ -88046,12 +88150,12 @@
/* If the DELETE has generated immediate foreign key constraint
** violations, halt the VDBE and return an error at this point, before
** any modifications to the schema are made. This is because statement
** transactions are not able to rollback schema changes. */
sqlite3VdbeAddOp2(v, OP_FkIfZero, 0, sqlite3VdbeCurrentAddr(v)+2);
- sqlite3HaltConstraint(
- pParse, OE_Abort, "foreign key constraint failed", P4_STATIC
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_FOREIGNKEY,
+ OE_Abort, "foreign key constraint failed", P4_STATIC
);
if( iSkip ){
sqlite3VdbeResolveLabel(v, iSkip);
}
@@ -88117,11 +88221,11 @@
if( pParse->disableTriggers ){
pTo = sqlite3FindTable(db, pFKey->zTo, zDb);
}else{
pTo = sqlite3LocateTable(pParse, 0, pFKey->zTo, zDb);
}
- if( !pTo || locateFkeyIndex(pParse, pTo, pFKey, &pIdx, &aiFree) ){
+ if( !pTo || sqlite3FkLocateIndex(pParse, pTo, pFKey, &pIdx, &aiFree) ){
assert( isIgnoreErrors==0 || (regOld!=0 && regNew==0) );
if( !isIgnoreErrors || db->mallocFailed ) return;
if( pTo==0 ){
/* If isIgnoreErrors is true, then a table is being dropped. In this
** case SQLite runs a "DELETE FROM xxx" on the table being dropped
@@ -88197,11 +88301,11 @@
/* Inserting a single row into a parent table cannot cause an immediate
** foreign key violation. So do nothing in this case. */
continue;
}
- if( locateFkeyIndex(pParse, pTab, pFKey, &pIdx, &aiCol) ){
+ if( sqlite3FkLocateIndex(pParse, pTab, pFKey, &pIdx, &aiCol) ){
if( !isIgnoreErrors || db->mallocFailed ) return;
continue;
}
assert( aiCol || pFKey->nCol==1 );
@@ -88252,11 +88356,11 @@
for(p=pTab->pFKey; p; p=p->pNextFrom){
for(i=0; inCol; i++) mask |= COLUMN_MASK(p->aCol[i].iFrom);
}
for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
Index *pIdx = 0;
- locateFkeyIndex(pParse, pTab, p, &pIdx, 0);
+ sqlite3FkLocateIndex(pParse, pTab, p, &pIdx, 0);
if( pIdx ){
for(i=0; inColumn; i++) mask |= COLUMN_MASK(pIdx->aiColumn[i]);
}
}
}
@@ -88378,11 +88482,11 @@
ExprList *pList = 0; /* Changes list if ON UPDATE CASCADE */
Select *pSelect = 0; /* If RESTRICT, "SELECT RAISE(...)" */
int i; /* Iterator variable */
Expr *pWhen = 0; /* WHEN clause for the trigger */
- if( locateFkeyIndex(pParse, pTab, pFKey, &pIdx, &aiCol) ) return 0;
+ if( sqlite3FkLocateIndex(pParse, pTab, pFKey, &pIdx, &aiCol) ) return 0;
assert( aiCol || pFKey->nCol==1 );
for(i=0; inCol; i++){
Token tOld = { "old", 3 }; /* Literal "old" token */
Token tNew = { "new", 3 }; /* Literal "new" token */
@@ -89851,11 +89955,11 @@
sqlite3MayAbort(pParse);
case OE_Rollback:
case OE_Fail: {
char *zMsg;
sqlite3VdbeAddOp3(v, OP_HaltIfNull,
- SQLITE_CONSTRAINT, onError, regData+i);
+ SQLITE_CONSTRAINT_NOTNULL, onError, regData+i);
zMsg = sqlite3MPrintf(db, "%s.%s may not be NULL",
pTab->zName, pTab->aCol[i].zName);
sqlite3VdbeChangeP4(v, -1, zMsg, P4_DYNAMIC);
break;
}
@@ -89891,11 +89995,12 @@
if( zConsName ){
zConsName = sqlite3MPrintf(db, "constraint %s failed", zConsName);
}else{
zConsName = 0;
}
- sqlite3HaltConstraint(pParse, onError, zConsName, P4_DYNAMIC);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_CHECK,
+ onError, zConsName, P4_DYNAMIC);
}
sqlite3VdbeResolveLabel(v, allOk);
}
}
#endif /* !defined(SQLITE_OMIT_CHECK) */
@@ -89922,12 +90027,12 @@
/* Fall thru into the next case */
}
case OE_Rollback:
case OE_Abort:
case OE_Fail: {
- sqlite3HaltConstraint(
- pParse, onError, "PRIMARY KEY must be unique", P4_STATIC);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_PRIMARYKEY,
+ onError, "PRIMARY KEY must be unique", P4_STATIC);
break;
}
case OE_Replace: {
/* If there are DELETE triggers on this table and the
** recursive-triggers flag is set, call GenerateRowDelete() to
@@ -90050,11 +90155,12 @@
sqlite3StrAccumAppend(&errMsg, zCol, -1);
}
sqlite3StrAccumAppend(&errMsg,
pIdx->nColumn>1 ? " are not unique" : " is not unique", -1);
zErr = sqlite3StrAccumFinish(&errMsg);
- sqlite3HaltConstraint(pParse, onError, zErr, 0);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_UNIQUE,
+ onError, zErr, 0);
sqlite3DbFree(errMsg.db, zErr);
break;
}
case OE_Ignore: {
assert( seenReplace==0 );
@@ -90458,12 +90564,12 @@
regData = sqlite3GetTempReg(pParse);
regRowid = sqlite3GetTempReg(pParse);
if( pDest->iPKey>=0 ){
addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
- sqlite3HaltConstraint(
- pParse, onError, "PRIMARY KEY must be unique", P4_STATIC);
+ sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_PRIMARYKEY,
+ onError, "PRIMARY KEY must be unique", P4_STATIC);
sqlite3VdbeJumpHere(v, addr2);
autoIncStep(pParse, regAutoinc, regRowid);
}else if( pDest->pIndex==0 ){
addr1 = sqlite3VdbeAddOp2(v, OP_NewRowid, iDest, regRowid);
}else{
@@ -90916,10 +91022,24 @@
int (*wal_checkpoint)(sqlite3*,const char*);
void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
int (*vtab_config)(sqlite3*,int op,...);
int (*vtab_on_conflict)(sqlite3*);
+ /* Version 3.7.16 and later */
+ int (*close_v2)(sqlite3*);
+ const char *(*db_filename)(sqlite3*,const char*);
+ int (*db_readonly)(sqlite3*,const char*);
+ int (*db_release_memory)(sqlite3*);
+ const char *(*errstr)(int);
+ int (*stmt_busy)(sqlite3_stmt*);
+ int (*stmt_readonly)(sqlite3_stmt*);
+ int (*stricmp)(const char*,const char*);
+ int (*uri_boolean)(const char*,const char*,int);
+ sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
+ const char *(*uri_parameter)(const char*,const char*);
+ char *(*vsnprintf)(int,char*,const char*,va_list);
+ int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
};
/*
** The following macros redefine the API routines so that they are
** redirected throught the global sqlite3_api structure.
@@ -91119,10 +91239,24 @@
#define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint
#define sqlite3_wal_hook sqlite3_api->wal_hook
#define sqlite3_blob_reopen sqlite3_api->blob_reopen
#define sqlite3_vtab_config sqlite3_api->vtab_config
#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict
+/* Version 3.7.16 and later */
+#define sqlite3_close_v2 sqlite3_api->close_v2
+#define sqlite3_db_filename sqlite3_api->db_filename
+#define sqlite3_db_readonly sqlite3_api->db_readonly
+#define sqlite3_db_release_memory sqlite3_api->db_release_memory
+#define sqlite3_errstr sqlite3_api->errstr
+#define sqlite3_stmt_busy sqlite3_api->stmt_busy
+#define sqlite3_stmt_readonly sqlite3_api->stmt_readonly
+#define sqlite3_stricmp sqlite3_api->stricmp
+#define sqlite3_uri_boolean sqlite3_api->uri_boolean
+#define sqlite3_uri_int64 sqlite3_api->uri_int64
+#define sqlite3_uri_parameter sqlite3_api->uri_parameter
+#define sqlite3_uri_vsnprintf sqlite3_api->vsnprintf
+#define sqlite3_wal_checkpoint_v2 sqlite3_api->wal_checkpoint_v2
#endif /* SQLITE_CORE */
#define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0;
#define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v;
@@ -91954,10 +92088,13 @@
#endif
#ifdef SQLITE_DEBUG
{ "sql_trace", SQLITE_SqlTrace },
{ "vdbe_listing", SQLITE_VdbeListing },
{ "vdbe_trace", SQLITE_VdbeTrace },
+ { "vdbe_addoptrace", SQLITE_VdbeAddopTrace},
+ { "vdbe_debug", SQLITE_SqlTrace | SQLITE_VdbeListing
+ | SQLITE_VdbeTrace },
#endif
#ifndef SQLITE_OMIT_CHECK
{ "ignore_check_constraints", SQLITE_IgnoreChecks },
#endif
/* The following is VERY experimental */
@@ -92718,15 +92855,18 @@
if( sqlite3StrICmp(zLeft, "table_info")==0 && zRight ){
Table *pTab;
if( sqlite3ReadSchema(pParse) ) goto pragma_out;
pTab = sqlite3FindTable(db, zRight, zDb);
if( pTab ){
- int i;
+ int i, k;
int nHidden = 0;
Column *pCol;
+ Index *pPk;
+ for(pPk=pTab->pIndex; pPk && pPk->autoIndex!=2; pPk=pPk->pNext){}
sqlite3VdbeSetNumCols(v, 6);
pParse->nMem = 6;
+ sqlite3CodeVerifySchema(pParse, iDb);
sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "cid", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "type", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "notnull", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "dflt_value", SQLITE_STATIC);
@@ -92745,12 +92885,18 @@
if( pCol->zDflt ){
sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, (char*)pCol->zDflt, 0);
}else{
sqlite3VdbeAddOp2(v, OP_Null, 0, 5);
}
- sqlite3VdbeAddOp2(v, OP_Integer,
- (pCol->colFlags&COLFLAG_PRIMKEY)!=0, 6);
+ if( (pCol->colFlags & COLFLAG_PRIMKEY)==0 ){
+ k = 0;
+ }else if( pPk==0 ){
+ k = 1;
+ }else{
+ for(k=1; ALWAYS(k<=pTab->nCol) && pPk->aiColumn[k-1]!=i; k++){}
+ }
+ sqlite3VdbeAddOp2(v, OP_Integer, k, 6);
sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 6);
}
}
}else
@@ -92762,10 +92908,11 @@
if( pIdx ){
int i;
pTab = pIdx->pTable;
sqlite3VdbeSetNumCols(v, 3);
pParse->nMem = 3;
+ sqlite3CodeVerifySchema(pParse, iDb);
sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", SQLITE_STATIC);
for(i=0; inColumn; i++){
int cnum = pIdx->aiColumn[i];
@@ -92788,10 +92935,11 @@
pIdx = pTab->pIndex;
if( pIdx ){
int i = 0;
sqlite3VdbeSetNumCols(v, 3);
pParse->nMem = 3;
+ sqlite3CodeVerifySchema(pParse, iDb);
sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "unique", SQLITE_STATIC);
while(pIdx){
sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
@@ -92851,10 +92999,11 @@
pFK = pTab->pFKey;
if( pFK ){
int i = 0;
sqlite3VdbeSetNumCols(v, 8);
pParse->nMem = 8;
+ sqlite3CodeVerifySchema(pParse, iDb);
sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "id", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "seq", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "table", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "from", SQLITE_STATIC);
sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "to", SQLITE_STATIC);
@@ -92881,10 +93030,124 @@
++i;
pFK = pFK->pNextFrom;
}
}
}
+ }else
+#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
+
+#ifndef SQLITE_OMIT_FOREIGN_KEY
+ if( sqlite3StrICmp(zLeft, "foreign_key_check")==0 ){
+ FKey *pFK; /* A foreign key constraint */
+ Table *pTab; /* Child table contain "REFERENCES" keyword */
+ Table *pParent; /* Parent table that child points to */
+ Index *pIdx; /* Index in the parent table */
+ int i; /* Loop counter: Foreign key number for pTab */
+ int j; /* Loop counter: Field of the foreign key */
+ HashElem *k; /* Loop counter: Next table in schema */
+ int x; /* result variable */
+ int regResult; /* 3 registers to hold a result row */
+ int regKey; /* Register to hold key for checking the FK */
+ int regRow; /* Registers to hold a row from pTab */
+ int addrTop; /* Top of a loop checking foreign keys */
+ int addrOk; /* Jump here if the key is OK */
+ int *aiCols; /* child to parent column mapping */
+
+ if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+ regResult = pParse->nMem+1;
+ pParse->nMem += 4;
+ regKey = ++pParse->nMem;
+ regRow = ++pParse->nMem;
+ v = sqlite3GetVdbe(pParse);
+ sqlite3VdbeSetNumCols(v, 4);
+ sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "table", SQLITE_STATIC);
+ sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "rowid", SQLITE_STATIC);
+ sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "parent", SQLITE_STATIC);
+ sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "fkid", SQLITE_STATIC);
+ sqlite3CodeVerifySchema(pParse, iDb);
+ k = sqliteHashFirst(&db->aDb[iDb].pSchema->tblHash);
+ while( k ){
+ if( zRight ){
+ pTab = sqlite3LocateTable(pParse, 0, zRight, zDb);
+ k = 0;
+ }else{
+ pTab = (Table*)sqliteHashData(k);
+ k = sqliteHashNext(k);
+ }
+ if( pTab==0 || pTab->pFKey==0 ) continue;
+ sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
+ if( pTab->nCol+regRow>pParse->nMem ) pParse->nMem = pTab->nCol + regRow;
+ sqlite3OpenTable(pParse, 0, iDb, pTab, OP_OpenRead);
+ sqlite3VdbeAddOp4(v, OP_String8, 0, regResult, 0, pTab->zName,
+ P4_TRANSIENT);
+ for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
+ pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
+ if( pParent==0 ) break;
+ pIdx = 0;
+ sqlite3TableLock(pParse, iDb, pParent->tnum, 0, pParent->zName);
+ x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, 0);
+ if( x==0 ){
+ if( pIdx==0 ){
+ sqlite3OpenTable(pParse, i, iDb, pParent, OP_OpenRead);
+ }else{
+ KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
+ sqlite3VdbeAddOp3(v, OP_OpenRead, i, pIdx->tnum, iDb);
+ sqlite3VdbeChangeP4(v, -1, (char*)pKey, P4_KEYINFO_HANDOFF);
+ }
+ }else{
+ k = 0;
+ break;
+ }
+ }
+ if( pFK ) break;
+ if( pParse->nTabnTab = i;
+ addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, 0);
+ for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
+ pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
+ assert( pParent!=0 );
+ pIdx = 0;
+ aiCols = 0;
+ x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
+ assert( x==0 );
+ addrOk = sqlite3VdbeMakeLabel(v);
+ if( pIdx==0 ){
+ int iKey = pFK->aCol[0].iFrom;
+ assert( iKey>=0 && iKeynCol );
+ if( iKey!=pTab->iPKey ){
+ sqlite3VdbeAddOp3(v, OP_Column, 0, iKey, regRow);
+ sqlite3ColumnDefault(v, pTab, iKey, regRow);
+ sqlite3VdbeAddOp2(v, OP_IsNull, regRow, addrOk);
+ sqlite3VdbeAddOp2(v, OP_MustBeInt, regRow,
+ sqlite3VdbeCurrentAddr(v)+3);
+ }else{
+ sqlite3VdbeAddOp2(v, OP_Rowid, 0, regRow);
+ }
+ sqlite3VdbeAddOp3(v, OP_NotExists, i, 0, regRow);
+ sqlite3VdbeAddOp2(v, OP_Goto, 0, addrOk);
+ sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2);
+ }else{
+ for(j=0; jnCol; j++){
+ sqlite3ExprCodeGetColumnOfTable(v, pTab, 0,
+ aiCols ? aiCols[j] : pFK->aCol[0].iFrom, regRow+j);
+ sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk);
+ }
+ sqlite3VdbeAddOp3(v, OP_MakeRecord, regRow, pFK->nCol, regKey);
+ sqlite3VdbeChangeP4(v, -1,
+ sqlite3IndexAffinityStr(v,pIdx), P4_TRANSIENT);
+ sqlite3VdbeAddOp4Int(v, OP_Found, i, addrOk, regKey, 0);
+ }
+ sqlite3VdbeAddOp2(v, OP_Rowid, 0, regResult+1);
+ sqlite3VdbeAddOp4(v, OP_String8, 0, regResult+2, 0,
+ pFK->zTo, P4_TRANSIENT);
+ sqlite3VdbeAddOp2(v, OP_Integer, i-1, regResult+3);
+ sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, 4);
+ sqlite3VdbeResolveLabel(v, addrOk);
+ sqlite3DbFree(db, aiCols);
+ }
+ sqlite3VdbeAddOp2(v, OP_Next, 0, addrTop+1);
+ sqlite3VdbeJumpHere(v, addrTop);
+ }
}else
#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
#ifndef NDEBUG
if( sqlite3StrICmp(zLeft, "parser_trace")==0 ){
@@ -93381,11 +93644,11 @@
sqlite3_rekey(db, zKey, i/2);
}
}else
#endif
#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
- if( sqlite3StrICmp(zLeft, "activate_extensions")==0 ){
+ if( sqlite3StrICmp(zLeft, "activate_extensions")==0 && zRight ){
#ifdef SQLITE_HAS_CODEC
if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
sqlite3_activate_see(&zRight[4]);
}
#endif
@@ -94340,11 +94603,11 @@
SrcList *pSrc, /* the FROM clause -- which tables to scan */
Expr *pWhere, /* the WHERE clause */
ExprList *pGroupBy, /* the GROUP BY clause */
Expr *pHaving, /* the HAVING clause */
ExprList *pOrderBy, /* the ORDER BY clause */
- int isDistinct, /* true if the DISTINCT keyword is present */
+ u16 selFlags, /* Flag parameters, such as SF_Distinct */
Expr *pLimit, /* LIMIT value. NULL means not used */
Expr *pOffset /* OFFSET value. NULL means no offset */
){
Select *pNew;
Select standin;
@@ -94364,11 +94627,11 @@
pNew->pSrc = pSrc;
pNew->pWhere = pWhere;
pNew->pGroupBy = pGroupBy;
pNew->pHaving = pHaving;
pNew->pOrderBy = pOrderBy;
- pNew->selFlags = isDistinct ? SF_Distinct : 0;
+ pNew->selFlags = selFlags;
pNew->op = TK_SELECT;
pNew->pLimit = pLimit;
pNew->pOffset = pOffset;
assert( pOffset==0 || pLimit!=0 );
pNew->addrOpenEphm[0] = -1;
@@ -95621,12 +95884,10 @@
for(i=0, pCol=aCol; ia[i].pExpr);
- assert( p->pRight==0 || ExprHasProperty(p->pRight, EP_IntValue)
- || p->pRight->u.zToken==0 || p->pRight->u.zToken[0]!=0 );
if( (zName = pEList->a[i].zName)!=0 ){
/* If the column contains an "AS " phrase, use as the name */
zName = sqlite3DbStrDup(db, zName);
}else{
Expr *pColExpr = p; /* The expression that is the result column name */
@@ -95660,10 +95921,13 @@
*/
nName = sqlite3Strlen30(zName);
for(j=cnt=0; j1 && sqlite3Isdigit(zName[k]); k--){}
+ if( zName[k]==':' ) nName = k;
zName[nName] = 0;
zNewName = sqlite3MPrintf(db, "%s:%d", zName, ++cnt);
sqlite3DbFree(db, zName);
zName = zNewName;
j = -1;
@@ -95991,10 +96255,12 @@
switch( p->op ){
case TK_ALL: {
int addr = 0;
int nLimit;
assert( !pPrior->pLimit );
+ pPrior->iLimit = p->iLimit;
+ pPrior->iOffset = p->iOffset;
pPrior->pLimit = p->pLimit;
pPrior->pOffset = p->pOffset;
explainSetInteger(iSub1, pParse->iNextSelectId);
rc = sqlite3Select(pParse, pPrior, &dest);
p->pLimit = 0;
@@ -97247,16 +97513,19 @@
*/
for(pSub=pSub->pPrior; pSub; pSub=pSub->pPrior){
Select *pNew;
ExprList *pOrderBy = p->pOrderBy;
Expr *pLimit = p->pLimit;
+ Expr *pOffset = p->pOffset;
Select *pPrior = p->pPrior;
p->pOrderBy = 0;
p->pSrc = 0;
p->pPrior = 0;
p->pLimit = 0;
+ p->pOffset = 0;
pNew = sqlite3SelectDup(db, p, 0);
+ p->pOffset = pOffset;
p->pLimit = pLimit;
p->pOrderBy = pOrderBy;
p->pSrc = pSrc;
p->op = TK_ALL;
p->pRightmost = 0;
@@ -97445,38 +97714,47 @@
return 1;
}
#endif /* !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) */
/*
-** Analyze the SELECT statement passed as an argument to see if it
-** is a min() or max() query. Return WHERE_ORDERBY_MIN or WHERE_ORDERBY_MAX if
-** it is, or 0 otherwise. At present, a query is considered to be
-** a min()/max() query if:
-**
-** 1. There is a single object in the FROM clause.
-**
-** 2. There is a single expression in the result set, and it is
-** either min(x) or max(x), where x is a column reference.
-*/
-static u8 minMaxQuery(Select *p){
- Expr *pExpr;
- ExprList *pEList = p->pEList;
-
- if( pEList->nExpr!=1 ) return WHERE_ORDERBY_NORMAL;
- pExpr = pEList->a[0].pExpr;
- if( pExpr->op!=TK_AGG_FUNCTION ) return 0;
- if( NEVER(ExprHasProperty(pExpr, EP_xIsSelect)) ) return 0;
- pEList = pExpr->x.pList;
- if( pEList==0 || pEList->nExpr!=1 ) return 0;
- if( pEList->a[0].pExpr->op!=TK_AGG_COLUMN ) return WHERE_ORDERBY_NORMAL;
- assert( !ExprHasProperty(pExpr, EP_IntValue) );
- if( sqlite3StrICmp(pExpr->u.zToken,"min")==0 ){
- return WHERE_ORDERBY_MIN;
- }else if( sqlite3StrICmp(pExpr->u.zToken,"max")==0 ){
- return WHERE_ORDERBY_MAX;
- }
- return WHERE_ORDERBY_NORMAL;
+** Based on the contents of the AggInfo structure indicated by the first
+** argument, this function checks if the following are true:
+**
+** * the query contains just a single aggregate function,
+** * the aggregate function is either min() or max(), and
+** * the argument to the aggregate function is a column value.
+**
+** If all of the above are true, then WHERE_ORDERBY_MIN or WHERE_ORDERBY_MAX
+** is returned as appropriate. Also, *ppMinMax is set to point to the
+** list of arguments passed to the aggregate before returning.
+**
+** Or, if the conditions above are not met, *ppMinMax is set to 0 and
+** WHERE_ORDERBY_NORMAL is returned.
+*/
+static u8 minMaxQuery(AggInfo *pAggInfo, ExprList **ppMinMax){
+ int eRet = WHERE_ORDERBY_NORMAL; /* Return value */
+
+ *ppMinMax = 0;
+ if( pAggInfo->nFunc==1 ){
+ Expr *pExpr = pAggInfo->aFunc[0].pExpr; /* Aggregate function */
+ ExprList *pEList = pExpr->x.pList; /* Arguments to agg function */
+
+ assert( pExpr->op==TK_AGG_FUNCTION );
+ if( pEList && pEList->nExpr==1 && pEList->a[0].pExpr->op==TK_AGG_COLUMN ){
+ const char *zFunc = pExpr->u.zToken;
+ if( sqlite3StrICmp(zFunc, "min")==0 ){
+ eRet = WHERE_ORDERBY_MIN;
+ *ppMinMax = pEList;
+ }else if( sqlite3StrICmp(zFunc, "max")==0 ){
+ eRet = WHERE_ORDERBY_MAX;
+ *ppMinMax = pEList;
+ }
+ }
+ }
+
+ assert( *ppMinMax==0 || (*ppMinMax)->nExpr==1 );
+ return eRet;
}
/*
** The select statement passed as the first argument is an aggregate query.
** The second argment is the associated aggregate-info object. This
@@ -97567,18 +97845,20 @@
int i, j, k;
SrcList *pTabList;
ExprList *pEList;
struct SrcList_item *pFrom;
sqlite3 *db = pParse->db;
+ Expr *pE, *pRight, *pExpr;
+ u16 selFlags = p->selFlags;
+ p->selFlags |= SF_Expanded;
if( db->mallocFailed ){
return WRC_Abort;
}
- if( NEVER(p->pSrc==0) || (p->selFlags & SF_Expanded)!=0 ){
+ if( NEVER(p->pSrc==0) || (selFlags & SF_Expanded)!=0 ){
return WRC_Prune;
}
- p->selFlags |= SF_Expanded;
pTabList = p->pSrc;
pEList = p->pEList;
/* Make sure cursor numbers have been assigned to all entries in
** the FROM clause of the SELECT statement.
@@ -97617,10 +97897,16 @@
}else{
/* An ordinary table or view name in the FROM clause */
assert( pFrom->pTab==0 );
pFrom->pTab = pTab = sqlite3LocateTableItem(pParse, 0, pFrom);
if( pTab==0 ) return WRC_Abort;
+ if( pTab->nRef==0xffff ){
+ sqlite3ErrorMsg(pParse, "too many references to \"%s\": max 65535",
+ pTab->zName);
+ pFrom->pTab = 0;
+ return WRC_Abort;
+ }
pTab->nRef++;
#if !defined(SQLITE_OMIT_VIEW) || !defined (SQLITE_OMIT_VIRTUALTABLE)
if( pTab->pSelect || IsVirtual(pTab) ){
/* We reach here if the named table is a really a view */
if( sqlite3ViewGetColumnNames(pParse, pTab) ) return WRC_Abort;
@@ -97652,11 +97938,11 @@
**
** The first loop just checks to see if there are any "*" operators
** that need expanding.
*/
for(k=0; knExpr; k++){
- Expr *pE = pEList->a[k].pExpr;
+ pE = pEList->a[k].pExpr;
if( pE->op==TK_ALL ) break;
assert( pE->op!=TK_DOT || pE->pRight!=0 );
assert( pE->op!=TK_DOT || (pE->pLeft!=0 && pE->pLeft->op==TK_ID) );
if( pE->op==TK_DOT && pE->pRight->op==TK_ALL ) break;
}
@@ -97670,14 +97956,22 @@
ExprList *pNew = 0;
int flags = pParse->db->flags;
int longNames = (flags & SQLITE_FullColNames)!=0
&& (flags & SQLITE_ShortColNames)==0;
+ /* When processing FROM-clause subqueries, it is always the case
+ ** that full_column_names=OFF and short_column_names=ON. The
+ ** sqlite3ResultSetOfSelect() routine makes it so. */
+ assert( (p->selFlags & SF_NestedFrom)==0
+ || ((flags & SQLITE_FullColNames)==0 &&
+ (flags & SQLITE_ShortColNames)!=0) );
+
for(k=0; knExpr; k++){
- Expr *pE = a[k].pExpr;
- assert( pE->op!=TK_DOT || pE->pRight!=0 );
- if( pE->op!=TK_ALL && (pE->op!=TK_DOT || pE->pRight->op!=TK_ALL) ){
+ pE = a[k].pExpr;
+ pRight = pE->pRight;
+ assert( pE->op!=TK_DOT || pRight!=0 );
+ if( pE->op!=TK_ALL && (pE->op!=TK_DOT || pRight->op!=TK_ALL) ){
/* This particular expression does not need to be expanded.
*/
pNew = sqlite3ExprListAppend(pParse, pNew, a[k].pExpr);
if( pNew ){
pNew->a[pNew->nExpr-1].zName = a[k].zName;
@@ -97688,44 +97982,56 @@
a[k].pExpr = 0;
}else{
/* This expression is a "*" or a "TABLE.*" and needs to be
** expanded. */
int tableSeen = 0; /* Set to 1 when TABLE matches */
- char *zTName; /* text of name of TABLE */
+ char *zTName = 0; /* text of name of TABLE */
if( pE->op==TK_DOT ){
assert( pE->pLeft!=0 );
assert( !ExprHasProperty(pE->pLeft, EP_IntValue) );
zTName = pE->pLeft->u.zToken;
- }else{
- zTName = 0;
}
for(i=0, pFrom=pTabList->a; inSrc; i++, pFrom++){
Table *pTab = pFrom->pTab;
+ Select *pSub = pFrom->pSelect;
char *zTabName = pFrom->zAlias;
+ const char *zSchemaName = 0;
+ int iDb;
if( zTabName==0 ){
zTabName = pTab->zName;
}
if( db->mallocFailed ) break;
- if( zTName && sqlite3StrICmp(zTName, zTabName)!=0 ){
- continue;
+ if( pSub==0 || (pSub->selFlags & SF_NestedFrom)==0 ){
+ pSub = 0;
+ if( zTName && sqlite3StrICmp(zTName, zTabName)!=0 ){
+ continue;
+ }
+ iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+ zSchemaName = iDb>=0 ? db->aDb[iDb].zName : "*";
}
- tableSeen = 1;
for(j=0; jnCol; j++){
- Expr *pExpr, *pRight;
char *zName = pTab->aCol[j].zName;
char *zColname; /* The computed column name */
char *zToFree; /* Malloced string that needs to be freed */
Token sColname; /* Computed column name as a token */
+
+ assert( zName );
+ if( zTName && pSub
+ && sqlite3MatchSpanName(pSub->pEList->a[j].zSpan, 0, zTName, 0)==0
+ ){
+ continue;
+ }
/* If a column is marked as 'hidden' (currently only possible
** for virtual tables), do not include it in the expanded
** result-set list.
*/
if( IsHiddenColumn(&pTab->aCol[j]) ){
assert(IsVirtual(pTab));
continue;
}
+ tableSeen = 1;
if( i>0 && zTName==0 ){
if( (pFrom->jointype & JT_NATURAL)!=0
&& tableAndColumnIndex(pTabList, i, zName, 0, 0)
){
@@ -97744,10 +98050,14 @@
zToFree = 0;
if( longNames || pTabList->nSrc>1 ){
Expr *pLeft;
pLeft = sqlite3Expr(db, TK_ID, zTabName);
pExpr = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight, 0);
+ if( zSchemaName ){
+ pLeft = sqlite3Expr(db, TK_ID, zSchemaName);
+ pExpr = sqlite3PExpr(pParse, TK_DOT, pLeft, pExpr, 0);
+ }
if( longNames ){
zColname = sqlite3MPrintf(db, "%s.%s", zTabName, zName);
zToFree = zColname;
}
}else{
@@ -97755,10 +98065,22 @@
}
pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
sColname.z = zColname;
sColname.n = sqlite3Strlen30(zColname);
sqlite3ExprListSetName(pParse, pNew, &sColname, 0);
+ if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){
+ struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
+ if( pSub ){
+ pX->zSpan = sqlite3DbStrDup(db, pSub->pEList->a[j].zSpan);
+ testcase( pX->zSpan==0 );
+ }else{
+ pX->zSpan = sqlite3MPrintf(db, "%s.%s.%s",
+ zSchemaName, zTabName, zColname);
+ testcase( pX->zSpan==0 );
+ }
+ pX->bSpanIsTab = 1;
+ }
sqlite3DbFree(db, zToFree);
}
}
if( !tableSeen ){
if( zTName ){
@@ -97893,10 +98215,11 @@
NameContext *pOuterNC /* Name context for container */
){
sqlite3 *db;
if( NEVER(p==0) ) return;
db = pParse->db;
+ if( db->mallocFailed ) return;
if( p->selFlags & SF_HasTypeInfo ) return;
sqlite3SelectExpand(pParse, p);
if( pParse->nErr || db->mallocFailed ) return;
sqlite3ResolveSelectNames(pParse, p, pOuterNC);
if( pParse->nErr || db->mallocFailed ) return;
@@ -98812,15 +99135,21 @@
** index or indices to use) should place a different priority on
** satisfying the 'ORDER BY' clause than it does in other cases.
** Refer to code and comments in where.c for details.
*/
ExprList *pMinMax = 0;
- u8 flag = minMaxQuery(p);
+ u8 flag = WHERE_ORDERBY_NORMAL;
+
+ assert( p->pGroupBy==0 );
+ assert( flag==0 );
+ if( p->pHaving==0 ){
+ flag = minMaxQuery(&sAggInfo, &pMinMax);
+ }
+ assert( flag==0 || (pMinMax!=0 && pMinMax->nExpr==1) );
+
if( flag ){
- assert( !ExprHasProperty(p->pEList->a[0].pExpr, EP_xIsSelect) );
- assert( p->pEList->a[0].pExpr->x.pList->nExpr==1 );
- pMinMax = sqlite3ExprListDup(db, p->pEList->a[0].pExpr->x.pList,0);
+ pMinMax = sqlite3ExprListDup(db, pMinMax, 0);
pDel = pMinMax;
if( pMinMax && !db->mallocFailed ){
pMinMax->a[0].sortOrder = flag!=WHERE_ORDERBY_MIN ?1:0;
pMinMax->a[0].pExpr->op = TK_COLUMN;
}
@@ -98972,11 +99301,14 @@
SQLITE_PRIVATE void sqlite3ExplainSelect(Vdbe *pVdbe, Select *p){
if( p==0 ){
sqlite3ExplainPrintf(pVdbe, "(null-select)");
return;
}
- while( p->pPrior ) p = p->pPrior;
+ while( p->pPrior ){
+ p->pPrior->pNext = p;
+ p = p->pPrior;
+ }
sqlite3ExplainPush(pVdbe);
while( p ){
explainOneSelect(pVdbe, p);
p = p->pNext;
if( p==0 ) break;
@@ -102549,12 +102881,12 @@
Expr *pExpr; /* Pointer to the subexpression that is this term */
int iParent; /* Disable pWC->a[iParent] when this term disabled */
int leftCursor; /* Cursor number of X in "X " */
union {
int leftColumn; /* Column number of X in "X " */
- WhereOrInfo *pOrInfo; /* Extra information if eOperator==WO_OR */
- WhereAndInfo *pAndInfo; /* Extra information if eOperator==WO_AND */
+ WhereOrInfo *pOrInfo; /* Extra information if (eOperator & WO_OR)!=0 */
+ WhereAndInfo *pAndInfo; /* Extra information if (eOperator& WO_AND)!=0 */
} u;
u16 eOperator; /* A WO_xx value describing */
u8 wtFlags; /* TERM_xxx bit flags. See below */
u8 nChild; /* Number of children that must disable us */
WhereClause *pWC; /* The clause this term is part of */
@@ -102591,11 +102923,10 @@
** subclauses points to the WhereClause object for the whole clause.
*/
struct WhereClause {
Parse *pParse; /* The parser context */
WhereMaskSet *pMaskSet; /* Mapping of table cursor numbers to bitmasks */
- Bitmask vmask; /* Bitmask identifying virtual table cursors */
WhereClause *pOuter; /* Outer conjunction */
u8 op; /* Split operator. TK_AND or TK_OR */
u16 wctrlFlags; /* Might include WHERE_AND_ONLY */
int nTerm; /* Number of terms */
int nSlot; /* Number of entries in a[] */
@@ -102678,10 +103009,11 @@
#define WO_GE (WO_EQ<<(TK_GE-TK_EQ))
#define WO_MATCH 0x040
#define WO_ISNULL 0x080
#define WO_OR 0x100 /* Two or more OR-connected terms */
#define WO_AND 0x200 /* Two or more AND-connected terms */
+#define WO_EQUIV 0x400 /* Of the form A==B, both columns */
#define WO_NOOP 0x800 /* This term does not restrict search space */
#define WO_ALL 0xfff /* Mask of all possible WO_* values */
#define WO_SINGLE 0x0ff /* Mask of all non-compound WO_* values */
@@ -102704,11 +103036,11 @@
#define WHERE_COLUMN_RANGE 0x00020000 /* xEXPR */
#define WHERE_COLUMN_IN 0x00040000 /* x IN (...) */
#define WHERE_COLUMN_NULL 0x00080000 /* x IS NULL */
#define WHERE_INDEXED 0x000f0000 /* Anything that uses an index */
#define WHERE_NOT_FULLSCAN 0x100f3000 /* Does not do a full table scan */
-#define WHERE_IN_ABLE 0x000f1000 /* Able to support an IN operator */
+#define WHERE_IN_ABLE 0x080f1000 /* Able to support an IN operator */
#define WHERE_TOP_LIMIT 0x00100000 /* xEXPR or x>=EXPR constraint */
#define WHERE_BOTH_LIMIT 0x00300000 /* Both x>EXPR and xpMaskSet = pMaskSet;
pWC->pOuter = 0;
pWC->nTerm = 0;
pWC->nSlot = ArraySize(pWC->aStatic);
pWC->a = pWC->aStatic;
- pWC->vmask = 0;
pWC->wctrlFlags = wctrlFlags;
}
/* Forward reference */
static void whereClauseClear(WhereClause*);
@@ -103080,58 +103411,112 @@
/*
** Search for a term in the WHERE clause that is of the form "X "
** where X is a reference to the iColumn of table iCur and is one of
** the WO_xx operator codes specified by the op parameter.
** Return a pointer to the term. Return 0 if not found.
+**
+** The term returned might by Y= if there is another constraint in
+** the WHERE clause that specifies that X=Y. Any such constraints will be
+** identified by the WO_EQUIV bit in the pTerm->eOperator field. The
+** aEquiv[] array holds X and all its equivalents, with each SQL variable
+** taking up two slots in aEquiv[]. The first slot is for the cursor number
+** and the second is for the column number. There are 22 slots in aEquiv[]
+** so that means we can look for X plus up to 10 other equivalent values.
+** Hence a search for X will return if X=A1 and A1=A2 and A2=A3
+** and ... and A9=A10 and A10=.
+**
+** If there are multiple terms in the WHERE clause of the form "X "
+** then try for the one with no dependencies on - in other words where
+** is a constant expression of some kind. Only return entries of
+** the form "X Y" where Y is a column in another table if no terms of
+** the form "X " exist. Other than this priority, if there
+** are two or more terms that match, then the choice of which term to return
+** is arbitrary.
*/
static WhereTerm *findTerm(
WhereClause *pWC, /* The WHERE clause to be searched */
int iCur, /* Cursor number of LHS */
int iColumn, /* Column number of LHS */
Bitmask notReady, /* RHS must not overlap with this mask */
u32 op, /* Mask of WO_xx values describing operator */
Index *pIdx /* Must be compatible with this index, if not NULL */
){
- WhereTerm *pTerm;
- int k;
+ WhereTerm *pTerm; /* Term being examined as possible result */
+ WhereTerm *pResult = 0; /* The answer to return */
+ WhereClause *pWCOrig = pWC; /* Original pWC value */
+ int j, k; /* Loop counters */
+ Expr *pX; /* Pointer to an expression */
+ Parse *pParse; /* Parsing context */
+ int iOrigCol = iColumn; /* Original value of iColumn */
+ int nEquiv = 2; /* Number of entires in aEquiv[] */
+ int iEquiv = 2; /* Number of entries of aEquiv[] processed so far */
+ int aEquiv[22]; /* iCur,iColumn and up to 10 other equivalents */
+
assert( iCur>=0 );
- op &= WO_ALL;
- for(; pWC; pWC=pWC->pOuter){
- for(pTerm=pWC->a, k=pWC->nTerm; k; k--, pTerm++){
- if( pTerm->leftCursor==iCur
- && (pTerm->prereqRight & notReady)==0
- && pTerm->u.leftColumn==iColumn
- && (pTerm->eOperator & op)!=0
- ){
- if( iColumn>=0 && pIdx && pTerm->eOperator!=WO_ISNULL ){
- Expr *pX = pTerm->pExpr;
- CollSeq *pColl;
- char idxaff;
- int j;
- Parse *pParse = pWC->pParse;
-
- idxaff = pIdx->pTable->aCol[iColumn].affinity;
- if( !sqlite3IndexAffinityOk(pX, idxaff) ) continue;
-
- /* Figure out the collation sequence required from an index for
- ** it to be useful for optimising expression pX. Store this
- ** value in variable pColl.
- */
- assert(pX->pLeft);
- pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight);
- if( pColl==0 ) pColl = pParse->db->pDfltColl;
-
- for(j=0; pIdx->aiColumn[j]!=iColumn; j++){
- if( NEVER(j>=pIdx->nColumn) ) return 0;
- }
- if( sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ) continue;
- }
- return pTerm;
- }
- }
- }
- return 0;
+ aEquiv[0] = iCur;
+ aEquiv[1] = iColumn;
+ for(;;){
+ for(pWC=pWCOrig; pWC; pWC=pWC->pOuter){
+ for(pTerm=pWC->a, k=pWC->nTerm; k; k--, pTerm++){
+ if( pTerm->leftCursor==iCur
+ && pTerm->u.leftColumn==iColumn
+ ){
+ if( (pTerm->prereqRight & notReady)==0
+ && (pTerm->eOperator & op & WO_ALL)!=0
+ ){
+ if( iOrigCol>=0 && pIdx && (pTerm->eOperator & WO_ISNULL)==0 ){
+ CollSeq *pColl;
+ char idxaff;
+
+ pX = pTerm->pExpr;
+ pParse = pWC->pParse;
+ idxaff = pIdx->pTable->aCol[iOrigCol].affinity;
+ if( !sqlite3IndexAffinityOk(pX, idxaff) ){
+ continue;
+ }
+
+ /* Figure out the collation sequence required from an index for
+ ** it to be useful for optimising expression pX. Store this
+ ** value in variable pColl.
+ */
+ assert(pX->pLeft);
+ pColl = sqlite3BinaryCompareCollSeq(pParse,pX->pLeft,pX->pRight);
+ if( pColl==0 ) pColl = pParse->db->pDfltColl;
+
+ for(j=0; pIdx->aiColumn[j]!=iOrigCol; j++){
+ if( NEVER(j>=pIdx->nColumn) ) return 0;
+ }
+ if( sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ){
+ continue;
+ }
+ }
+ pResult = pTerm;
+ if( pTerm->prereqRight==0 ) goto findTerm_success;
+ }
+ if( (pTerm->eOperator & WO_EQUIV)!=0
+ && nEquivpExpr->pRight);
+ assert( pX->op==TK_COLUMN );
+ for(j=0; jiTable && aEquiv[j+1]==pX->iColumn ) break;
+ }
+ if( j==nEquiv ){
+ aEquiv[j] = pX->iTable;
+ aEquiv[j+1] = pX->iColumn;
+ nEquiv += 2;
+ }
+ }
+ }
+ }
+ }
+ if( iEquiv>=nEquiv ) break;
+ iCur = aEquiv[iEquiv++];
+ iColumn = aEquiv[iEquiv++];
+ }
+findTerm_success:
+ return pResult;
}
/* Forward reference */
static void exprAnalyze(SrcList*, WhereClause*, int);
@@ -103313,11 +103698,11 @@
** (D) x=expr1 OR (y>11 AND y<22 AND z LIKE '*hello*')
** (E) (p.a=1 AND q.b=2 AND r.c=3) OR (p.x=4 AND q.y=5 AND r.z=6)
**
** CASE 1:
**
-** If all subterms are of the form T.C=expr for some single column of C
+** If all subterms are of the form T.C=expr for some single column of C and
** a single table T (as shown in example B above) then create a new virtual
** term that is an equivalent IN expression. In other words, if the term
** being analyzed is:
**
** x = expr1 OR expr2 = x OR x = expr3
@@ -103401,15 +103786,14 @@
/*
** Compute the set of tables that might satisfy cases 1 or 2.
*/
indexable = ~(Bitmask)0;
- chngToIN = ~(pWC->vmask);
+ chngToIN = ~(Bitmask)0;
for(i=pOrWc->nTerm-1, pOrTerm=pOrWc->a; i>=0 && indexable; i--, pOrTerm++){
if( (pOrTerm->eOperator & WO_SINGLE)==0 ){
WhereAndInfo *pAndInfo;
- assert( pOrTerm->eOperator==0 );
assert( (pOrTerm->wtFlags & (TERM_ANDINFO|TERM_ORINFO))==0 );
chngToIN = 0;
pAndInfo = sqlite3DbMallocRaw(db, sizeof(*pAndInfo));
if( pAndInfo ){
WhereClause *pAndWC;
@@ -103444,11 +103828,11 @@
if( pOrTerm->wtFlags & TERM_VIRTUAL ){
WhereTerm *pOther = &pOrWc->a[pOrTerm->iParent];
b |= getMask(pMaskSet, pOther->leftCursor);
}
indexable &= b;
- if( pOrTerm->eOperator!=WO_EQ ){
+ if( (pOrTerm->eOperator & WO_EQ)==0 ){
chngToIN = 0;
}else{
chngToIN &= b;
}
}
@@ -103495,11 +103879,11 @@
** and column is found but leave okToChngToIN false if not found.
*/
for(j=0; j<2 && !okToChngToIN; j++){
pOrTerm = pOrWc->a;
for(i=pOrWc->nTerm-1; i>=0; i--, pOrTerm++){
- assert( pOrTerm->eOperator==WO_EQ );
+ assert( pOrTerm->eOperator & WO_EQ );
pOrTerm->wtFlags &= ~TERM_OR_OK;
if( pOrTerm->leftCursor==iCursor ){
/* This is the 2-bit case and we are on the second iteration and
** current term is from the first iteration. So skip this term. */
assert( j==1 );
@@ -103521,21 +103905,21 @@
}
if( i<0 ){
/* No candidate table+column was found. This can only occur
** on the second iteration */
assert( j==1 );
- assert( (chngToIN&(chngToIN-1))==0 );
+ assert( IsPowerOfTwo(chngToIN) );
assert( chngToIN==getMask(pMaskSet, iCursor) );
break;
}
testcase( j==1 );
/* We have found a candidate table and column. Check to see if that
** table and column is common to every term in the OR clause */
okToChngToIN = 1;
for(; i>=0 && okToChngToIN; i--, pOrTerm++){
- assert( pOrTerm->eOperator==WO_EQ );
+ assert( pOrTerm->eOperator & WO_EQ );
if( pOrTerm->leftCursor!=iCursor ){
pOrTerm->wtFlags &= ~TERM_OR_OK;
}else if( pOrTerm->u.leftColumn!=iColumn ){
okToChngToIN = 0;
}else{
@@ -103567,11 +103951,11 @@
Expr *pLeft = 0; /* The LHS of the IN operator */
Expr *pNew; /* The complete IN operator */
for(i=pOrWc->nTerm-1, pOrTerm=pOrWc->a; i>=0; i--, pOrTerm++){
if( (pOrTerm->wtFlags & TERM_OR_OK)==0 ) continue;
- assert( pOrTerm->eOperator==WO_EQ );
+ assert( pOrTerm->eOperator & WO_EQ );
assert( pOrTerm->leftCursor==iCursor );
assert( pOrTerm->u.leftColumn==iColumn );
pDup = sqlite3ExprDup(db, pOrTerm->pExpr->pRight, 0);
pList = sqlite3ExprListAppend(pWC->pParse, pList, pDup);
pLeft = pOrTerm->pExpr->pLeft;
@@ -103596,11 +103980,10 @@
pTerm->eOperator = WO_NOOP; /* case 1 trumps case 2 */
}
}
}
#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */
-
/*
** The input to this routine is an WhereTerm structure with only the
** "pExpr" field filled in. The job of this routine is to analyze the
** subexpression and populate all the other fields of the WhereTerm
@@ -103666,21 +104049,23 @@
}
pTerm->prereqAll = prereqAll;
pTerm->leftCursor = -1;
pTerm->iParent = -1;
pTerm->eOperator = 0;
- if( allowedOp(op) && (pTerm->prereqRight & prereqLeft)==0 ){
+ if( allowedOp(op) ){
Expr *pLeft = sqlite3ExprSkipCollate(pExpr->pLeft);
Expr *pRight = sqlite3ExprSkipCollate(pExpr->pRight);
+ u16 opMask = (pTerm->prereqRight & prereqLeft)==0 ? WO_ALL : WO_EQUIV;
if( pLeft->op==TK_COLUMN ){
pTerm->leftCursor = pLeft->iTable;
pTerm->u.leftColumn = pLeft->iColumn;
- pTerm->eOperator = operatorMask(op);
+ pTerm->eOperator = operatorMask(op) & opMask;
}
if( pRight && pRight->op==TK_COLUMN ){
WhereTerm *pNew;
Expr *pDup;
+ u16 eExtraOp = 0; /* Extra bits for pNew->eOperator */
if( pTerm->leftCursor>=0 ){
int idxNew;
pDup = sqlite3ExprDup(db, pExpr, 0);
if( db->mallocFailed ){
sqlite3ExprDelete(db, pDup);
@@ -103691,10 +104076,17 @@
pNew = &pWC->a[idxNew];
pNew->iParent = idxTerm;
pTerm = &pWC->a[idxTerm];
pTerm->nChild = 1;
pTerm->wtFlags |= TERM_COPIED;
+ if( pExpr->op==TK_EQ
+ && !ExprHasProperty(pExpr, EP_FromJoin)
+ && OptimizationEnabled(db, SQLITE_Transitive)
+ ){
+ pTerm->eOperator |= WO_EQUIV;
+ eExtraOp = WO_EQUIV;
+ }
}else{
pDup = pExpr;
pNew = pTerm;
}
exprCommute(pParse, pDup);
@@ -103702,11 +104094,11 @@
pNew->leftCursor = pLeft->iTable;
pNew->u.leftColumn = pLeft->iColumn;
testcase( (prereqLeft | extraRight) != prereqLeft );
pNew->prereqRight = prereqLeft | extraRight;
pNew->prereqAll = prereqAll;
- pNew->eOperator = operatorMask(pDup->op);
+ pNew->eOperator = (operatorMask(pDup->op) + eExtraOp) & opMask;
}
}
#ifndef SQLITE_OMIT_BETWEEN_OPTIMIZATION
/* If a term is the BETWEEN operator, create two new virtual terms
@@ -104161,11 +104553,11 @@
return;
}
/* Search the WHERE clause terms for a usable WO_OR term. */
for(pTerm=pWC->a; pTermeOperator==WO_OR
+ if( (pTerm->eOperator & WO_OR)!=0
&& ((pTerm->prereqAll & ~maskSrc) & p->notReady)==0
&& (pTerm->u.pOrInfo->indexable & maskSrc)!=0
){
WhereClause * const pOrWC = &pTerm->u.pOrInfo->wc;
WhereTerm * const pOrWCEnd = &pOrWC->a[pOrWC->nTerm];
@@ -104182,11 +104574,11 @@
sBOI.ppIdxInfo = 0;
for(pOrTerm=pOrWC->a; pOrTerma), (pTerm - pWC->a)
));
- if( pOrTerm->eOperator==WO_AND ){
+ if( (pOrTerm->eOperator& WO_AND)!=0 ){
sBOI.pWC = &pOrTerm->u.pAndInfo->wc;
bestIndex(&sBOI);
}else if( pOrTerm->leftCursor==iCur ){
WhereClause tempWC;
tempWC.pParse = pWC->pParse;
@@ -104243,11 +104635,11 @@
struct SrcList_item *pSrc, /* Table we are trying to access */
Bitmask notReady /* Tables in outer loops of the join */
){
char aff;
if( pTerm->leftCursor!=pSrc->iCursor ) return 0;
- if( pTerm->eOperator!=WO_EQ ) return 0;
+ if( (pTerm->eOperator & WO_EQ)==0 ) return 0;
if( (pTerm->prereqRight & notReady)!=0 ) return 0;
aff = pSrc->pTab->aCol[pTerm->u.leftColumn].affinity;
if( !sqlite3IndexAffinityOk(pTerm->pExpr, aff) ) return 0;
return 1;
}
@@ -104505,14 +104897,14 @@
/* Count the number of possible WHERE clause constraints referring
** to this virtual table */
for(i=nTerm=0, pTerm=pWC->a; inTerm; i++, pTerm++){
if( pTerm->leftCursor != pSrc->iCursor ) continue;
- assert( (pTerm->eOperator&(pTerm->eOperator-1))==0 );
- testcase( pTerm->eOperator==WO_IN );
- testcase( pTerm->eOperator==WO_ISNULL );
- if( pTerm->eOperator & (WO_IN|WO_ISNULL) ) continue;
+ assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
+ testcase( pTerm->eOperator & WO_IN );
+ testcase( pTerm->eOperator & WO_ISNULL );
+ if( pTerm->eOperator & (WO_ISNULL) ) continue;
if( pTerm->wtFlags & TERM_VNULL ) continue;
nTerm++;
}
/* If the ORDER BY clause contains only columns in the current
@@ -104556,29 +104948,32 @@
*(struct sqlite3_index_orderby**)&pIdxInfo->aOrderBy = pIdxOrderBy;
*(struct sqlite3_index_constraint_usage**)&pIdxInfo->aConstraintUsage =
pUsage;
for(i=j=0, pTerm=pWC->a; inTerm; i++, pTerm++){
+ u8 op;
if( pTerm->leftCursor != pSrc->iCursor ) continue;
- assert( (pTerm->eOperator&(pTerm->eOperator-1))==0 );
- testcase( pTerm->eOperator==WO_IN );
- testcase( pTerm->eOperator==WO_ISNULL );
- if( pTerm->eOperator & (WO_IN|WO_ISNULL) ) continue;
+ assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
+ testcase( pTerm->eOperator & WO_IN );
+ testcase( pTerm->eOperator & WO_ISNULL );
+ if( pTerm->eOperator & (WO_ISNULL) ) continue;
if( pTerm->wtFlags & TERM_VNULL ) continue;
pIdxCons[j].iColumn = pTerm->u.leftColumn;
pIdxCons[j].iTermOffset = i;
- pIdxCons[j].op = (u8)pTerm->eOperator;
+ op = (u8)pTerm->eOperator & WO_ALL;
+ if( op==WO_IN ) op = WO_EQ;
+ pIdxCons[j].op = op;
/* The direct assignment in the previous line is possible only because
** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical. The
** following asserts verify this fact. */
assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ );
assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT );
assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE );
assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT );
assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE );
assert( WO_MATCH==SQLITE_INDEX_CONSTRAINT_MATCH );
- assert( pTerm->eOperator & (WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) );
+ assert( pTerm->eOperator & (WO_IN|WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) );
j++;
}
for(i=0; ia[i].pExpr;
pIdxOrderBy[i].iColumn = pExpr->iColumn;
@@ -104658,12 +105053,14 @@
Table *pTab = pSrc->pTab;
sqlite3_index_info *pIdxInfo;
struct sqlite3_index_constraint *pIdxCons;
struct sqlite3_index_constraint_usage *pUsage;
WhereTerm *pTerm;
- int i, j;
+ int i, j, k;
int nOrderBy;
+ int sortOrder; /* Sort order for IN clauses */
+ int bAllowIN; /* Allow IN optimizations */
double rCost;
/* Make sure wsFlags is initialized to some sane value. Otherwise, if the
** malloc in allocateIndexInfo() fails and this function returns leaving
** wsFlags in an uninitialized state, the caller may behave unpredictably.
@@ -104694,63 +105091,100 @@
** sqlite3ViewGetColumnNames() would have picked up the error.
*/
assert( pTab->azModuleArg && pTab->azModuleArg[0] );
assert( sqlite3GetVTable(pParse->db, pTab) );
- /* Set the aConstraint[].usable fields and initialize all
- ** output variables to zero.
- **
- ** aConstraint[].usable is true for constraints where the right-hand
- ** side contains only references to tables to the left of the current
- ** table. In other words, if the constraint is of the form:
- **
- ** column = expr
- **
- ** and we are evaluating a join, then the constraint on column is
- ** only valid if all tables referenced in expr occur to the left
- ** of the table containing column.
- **
- ** The aConstraints[] array contains entries for all constraints
- ** on the current table. That way we only have to compute it once
- ** even though we might try to pick the best index multiple times.
- ** For each attempt at picking an index, the order of tables in the
- ** join might be different so we have to recompute the usable flag
- ** each time.
- */
- pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
- pUsage = pIdxInfo->aConstraintUsage;
- for(i=0; inConstraint; i++, pIdxCons++){
- j = pIdxCons->iTermOffset;
- pTerm = &pWC->a[j];
- pIdxCons->usable = (pTerm->prereqRight&p->notReady) ? 0 : 1;
- }
- memset(pUsage, 0, sizeof(pUsage[0])*pIdxInfo->nConstraint);
- if( pIdxInfo->needToFreeIdxStr ){
- sqlite3_free(pIdxInfo->idxStr);
- }
- pIdxInfo->idxStr = 0;
- pIdxInfo->idxNum = 0;
- pIdxInfo->needToFreeIdxStr = 0;
- pIdxInfo->orderByConsumed = 0;
- /* ((double)2) In case of SQLITE_OMIT_FLOATING_POINT... */
- pIdxInfo->estimatedCost = SQLITE_BIG_DBL / ((double)2);
- nOrderBy = pIdxInfo->nOrderBy;
- if( !p->pOrderBy ){
- pIdxInfo->nOrderBy = 0;
- }
-
- if( vtabBestIndex(pParse, pTab, pIdxInfo) ){
- return;
- }
-
- pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
- for(i=0; inConstraint; i++){
- if( pUsage[i].argvIndex>0 ){
- p->cost.used |= pWC->a[pIdxCons[i].iTermOffset].prereqRight;
- }
- }
-
+ /* Try once or twice. On the first attempt, allow IN optimizations.
+ ** If an IN optimization is accepted by the virtual table xBestIndex
+ ** method, but the pInfo->aConstrainUsage.omit flag is not set, then
+ ** the query will not work because it might allow duplicate rows in
+ ** output. In that case, run the xBestIndex method a second time
+ ** without the IN constraints. Usually this loop only runs once.
+ ** The loop will exit using a "break" statement.
+ */
+ for(bAllowIN=1; 1; bAllowIN--){
+ assert( bAllowIN==0 || bAllowIN==1 );
+
+ /* Set the aConstraint[].usable fields and initialize all
+ ** output variables to zero.
+ **
+ ** aConstraint[].usable is true for constraints where the right-hand
+ ** side contains only references to tables to the left of the current
+ ** table. In other words, if the constraint is of the form:
+ **
+ ** column = expr
+ **
+ ** and we are evaluating a join, then the constraint on column is
+ ** only valid if all tables referenced in expr occur to the left
+ ** of the table containing column.
+ **
+ ** The aConstraints[] array contains entries for all constraints
+ ** on the current table. That way we only have to compute it once
+ ** even though we might try to pick the best index multiple times.
+ ** For each attempt at picking an index, the order of tables in the
+ ** join might be different so we have to recompute the usable flag
+ ** each time.
+ */
+ pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
+ pUsage = pIdxInfo->aConstraintUsage;
+ for(i=0; inConstraint; i++, pIdxCons++){
+ j = pIdxCons->iTermOffset;
+ pTerm = &pWC->a[j];
+ if( (pTerm->prereqRight&p->notReady)==0
+ && (bAllowIN || (pTerm->eOperator & WO_IN)==0)
+ ){
+ pIdxCons->usable = 1;
+ }else{
+ pIdxCons->usable = 0;
+ }
+ }
+ memset(pUsage, 0, sizeof(pUsage[0])*pIdxInfo->nConstraint);
+ if( pIdxInfo->needToFreeIdxStr ){
+ sqlite3_free(pIdxInfo->idxStr);
+ }
+ pIdxInfo->idxStr = 0;
+ pIdxInfo->idxNum = 0;
+ pIdxInfo->needToFreeIdxStr = 0;
+ pIdxInfo->orderByConsumed = 0;
+ /* ((double)2) In case of SQLITE_OMIT_FLOATING_POINT... */
+ pIdxInfo->estimatedCost = SQLITE_BIG_DBL / ((double)2);
+ nOrderBy = pIdxInfo->nOrderBy;
+ if( !p->pOrderBy ){
+ pIdxInfo->nOrderBy = 0;
+ }
+
+ if( vtabBestIndex(pParse, pTab, pIdxInfo) ){
+ return;
+ }
+
+ sortOrder = SQLITE_SO_ASC;
+ pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
+ for(i=0; inConstraint; i++, pIdxCons++){
+ if( pUsage[i].argvIndex>0 ){
+ j = pIdxCons->iTermOffset;
+ pTerm = &pWC->a[j];
+ p->cost.used |= pTerm->prereqRight;
+ if( (pTerm->eOperator & WO_IN)!=0 ){
+ if( pUsage[i].omit==0 ){
+ /* Do not attempt to use an IN constraint if the virtual table
+ ** says that the equivalent EQ constraint cannot be safely omitted.
+ ** If we do attempt to use such a constraint, some rows might be
+ ** repeated in the output. */
+ break;
+ }
+ for(k=0; knOrderBy; k++){
+ if( pIdxInfo->aOrderBy[k].iColumn==pIdxCons->iColumn ){
+ sortOrder = pIdxInfo->aOrderBy[k].desc;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if( i>=pIdxInfo->nConstraint ) break;
+ }
+
/* If there is an ORDER BY clause, and the selected virtual table index
** does not satisfy it, increase the cost of the scan accordingly. This
** matches the processing for non-virtual tables in bestBtreeIndex().
*/
rCost = pIdxInfo->estimatedCost;
@@ -104770,11 +105204,12 @@
}else{
p->cost.rCost = rCost;
}
p->cost.plan.u.pVtabIdx = pIdxInfo;
if( pIdxInfo->orderByConsumed ){
- p->cost.plan.wsFlags |= WHERE_ORDERED;
+ assert( sortOrder==0 || sortOrder==1 );
+ p->cost.plan.wsFlags |= WHERE_ORDERED + sortOrder*WHERE_REVERSE;
p->cost.plan.nOBSat = nOrderBy;
}else{
p->cost.plan.nOBSat = p->i ? p->aLevel[p->i-1].plan.nOBSat : 0;
}
p->cost.plan.nEq = 0;
@@ -105041,28 +105476,28 @@
u8 aff = p->pTable->aCol[p->aiColumn[0]].affinity;
if( pLower ){
Expr *pExpr = pLower->pExpr->pRight;
rc = valueFromExpr(pParse, pExpr, aff, &pRangeVal);
- assert( pLower->eOperator==WO_GT || pLower->eOperator==WO_GE );
+ assert( (pLower->eOperator & (WO_GT|WO_GE))!=0 );
if( rc==SQLITE_OK
&& whereKeyStats(pParse, p, pRangeVal, 0, a)==SQLITE_OK
){
iLower = a[0];
- if( pLower->eOperator==WO_GT ) iLower += a[1];
+ if( (pLower->eOperator & WO_GT)!=0 ) iLower += a[1];
}
sqlite3ValueFree(pRangeVal);
}
if( rc==SQLITE_OK && pUpper ){
Expr *pExpr = pUpper->pExpr->pRight;
rc = valueFromExpr(pParse, pExpr, aff, &pRangeVal);
- assert( pUpper->eOperator==WO_LT || pUpper->eOperator==WO_LE );
+ assert( (pUpper->eOperator & (WO_LT|WO_LE))!=0 );
if( rc==SQLITE_OK
&& whereKeyStats(pParse, p, pRangeVal, 1, a)==SQLITE_OK
){
iUpper = a[0];
- if( pUpper->eOperator==WO_LE ) iUpper += a[1];
+ if( (pUpper->eOperator & WO_LE)!=0 ) iUpper += a[1];
}
sqlite3ValueFree(pRangeVal);
}
if( rc==SQLITE_OK ){
if( iUpper<=iLower ){
@@ -105366,16 +105801,13 @@
** if there are any X= or X IS NULL constraints in the WHERE clause. */
pConstraint = findTerm(p->pWC, base, iColumn, p->notReady,
WO_EQ|WO_ISNULL|WO_IN, pIdx);
if( pConstraint==0 ){
isEq = 0;
- }else if( pConstraint->eOperator==WO_IN ){
- /* Constraints of the form: "X IN ..." cannot be used with an ORDER BY
- ** because we do not know in what order the values on the RHS of the IN
- ** operator will occur. */
- break;
- }else if( pConstraint->eOperator==WO_ISNULL ){
+ }else if( (pConstraint->eOperator & WO_IN)!=0 ){
+ isEq = 0;
+ }else if( (pConstraint->eOperator & WO_ISNULL)!=0 ){
uniqueNotNull = 0;
isEq = 1; /* "X IS NULL" means X has only a single value */
}else if( pConstraint->prereqRight==0 ){
isEq = 1; /* Constraint "X=constant" means X has only a single value */
}else{
@@ -105674,12 +106106,12 @@
** constraint for all columns in the index, then this search will find
** at most a single row. In this case set the WHERE_UNIQUE flag to
** indicate this to the caller.
**
** Otherwise, if the search may find more than one row, test to see if
- ** there is a range constraint on indexed column (pc.plan.nEq+1) that can be
- ** optimized using the index.
+ ** there is a range constraint on indexed column (pc.plan.nEq+1) that
+ ** can be optimized using the index.
*/
if( pc.plan.nEq==pProbe->nColumn && pProbe->onError!=OE_None ){
testcase( pc.plan.wsFlags & WHERE_COLUMN_IN );
testcase( pc.plan.wsFlags & WHERE_COLUMN_NULL );
if( (pc.plan.wsFlags & (WHERE_COLUMN_IN|WHERE_COLUMN_NULL))==0 ){
@@ -105721,11 +106153,11 @@
int bRev = 2;
WHERETRACE((" --> before isSortingIndex: nPriorSat=%d\n",nPriorSat));
pc.plan.nOBSat = isSortingIndex(p, pProbe, iCur, &bRev);
WHERETRACE((" --> after isSortingIndex: bRev=%d nOBSat=%d\n",
bRev, pc.plan.nOBSat));
- if( nPriorSat(double)1 && pc.plan.nEq==1
&& pFirstTerm!=0 && aiRowEst[1]>1 ){
assert( (pFirstTerm->eOperator & (WO_EQ|WO_ISNULL|WO_IN))!=0 );
if( pFirstTerm->eOperator & (WO_EQ|WO_ISNULL) ){
- testcase( pFirstTerm->eOperator==WO_EQ );
- testcase( pFirstTerm->eOperator==WO_ISNULL );
+ testcase( pFirstTerm->eOperator & WO_EQ );
+ testcase( pFirstTerm->eOperator & WO_EQUIV );
+ testcase( pFirstTerm->eOperator & WO_ISNULL );
whereEqualScanEst(pParse, pProbe, pFirstTerm->pExpr->pRight,
&pc.plan.nRow);
}else if( bInEst==0 ){
- assert( pFirstTerm->eOperator==WO_IN );
+ assert( pFirstTerm->eOperator & WO_IN );
whereInScanEst(pParse, pProbe, pFirstTerm->pExpr->x.pList,
&pc.plan.nRow);
}
}
#endif /* SQLITE_ENABLE_STAT3 */
@@ -105936,11 +106369,11 @@
** more selective intentionally because of the subjective
** observation that indexed range constraints really are more
** selective in practice, on average. */
pc.plan.nRow /= 3;
}
- }else if( pTerm->eOperator!=WO_NOOP ){
+ }else if( (pTerm->eOperator & WO_NOOP)==0 ){
/* Any other expression lowers the output row count by half */
pc.plan.nRow /= 2;
}
}
if( pc.plan.nRow<2 ) pc.plan.nRow = 2;
@@ -105988,12 +106421,13 @@
assert( pSrc->pIndex==0
|| p->cost.plan.u.pIdx==0
|| p->cost.plan.u.pIdx==pSrc->pIndex
);
- WHERETRACE((" best index is: %s\n",
- p->cost.plan.u.pIdx ? p->cost.plan.u.pIdx->zName : "ipk"));
+ WHERETRACE((" best index is %s cost=%.1f\n",
+ p->cost.plan.u.pIdx ? p->cost.plan.u.pIdx->zName : "ipk",
+ p->cost.rCost));
bestOrClauseIndex(p);
bestAutomaticIndex(p);
p->cost.plan.wsFlags |= eqTermMask;
}
@@ -106014,11 +106448,12 @@
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( IsVirtual(p->pSrc->pTab) ){
sqlite3_index_info *pIdxInfo = 0;
p->ppIdxInfo = &pIdxInfo;
bestVirtualIndex(p);
- if( pIdxInfo->needToFreeIdxStr ){
+ assert( pIdxInfo!=0 || p->pParse->db->mallocFailed );
+ if( pIdxInfo && pIdxInfo->needToFreeIdxStr ){
sqlite3_free(pIdxInfo->idxStr);
}
sqlite3DbFree(p->pParse->db, pIdxInfo);
}else
#endif
@@ -106138,16 +106573,17 @@
#ifndef SQLITE_OMIT_SUBQUERY
}else{
int eType;
int iTab;
struct InLoop *pIn;
+ u8 bRev = (pLevel->plan.wsFlags & WHERE_REVERSE)!=0;
assert( pX->op==TK_IN );
iReg = iTarget;
eType = sqlite3FindInIndex(pParse, pX, 0);
iTab = pX->iTable;
- sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0);
+ sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iTab, 0);
assert( pLevel->plan.wsFlags & WHERE_IN_ABLE );
if( pLevel->u.in.nIn==0 ){
pLevel->addrNxt = sqlite3VdbeMakeLabel(v);
}
pLevel->u.in.nIn++;
@@ -106161,10 +106597,11 @@
if( eType==IN_INDEX_ROWID ){
pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iReg);
}else{
pIn->addrInTop = sqlite3VdbeAddOp3(v, OP_Column, iTab, 0, iReg);
}
+ pIn->eEndLoopOp = bRev ? OP_Prev : OP_Next;
sqlite3VdbeAddOp1(v, OP_IsNull, iReg);
}else{
pLevel->u.in.nIn = 0;
}
#endif
@@ -106515,32 +106952,40 @@
if( (pLevel->plan.wsFlags & WHERE_VIRTUALTABLE)!=0 ){
/* Case 0: The table is a virtual-table. Use the VFilter and VNext
** to access the data.
*/
int iReg; /* P3 Value for OP_VFilter */
+ int addrNotFound;
sqlite3_index_info *pVtabIdx = pLevel->plan.u.pVtabIdx;
int nConstraint = pVtabIdx->nConstraint;
struct sqlite3_index_constraint_usage *aUsage =
pVtabIdx->aConstraintUsage;
const struct sqlite3_index_constraint *aConstraint =
pVtabIdx->aConstraint;
sqlite3ExprCachePush(pParse);
iReg = sqlite3GetTempRange(pParse, nConstraint+2);
+ addrNotFound = pLevel->addrBrk;
for(j=1; j<=nConstraint; j++){
for(k=0; ka[iTerm].pExpr->pRight, iReg+j+1);
+ int iTarget = iReg+j+1;
+ pTerm = &pWC->a[aConstraint[k].iTermOffset];
+ if( pTerm->eOperator & WO_IN ){
+ codeEqualityTerm(pParse, pTerm, pLevel, iTarget);
+ addrNotFound = pLevel->addrNxt;
+ }else{
+ sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);
+ }
break;
}
}
if( k==nConstraint ) break;
}
sqlite3VdbeAddOp2(v, OP_Integer, pVtabIdx->idxNum, iReg);
sqlite3VdbeAddOp2(v, OP_Integer, j-1, iReg+1);
- sqlite3VdbeAddOp4(v, OP_VFilter, iCur, addrBrk, iReg, pVtabIdx->idxStr,
+ sqlite3VdbeAddOp4(v, OP_VFilter, iCur, addrNotFound, iReg, pVtabIdx->idxStr,
pVtabIdx->needToFreeIdxStr ? P4_MPRINTF : P4_STATIC);
pVtabIdx->needToFreeIdxStr = 0;
for(j=0; jpExpr!=0 );
- assert( pTerm->leftCursor==iCur );
assert( omitTable==0 );
testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
iRowidReg = codeEqualityTerm(pParse, pTerm, pLevel, iReleaseReg);
addrNxt = pLevel->addrNxt;
sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
@@ -106954,11 +107398,11 @@
int ii; /* Loop counter */
Expr *pAndExpr = 0; /* An ".. AND (...)" expression */
pTerm = pLevel->plan.u.pTerm;
assert( pTerm!=0 );
- assert( pTerm->eOperator==WO_OR );
+ assert( pTerm->eOperator & WO_OR );
assert( (pTerm->wtFlags & TERM_ORINFO)!=0 );
pOrWc = &pTerm->u.pOrInfo->wc;
pLevel->op = OP_Return;
pLevel->p1 = regReturn;
@@ -107027,11 +107471,11 @@
}
}
for(ii=0; iinTerm; ii++){
WhereTerm *pOrTerm = &pOrWc->a[ii];
- if( pOrTerm->leftCursor==iCur || pOrTerm->eOperator==WO_AND ){
+ if( pOrTerm->leftCursor==iCur || (pOrTerm->eOperator & WO_AND)!=0 ){
WhereInfo *pSubWInfo; /* Info for single OR-term scan */
Expr *pOrExpr = pOrTerm->pExpr;
if( pAndExpr ){
pAndExpr->pLeft = pOrExpr;
pOrExpr = pAndExpr;
@@ -107405,28 +107849,17 @@
** its Expr.iRightJoinTable value to find the bitmask of the right table
** of the join. Subtracting one from the right table bitmask gives a
** bitmask for all tables to the left of the join. Knowing the bitmask
** for all tables to the left of a left join is important. Ticket #3015.
**
- ** Configure the WhereClause.vmask variable so that bits that correspond
- ** to virtual table cursors are set. This is used to selectively disable
- ** the OR-to-IN transformation in exprAnalyzeOrTerm(). It is not helpful
- ** with virtual tables.
- **
** Note that bitmasks are created for all pTabList->nSrc tables in
** pTabList, not just the first nTabList tables. nTabList is normally
** equal to pTabList->nSrc but might be shortened to 1 if the
** WHERE_ONETABLE_ONLY flag is set.
*/
- assert( sWBI.pWC->vmask==0 && pMaskSet->n==0 );
for(ii=0; iinSrc; ii++){
createMask(pMaskSet, pTabList->a[ii].iCursor);
-#ifndef SQLITE_OMIT_VIRTUALTABLE
- if( ALWAYS(pTabList->a[ii].pTab) && IsVirtual(pTabList->a[ii].pTab) ){
- sWBI.pWC->vmask |= ((Bitmask)1 << ii);
- }
-#endif
}
#ifndef NDEBUG
{
Bitmask toTheLeft = 0;
for(ii=0; iinSrc; ii++){
@@ -107482,10 +107915,11 @@
Index *pIdx; /* Index for FROM table at pTabItem */
int j; /* For looping over FROM tables */
int bestJ = -1; /* The value of j */
Bitmask m; /* Bitmask value for j or bestJ */
int isOptimal; /* Iterator for optimal/non-optimal search */
+ int ckOptimal; /* Do the optimal scan check */
int nUnconstrained; /* Number tables without INDEXED BY */
Bitmask notIndexed; /* Mask of tables that cannot use an index */
memset(&bestPlan, 0, sizeof(bestPlan));
bestPlan.rCost = SQLITE_BIG_DBL;
@@ -107516,14 +107950,12 @@
**
** The second loop iteration is only performed if no optimal scan
** strategies were found by the first iteration. This second iteration
** is used to search for the lowest cost scan overall.
**
- ** Previous versions of SQLite performed only the second iteration -
- ** the next outermost loop was always that with the lowest overall
- ** cost. However, this meant that SQLite could select the wrong plan
- ** for scripts such as the following:
+ ** Without the optimal scan step (the first iteration) a suboptimal
+ ** plan might be chosen for queries like this:
**
** CREATE TABLE t1(a, b);
** CREATE TABLE t2(c, d);
** SELECT * FROM t2, t1 WHERE t2.rowid = t1.a;
**
@@ -107534,20 +107966,44 @@
** algorithm may choose to use t2 for the outer loop, which is a much
** costlier approach.
*/
nUnconstrained = 0;
notIndexed = 0;
- for(isOptimal=(iFrom=0 && bestJ<0; isOptimal--){
+
+ /* The optimal scan check only occurs if there are two or more tables
+ ** available to be reordered */
+ if( iFrom==nTabList-1 ){
+ ckOptimal = 0; /* Common case of just one table in the FROM clause */
+ }else{
+ ckOptimal = -1;
for(j=iFrom, sWBI.pSrc=&pTabList->a[j]; jjointype & (JT_LEFT|JT_CROSS))!=0;
- if( j!=iFrom && doNotReorder ) break;
m = getMask(pMaskSet, sWBI.pSrc->iCursor);
if( (m & sWBI.notValid)==0 ){
if( j==iFrom ) iFrom++;
continue;
+ }
+ if( j>iFrom && (sWBI.pSrc->jointype & (JT_LEFT|JT_CROSS))!=0 ) break;
+ if( ++ckOptimal ) break;
+ if( (sWBI.pSrc->jointype & JT_LEFT)!=0 ) break;
+ }
+ }
+ assert( ckOptimal==0 || ckOptimal==1 );
+
+ for(isOptimal=ckOptimal; isOptimal>=0 && bestJ<0; isOptimal--){
+ for(j=iFrom, sWBI.pSrc=&pTabList->a[j]; jiFrom && (sWBI.pSrc->jointype & (JT_LEFT|JT_CROSS))!=0 ){
+ /* This break and one like it in the ckOptimal computation loop
+ ** above prevent table reordering across LEFT and CROSS JOINs.
+ ** The LEFT JOIN case is necessary for correctness. The prohibition
+ ** against reordering across a CROSS JOIN is an SQLite feature that
+ ** allows the developer to control table reordering */
+ break;
+ }
+ m = getMask(pMaskSet, sWBI.pSrc->iCursor);
+ if( (m & sWBI.notValid)==0 ){
+ assert( j>iFrom );
+ continue;
}
sWBI.notReady = (isOptimal ? m : sWBI.notValid);
if( sWBI.pSrc->pIndex==0 ) nUnconstrained++;
WHERETRACE((" === trying table %d (%s) with isOptimal=%d ===\n",
@@ -107573,12 +108029,12 @@
if( isOptimal && (sWBI.cost.plan.wsFlags & WHERE_NOT_FULLSCAN)==0 ){
notIndexed |= m;
}
if( isOptimal ){
pWInfo->a[j].rOptCost = sWBI.cost.rCost;
- }else if( iFromjointype & JT_LEFT)!=0 ) break;
}
}
assert( bestJ>=0 );
assert( sWBI.notValid & getMask(pMaskSet, pTabList->a[bestJ].iCursor) );
+ assert( bestJ==iFrom || (pTabList->a[iFrom].jointype & JT_LEFT)==0 );
+ testcase( bestJ>iFrom && (pTabList->a[iFrom].jointype & JT_CROSS)!=0 );
+ testcase( bestJ>iFrom && bestJa[bestJ+1].jointype & JT_LEFT)!=0 );
WHERETRACE(("*** Optimizer selects table %d (%s) for loop %d with:\n"
" cost=%.1f, nRow=%.1f, nOBSat=%d, wsFlags=0x%08x\n",
bestJ, pTabList->a[bestJ].pTab->zName,
pLevel-pWInfo->a, bestPlan.rCost, bestPlan.plan.nRow,
bestPlan.plan.nOBSat, bestPlan.plan.wsFlags));
@@ -107875,11 +108339,11 @@
struct InLoop *pIn;
int j;
sqlite3VdbeResolveLabel(v, pLevel->addrNxt);
for(j=pLevel->u.in.nIn, pIn=&pLevel->u.in.aInLoop[j-1]; j>0; j--, pIn--){
sqlite3VdbeJumpHere(v, pIn->addrInTop+1);
- sqlite3VdbeAddOp2(v, OP_Next, pIn->iCur, pIn->addrInTop);
+ sqlite3VdbeAddOp2(v, pIn->eEndLoopOp, pIn->iCur, pIn->addrInTop);
sqlite3VdbeJumpHere(v, pIn->addrInTop-1);
}
sqlite3DbFree(db, pLevel->u.in.aInLoop);
}
sqlite3VdbeResolveLabel(v, pLevel->addrBrk);
@@ -108183,10 +108647,11 @@
Expr* yy122;
Select* yy159;
IdList* yy180;
struct {int value; int mask;} yy207;
u8 yy258;
+ u16 yy305;
struct LikeOp yy318;
TriggerStep* yy327;
ExprSpan yy342;
SrcList* yy347;
int yy392;
@@ -110133,22 +110598,19 @@
case 82: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==82);
case 84: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==84);
case 86: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==86);
case 98: /* defer_subclause_opt ::= */ yytestcase(yyruleno==98);
case 109: /* ifexists ::= */ yytestcase(yyruleno==109);
- case 120: /* distinct ::= ALL */ yytestcase(yyruleno==120);
- case 121: /* distinct ::= */ yytestcase(yyruleno==121);
case 221: /* between_op ::= BETWEEN */ yytestcase(yyruleno==221);
case 224: /* in_op ::= IN */ yytestcase(yyruleno==224);
{yygotominor.yy392 = 0;}
break;
case 29: /* ifnotexists ::= IF NOT EXISTS */
case 30: /* temp ::= TEMP */ yytestcase(yyruleno==30);
case 70: /* autoinc ::= AUTOINCR */ yytestcase(yyruleno==70);
case 85: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==85);
case 108: /* ifexists ::= IF EXISTS */ yytestcase(yyruleno==108);
- case 119: /* distinct ::= DISTINCT */ yytestcase(yyruleno==119);
case 222: /* between_op ::= NOT BETWEEN */ yytestcase(yyruleno==222);
case 225: /* in_op ::= NOT IN */ yytestcase(yyruleno==225);
{yygotominor.yy392 = 1;}
break;
case 32: /* create_table_args ::= LP columnlist conslist_opt RP */
@@ -110384,12 +110846,19 @@
case 116: /* multiselect_op ::= UNION ALL */
{yygotominor.yy392 = TK_ALL;}
break;
case 118: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */
{
- yygotominor.yy159 = sqlite3SelectNew(pParse,yymsp[-6].minor.yy442,yymsp[-5].minor.yy347,yymsp[-4].minor.yy122,yymsp[-3].minor.yy442,yymsp[-2].minor.yy122,yymsp[-1].minor.yy442,yymsp[-7].minor.yy392,yymsp[0].minor.yy64.pLimit,yymsp[0].minor.yy64.pOffset);
+ yygotominor.yy159 = sqlite3SelectNew(pParse,yymsp[-6].minor.yy442,yymsp[-5].minor.yy347,yymsp[-4].minor.yy122,yymsp[-3].minor.yy442,yymsp[-2].minor.yy122,yymsp[-1].minor.yy442,yymsp[-7].minor.yy305,yymsp[0].minor.yy64.pLimit,yymsp[0].minor.yy64.pOffset);
}
+ break;
+ case 119: /* distinct ::= DISTINCT */
+{yygotominor.yy305 = SF_Distinct;}
+ break;
+ case 120: /* distinct ::= ALL */
+ case 121: /* distinct ::= */ yytestcase(yyruleno==121);
+{yygotominor.yy305 = 0;}
break;
case 122: /* sclp ::= selcollist COMMA */
case 246: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==246);
{yygotominor.yy442 = yymsp[-1].minor.yy442;}
break;
@@ -110455,14 +110924,24 @@
break;
case 136: /* seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt */
{
if( yymsp[-6].minor.yy347==0 && yymsp[-2].minor.yy0.n==0 && yymsp[-1].minor.yy122==0 && yymsp[0].minor.yy180==0 ){
yygotominor.yy347 = yymsp[-4].minor.yy347;
+ }else if( yymsp[-4].minor.yy347->nSrc==1 ){
+ yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,0,0,&yymsp[-2].minor.yy0,0,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
+ if( yygotominor.yy347 ){
+ struct SrcList_item *pNew = &yygotominor.yy347->a[yygotominor.yy347->nSrc-1];
+ struct SrcList_item *pOld = yymsp[-4].minor.yy347->a;
+ pNew->zName = pOld->zName;
+ pNew->zDatabase = pOld->zDatabase;
+ pOld->zName = pOld->zDatabase = 0;
+ }
+ sqlite3SrcListDelete(pParse->db, yymsp[-4].minor.yy347);
}else{
Select *pSubquery;
sqlite3SrcListShiftJoinType(yymsp[-4].minor.yy347);
- pSubquery = sqlite3SelectNew(pParse,0,yymsp[-4].minor.yy347,0,0,0,0,0,0,0);
+ pSubquery = sqlite3SelectNew(pParse,0,yymsp[-4].minor.yy347,0,0,0,0,SF_NestedFrom,0,0);
yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,0,0,&yymsp[-2].minor.yy0,pSubquery,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
}
}
break;
case 137: /* dbnm ::= */
@@ -110691,11 +111170,11 @@
if( yymsp[-1].minor.yy442 && yymsp[-1].minor.yy442->nExpr>pParse->db->aLimit[SQLITE_LIMIT_FUNCTION_ARG] ){
sqlite3ErrorMsg(pParse, "too many arguments on function %T", &yymsp[-4].minor.yy0);
}
yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, yymsp[-1].minor.yy442, &yymsp[-4].minor.yy0);
spanSet(&yygotominor.yy342,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
- if( yymsp[-2].minor.yy392 && yygotominor.yy342.pExpr ){
+ if( yymsp[-2].minor.yy305 && yygotominor.yy342.pExpr ){
yygotominor.yy342.pExpr->flags |= EP_Distinct;
}
}
break;
case 197: /* expr ::= ID LP STAR RP */
@@ -136338,11 +136817,12 @@
** would fit in a single node, use a smaller node-size.
*/
static int getNodeSize(
sqlite3 *db, /* Database handle */
Rtree *pRtree, /* Rtree handle */
- int isCreate /* True for xCreate, false for xConnect */
+ int isCreate, /* True for xCreate, false for xConnect */
+ char **pzErr /* OUT: Error message, if any */
){
int rc;
char *zSql;
if( isCreate ){
int iPageSize = 0;
@@ -136351,17 +136831,22 @@
if( rc==SQLITE_OK ){
pRtree->iNodeSize = iPageSize-64;
if( (4+pRtree->nBytesPerCell*RTREE_MAXCELLS)iNodeSize ){
pRtree->iNodeSize = 4+pRtree->nBytesPerCell*RTREE_MAXCELLS;
}
+ }else{
+ *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
}
}else{
zSql = sqlite3_mprintf(
"SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1",
pRtree->zDb, pRtree->zName
);
rc = getIntFromStmt(db, zSql, &pRtree->iNodeSize);
+ if( rc!=SQLITE_OK ){
+ *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+ }
}
sqlite3_free(zSql);
return rc;
}
@@ -136421,11 +136906,11 @@
pRtree->eCoordType = eCoordType;
memcpy(pRtree->zDb, argv[1], nDb);
memcpy(pRtree->zName, argv[2], nName);
/* Figure out the node size to use. */
- rc = getNodeSize(db, pRtree, isCreate);
+ rc = getNodeSize(db, pRtree, isCreate, pzErr);
/* Create/Connect to the underlying relational database schema. If
** that is successful, call sqlite3_declare_vtab() to configure
** the r-tree table schema.
*/
Index: SQLite.Interop/src/core/sqlite3.h
==================================================================
--- SQLite.Interop/src/core/sqlite3.h
+++ SQLite.Interop/src/core/sqlite3.h
@@ -105,13 +105,13 @@
**
** See also: [sqlite3_libversion()],
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.7.15.1"
-#define SQLITE_VERSION_NUMBER 3007015
-#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318"
+#define SQLITE_VERSION "3.7.16"
+#define SQLITE_VERSION_NUMBER 3007016
+#define SQLITE_SOURCE_ID "2013-02-15 04:21:01 843e1c543aabab8cd62f28742d5818887d36bcb7"
/*
** CAPI3REF: Run-Time Library Version Numbers
** KEYWORDS: sqlite3_version, sqlite3_sourceid
**
@@ -482,10 +482,19 @@
#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3<<8))
#define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8))
#define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8))
#define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8))
#define SQLITE_ABORT_ROLLBACK (SQLITE_ABORT | (2<<8))
+#define SQLITE_CONSTRAINT_CHECK (SQLITE_CONSTRAINT | (1<<8))
+#define SQLITE_CONSTRAINT_COMMITHOOK (SQLITE_CONSTRAINT | (2<<8))
+#define SQLITE_CONSTRAINT_FOREIGNKEY (SQLITE_CONSTRAINT | (3<<8))
+#define SQLITE_CONSTRAINT_FUNCTION (SQLITE_CONSTRAINT | (4<<8))
+#define SQLITE_CONSTRAINT_NOTNULL (SQLITE_CONSTRAINT | (5<<8))
+#define SQLITE_CONSTRAINT_PRIMARYKEY (SQLITE_CONSTRAINT | (6<<8))
+#define SQLITE_CONSTRAINT_TRIGGER (SQLITE_CONSTRAINT | (7<<8))
+#define SQLITE_CONSTRAINT_UNIQUE (SQLITE_CONSTRAINT | (8<<8))
+#define SQLITE_CONSTRAINT_VTAB (SQLITE_CONSTRAINT | (9<<8))
/*
** CAPI3REF: Flags For File Open Operations
**
** These bit values are intended for use in the
Index: SQLite.Interop/src/core/sqlite3ext.h
==================================================================
--- SQLite.Interop/src/core/sqlite3ext.h
+++ SQLite.Interop/src/core/sqlite3ext.h
@@ -234,10 +234,24 @@
int (*wal_checkpoint)(sqlite3*,const char*);
void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
int (*blob_reopen)(sqlite3_blob*,sqlite3_int64);
int (*vtab_config)(sqlite3*,int op,...);
int (*vtab_on_conflict)(sqlite3*);
+ /* Version 3.7.16 and later */
+ int (*close_v2)(sqlite3*);
+ const char *(*db_filename)(sqlite3*,const char*);
+ int (*db_readonly)(sqlite3*,const char*);
+ int (*db_release_memory)(sqlite3*);
+ const char *(*errstr)(int);
+ int (*stmt_busy)(sqlite3_stmt*);
+ int (*stmt_readonly)(sqlite3_stmt*);
+ int (*stricmp)(const char*,const char*);
+ int (*uri_boolean)(const char*,const char*,int);
+ sqlite3_int64 (*uri_int64)(const char*,const char*,sqlite3_int64);
+ const char *(*uri_parameter)(const char*,const char*);
+ char *(*vsnprintf)(int,char*,const char*,va_list);
+ int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
};
/*
** The following macros redefine the API routines so that they are
** redirected throught the global sqlite3_api structure.
@@ -437,11 +451,25 @@
#define sqlite3_wal_checkpoint sqlite3_api->wal_checkpoint
#define sqlite3_wal_hook sqlite3_api->wal_hook
#define sqlite3_blob_reopen sqlite3_api->blob_reopen
#define sqlite3_vtab_config sqlite3_api->vtab_config
#define sqlite3_vtab_on_conflict sqlite3_api->vtab_on_conflict
+/* Version 3.7.16 and later */
+#define sqlite3_close_v2 sqlite3_api->close_v2
+#define sqlite3_db_filename sqlite3_api->db_filename
+#define sqlite3_db_readonly sqlite3_api->db_readonly
+#define sqlite3_db_release_memory sqlite3_api->db_release_memory
+#define sqlite3_errstr sqlite3_api->errstr
+#define sqlite3_stmt_busy sqlite3_api->stmt_busy
+#define sqlite3_stmt_readonly sqlite3_api->stmt_readonly
+#define sqlite3_stricmp sqlite3_api->stricmp
+#define sqlite3_uri_boolean sqlite3_api->uri_boolean
+#define sqlite3_uri_int64 sqlite3_api->uri_int64
+#define sqlite3_uri_parameter sqlite3_api->uri_parameter
+#define sqlite3_uri_vsnprintf sqlite3_api->vsnprintf
+#define sqlite3_wal_checkpoint_v2 sqlite3_api->wal_checkpoint_v2
#endif /* SQLITE_CORE */
#define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api = 0;
#define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v;
#endif /* _SQLITE3EXT_H_ */
Index: SQLite.Interop/src/win/AssemblyInfo.cpp
==================================================================
--- SQLite.Interop/src/win/AssemblyInfo.cpp
+++ SQLite.Interop/src/win/AssemblyInfo.cpp
@@ -10,11 +10,11 @@
using namespace System::Runtime::InteropServices;
#include "interop.h"
[assembly:AssemblyTitleAttribute("SQLite.Interop")];
-[assembly:AssemblyCompanyAttribute("Robert Simpson, et al.")];
+[assembly:AssemblyCompanyAttribute("http://system.data.sqlite.org/")];
[assembly:AssemblyDescriptionAttribute("System.Data.SQLite Interop Assembly")];
[assembly:AssemblyProductAttribute("System.Data.SQLite")];
[assembly:AssemblyCopyrightAttribute("Public Domain")];
[assembly:AssemblyVersionAttribute(INTEROP_VERSION)];
[assembly:AssemblyFileVersionAttribute(INTEROP_VERSION)];
Index: SQLite.Interop/src/win/crypt.c
==================================================================
--- SQLite.Interop/src/win/crypt.c
+++ SQLite.Interop/src/win/crypt.c
@@ -41,16 +41,26 @@
/* Create a cryptographic context. Use the enhanced provider because it is available on
** most platforms
*/
static BOOL InitializeProvider()
{
- if (g_hProvider) return TRUE;
+ MUTEX_LOGIC( sqlite3_mutex *pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER); )
+ sqlite3_mutex_enter(pMaster);
+
+ if (g_hProvider)
+ {
+ sqlite3_mutex_leave(pMaster);
+ return TRUE;
+ }
if (!CryptAcquireContext(&g_hProvider, NULL, MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
{
+ sqlite3_mutex_leave(pMaster);
return FALSE;
}
+
+ sqlite3_mutex_leave(pMaster);
return TRUE;
}
/* Create or update a cryptographic context for a pager.
** This function will automatically determine if the encryption algorithm requires
@@ -226,18 +236,26 @@
if (!InitializeProvider())
{
return MAXDWORD;
}
- if (CryptCreateHash(g_hProvider, CALG_SHA1, 0, 0, &hHash))
- {
- if (CryptHashData(hHash, (LPBYTE)pKey, nKeyLen, 0))
- {
- CryptDeriveKey(g_hProvider, CALG_RC4, hHash, 0, &hKey);
- }
- CryptDestroyHash(hHash);
- }
+ {
+ MUTEX_LOGIC( sqlite3_mutex *pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER); )
+ sqlite3_mutex_enter(pMaster);
+
+ if (CryptCreateHash(g_hProvider, CALG_SHA1, 0, 0, &hHash))
+ {
+ if (CryptHashData(hHash, (LPBYTE)pKey, nKeyLen, 0))
+ {
+ CryptDeriveKey(g_hProvider, CALG_RC4, hHash, 0, &hKey);
+ }
+ CryptDestroyHash(hHash);
+ }
+
+ sqlite3_mutex_leave(pMaster);
+ }
+
return hKey;
}
/* Called by sqlite and sqlite3_key_interop to attach a key to a database. */
int sqlite3CodecAttach(sqlite3 *db, int nDb, const void *pKey, int nKeyLen)
Index: SQLite.Interop/src/win/interop.c
==================================================================
--- SQLite.Interop/src/win/interop.c
+++ SQLite.Interop/src/win/interop.c
@@ -75,11 +75,11 @@
SQLITE_PRIVATE void sqlite3InteropLogCallback(void *pArg, int iCode, const char *zMsg){
sqlite3InteropDebug("INTEROP_LOG (%d) %s\n", iCode, zMsg);
}
#endif
-#if SQLITE_VERSION_NUMBER < 3007014
+#if defined(INTEROP_LEGACY_CLOSE) || SQLITE_VERSION_NUMBER < 3007014
SQLITE_PRIVATE void * sqlite3DbMallocZero_interop(sqlite3 *db, int n)
{
void *p;
if (db) {
sqlite3_mutex_enter(db->mutex);
@@ -120,11 +120,11 @@
GC gets around to calling finalize_interop() on the "bad" statement, we detect that and finish deallocating the pointer.
*/
SQLITE_API int WINAPI sqlite3_close_interop(sqlite3 *db)
{
int ret;
-#if SQLITE_VERSION_NUMBER >= 3007014
+#if !defined(INTEROP_LEGACY_CLOSE) && SQLITE_VERSION_NUMBER >= 3007014
#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_CLOSE)
sqlite3InteropDebug("sqlite3_close_interop(): calling sqlite3_close_v2(%p)...\n", db);
#endif
@@ -403,11 +403,11 @@
}
SQLITE_API int WINAPI sqlite3_finalize_interop(sqlite3_stmt *stmt)
{
int ret;
-#if SQLITE_VERSION_NUMBER >= 3007014
+#if !defined(INTEROP_LEGACY_CLOSE) && SQLITE_VERSION_NUMBER >= 3007014
#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_FINALIZE)
Vdbe *p = (Vdbe *)stmt;
sqlite3 *db = p->db;
sqlite3InteropDebug("sqlite3_finalize_interop(): calling sqlite3_finalize(%p, %p)...\n", db, stmt);
@@ -420,11 +420,11 @@
#endif
return ret;
#else
Vdbe *p;
- int ret = SQLITE_OK;
+ ret = SQLITE_OK;
p = (Vdbe *)stmt;
if (p)
{
sqlite3 *db = p->db;
@@ -469,11 +469,11 @@
}
SQLITE_API int WINAPI sqlite3_reset_interop(sqlite3_stmt *stmt)
{
int ret;
-#if SQLITE_VERSION_NUMBER >= 3007014
+#if !defined(INTEROP_LEGACY_CLOSE) && SQLITE_VERSION_NUMBER >= 3007014
#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_RESET)
sqlite3InteropDebug("sqlite3_reset_interop(): calling sqlite3_reset(%p)...\n", stmt);
#endif
@@ -775,10 +775,33 @@
sqlite3_result_text(context, (char*)z, -1, SQLITE_STATIC);
}else{
sqlite3_result_null(context);
}
}
+
+/*
+** The interopSleep() SQL function waits the specified number of milliseconds
+** or raises an error if there are not enough arguments.
+*/
+SQLITE_PRIVATE void interopSleepFunc(
+ sqlite3_context *context,
+ int argc,
+ sqlite3_value **argv
+){
+ int m;
+ if( argc!=1 ){
+ sqlite3_result_error(context, "need exactly one argument", -1);
+ return;
+ }
+ m = sqlite3_value_int(argv[0]);
+#if SQLITE_OS_WINCE
+ Sleep(m);
+ sqlite3_result_int(context, WAIT_OBJECT_0);
+#else
+ sqlite3_result_int(context, SleepEx(m, TRUE));
+#endif
+}
/* SQLite invokes this routine once when it loads the extension.
** Create new functions, collating sequences, and virtual table
** modules here. This is usually the only exported symbol in
** the shared library.
@@ -786,10 +809,16 @@
SQLITE_API int interop_test_extension_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
){
+ int rc;
SQLITE_EXTENSION_INIT2(pApi)
- return sqlite3_create_function(db, "interopTest", -1, SQLITE_ANY, 0,
+ rc = sqlite3_create_function(db, "interopTest", -1, SQLITE_ANY, 0,
interopTestFunc, 0, 0);
+ if( rc==SQLITE_OK ){
+ rc = sqlite3_create_function(db, "interopSleep", 1, SQLITE_ANY, 0,
+ interopSleepFunc, 0, 0);
+ }
+ return rc;
}
#endif
Index: SQLite.Interop/src/win/interop.h
==================================================================
--- SQLite.Interop/src/win/interop.h
+++ SQLite.Interop/src/win/interop.h
@@ -4,7 +4,7 @@
* Written by Joe Mistachkin.
* Released to the public domain, use at your own risk!
*/
#ifndef INTEROP_VERSION
-#define INTEROP_VERSION "1.0.83.0"
+#define INTEROP_VERSION "1.0.85.0"
#endif
Index: SQLite.MSIL.nuspec
==================================================================
--- SQLite.MSIL.nuspec
+++ SQLite.MSIL.nuspec
@@ -8,11 +8,11 @@
*
-->
System.Data.SQLite.MSIL
- 1.0.83.0
+ 1.0.85.0
SQLite Development Team
An ADO.NET provider for SQLite (managed-only).
en-US
http://system.data.sqlite.org/
http://system.data.sqlite.org/images/sqlite32.png
@@ -21,9 +21,11 @@
Public Domain
Index: SQLite.NET.Settings.targets
==================================================================
--- SQLite.NET.Settings.targets
+++ SQLite.NET.Settings.targets
@@ -31,22 +31,26 @@
contained settings, if any, will override the default ones provided
below.
-->
false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
true
false
+
+ false
+
System.Data.SQLite
System.Data.SQLite (x86/x64)
- 1.0.83.0
+ 1.0.85.0
SQLite Development Team
The official SQLite database engine for both x86 and x64 along with the ADO.NET provider.
en-US
http://system.data.sqlite.org/
http://system.data.sqlite.org/images/sqlite32.png
@@ -22,14 +22,18 @@
Public Domain
Index: SQLite.x64.nuspec
==================================================================
--- SQLite.x64.nuspec
+++ SQLite.x64.nuspec
@@ -8,11 +8,11 @@
*
-->
System.Data.SQLite.x64
- 1.0.83.0
+ 1.0.85.0
SQLite Development Team
The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x64.
en-US
http://system.data.sqlite.org/
http://system.data.sqlite.org/images/sqlite32.png
@@ -21,9 +21,11 @@
Public Domain
Index: SQLite.x86.nuspec
==================================================================
--- SQLite.x86.nuspec
+++ SQLite.x86.nuspec
@@ -8,11 +8,11 @@
*
-->
System.Data.SQLite.x86
- 1.0.83.0
+ 1.0.85.0
SQLite Development Team
The official SQLite database engine combined with a complete ADO.NET provider all rolled into a single mixed-mode assembly for x86.
en-US
http://system.data.sqlite.org/
http://system.data.sqlite.org/images/sqlite32.png
@@ -21,9 +21,11 @@
Public Domain
Index: Setup/SQLite.iss
==================================================================
--- Setup/SQLite.iss
+++ Setup/SQLite.iss
@@ -81,11 +81,11 @@
#else
Components: Application\Core\MSIL Or Application\LINQ; Name: gac; Description: Install the assemblies into the global assembly cache.; Flags: unchecked; Check: CheckIsNetFx2Setup() or CheckIsNetFx4Setup()
#endif
#if AppProcessor == "x86"
-#if Year == "2005" || Year == "2008"
+#if Year == "2005"
Components: {#InstallerCondition}; Name: gac\vs2005; Description: Install the designer components for Visual Studio 2005.; Flags: unchecked; Check: CheckIsNetFx2Setup()
#endif
#if Year == "2008"
Components: {#InstallerCondition}; Name: gac\vs2008; Description: Install the designer components for Visual Studio 2008.; Flags: unchecked; Check: CheckIsNetFx2Setup()
#endif
@@ -106,11 +106,11 @@
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx2InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup() and CheckForNetFx35(1)
Components: Application\LINQ; Tasks: ngen; Filename: {code:GetNetFx4InstallRoot|Ngen.exe}; Parameters: "install ""{app}\bin\System.Data.SQLite.Linq.dll"" /nologo"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
#endif
#if Pos("NativeOnly", AppConfiguration) == 0 && AppProcessor == "x86"
-#if Year == "2005" || Year == "2008"
+#if Year == "2005"
Components: {#InstallerCondition}; Tasks: gac\vs2005; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx35 true -noNetFx40 true -noNetFx45 true -noVs2008 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
#endif
#if Year == "2008"
Components: {#InstallerCondition}; Tasks: gac\vs2008; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
#endif
@@ -117,27 +117,27 @@
#if Year == "2010"
Components: {#InstallerCondition}; Tasks: gac\vs2010; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
#endif
#if Year == "2012"
Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
-Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-perUser true -install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -vsVersionSuffix _Config -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-perUser true -install true -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -vsVersionSuffix _Config -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
#endif
#endif
[UninstallRun]
#if Pos("NativeOnly", AppConfiguration) == 0 && AppProcessor == "x86"
#if Year == "2012"
-Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-perUser true -install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -vsVersionSuffix _Config -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
+Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-perUser true -install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -vsVersionSuffix _Config -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
Components: {#InstallerCondition}; Tasks: gac\vs2012; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx40 true -noVs2005 true -noVs2008 true -noVs2010 true -configVersion 4.0.30319 -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
#endif
#if Year == "2010"
Components: {#InstallerCondition}; Tasks: gac\vs2010; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx20 true -noNetFx45 true -noVs2005 true -noVs2008 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx4Setup()
#endif
#if Year == "2008"
Components: {#InstallerCondition}; Tasks: gac\vs2008; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx40 true -noNetFx45 true -noVs2005 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
#endif
-#if Year == "2005" || Year == "2008"
+#if Year == "2005"
Components: {#InstallerCondition}; Tasks: gac\vs2005; Filename: {app}\bin\Installer.exe; Parameters: "-install false -wow64 true -installFlags AllExceptGlobalAssemblyCache -tracePriority Lowest -verbose true -noCompact true -noNetFx35 true -noNetFx40 true -noNetFx45 true -noVs2008 true -noVs2010 true -noVs2012 true -whatIf false -confirm true"; Flags: skipifdoesntexist; Check: CheckIsNetFx2Setup()
#endif
#endif
#if Year != "2005"
Index: Setup/build_ce.bat
==================================================================
--- Setup/build_ce.bat
+++ Setup/build_ce.bat
@@ -28,11 +28,11 @@
SET TOOLS=%~dp0
SET TOOLS=%TOOLS:~0,-1%
%_VECHO% Tools = '%TOOLS%'
-SET BUILD_CONFIGURATIONS=Release
+SET BUILD_CONFIGURATIONS=Debug Release
SET BASE_CONFIGURATIONSUFFIX=Compact
SET PLATFORMS="Pocket PC 2003 (ARMV4)"
SET PROCESSORS=arm
SET YEARS=2008
SET BASE_PLATFORM=PocketPC
Index: Setup/verify.lst
==================================================================
--- Setup/verify.lst
+++ Setup/verify.lst
@@ -80,10 +80,11 @@
Setup/build.bat
Setup/build_all.bat
Setup/build_ce.bat
Setup/CheckForNetFx.pas
Setup/clean.bat
+ Setup/deployAndTestCe.eagle
Setup/InitializeSetup.pas
Setup/release.bat
Setup/release_all.bat
Setup/release_ce.bat
Setup/release_static.bat
@@ -128,14 +129,16 @@
Setup/set_x86_2008.bat
Setup/set_x86_2010.bat
Setup/set_x86_2012.bat
Setup/SQLite.iss
Setup/test_all.bat
+ Setup/test_ce.bat
Setup/updateFileInfo.tcl
Setup/verify.eagle
Setup/verify.lst
Setup/vsSp.bat
+ SQLite.Beta.nuspec
SQLite.Designer/
SQLite.Designer/AssemblyInfo.cs
SQLite.Designer/ChangePasswordDialog.cs
SQLite.Designer/ChangePasswordDialog.Designer.cs
SQLite.Designer/ChangePasswordDialog.resx
@@ -245,10 +248,11 @@
SQLite.NET.2010.MSBuild.sln
SQLite.NET.2010.sln
SQLite.NET.2012.MSBuild.sln
SQLite.NET.2012.sln
SQLite.NET.Settings.targets
+ SQLite.NET.Settings.targets.netFx35
SQLite.NET.targets
SQLite.nuspec
SQLite.x64.nuspec
SQLite.x86.nuspec
System.Data.SQLite/
@@ -392,19 +396,21 @@
Tests/
Tests/all.eagle
Tests/backup.eagle
Tests/basic.eagle
Tests/common.eagle
+ Tests/empty.eagle
Tests/installer.eagle
Tests/Installer_Test_Vs2005.log
Tests/Installer_Test_Vs2008.log
Tests/Installer_Test_Vs2010.log
Tests/Installer_Test_Vs2012.log
Tests/nonWal.db
Tests/pkgIndex.eagle
Tests/stress.eagle
Tests/testlinq.out
+ Tests/thread.eagle
Tests/tkt-00f86f9739.eagle
Tests/tkt-0d5b1ef362.eagle
Tests/tkt-17045010df.eagle
Tests/tkt-201128cc88.eagle
Tests/tkt-2c630bffa7.eagle
@@ -412,18 +418,21 @@
Tests/tkt-343d392b51.eagle
Tests/tkt-3aa50d8413.eagle
Tests/tkt-448d663d11.eagle
Tests/tkt-544dba0a2f.eagle
Tests/tkt-59edc1018b.eagle
+ Tests/tkt-6434e23a0f.eagle
+ Tests/tkt-6c6ecccc5f.eagle
Tests/tkt-72905c9a77.eagle
Tests/tkt-7e3fa93744.eagle
Tests/tkt-84718e79fa.eagle
Tests/tkt-8554170e09.eagle
Tests/tkt-8b7d179c3c.eagle
Tests/tkt-8c3bee31c8.eagle
Tests/tkt-996d13cd87.eagle
Tests/tkt-ac47dd230a.eagle
+ Tests/tkt-ae5267b863.eagle
Tests/tkt-b4a7ddc83f.eagle
Tests/tkt-bb4b04d457.eagle
Tests/tkt-ccfa69fc32.eagle
Tests/tkt-e1b2e0f769.eagle
Tests/tkt-e30b820248.eagle
Index: System.Data.SQLite.Linq/AssemblyInfo.cs
==================================================================
--- System.Data.SQLite.Linq/AssemblyInfo.cs
+++ System.Data.SQLite.Linq/AssemblyInfo.cs
@@ -42,7 +42,7 @@
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.83.0")]
-[assembly: AssemblyFileVersion("1.0.83.0")]
+[assembly: AssemblyVersion("1.0.85.0")]
+[assembly: AssemblyFileVersion("1.0.85.0")]
Index: System.Data.SQLite/AssemblyInfo.cs
==================================================================
--- System.Data.SQLite/AssemblyInfo.cs
+++ System.Data.SQLite/AssemblyInfo.cs
@@ -62,9 +62,9 @@
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.83.0")]
+[assembly: AssemblyVersion("1.0.85.0")]
#if !PLATFORM_COMPACTFRAMEWORK
-[assembly: AssemblyFileVersion("1.0.83.0")]
+[assembly: AssemblyFileVersion("1.0.85.0")]
#endif
Index: System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
==================================================================
--- System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
+++ System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
@@ -24,18 +24,18 @@
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
-#if !PLATFORM_COMPACTFRAMEWORK
- SQLiteLog.Initialize();
-#elif INTEROP_LOG
+#if INTEROP_LOG
if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
}
+#else
+ SQLiteLog.Initialize();
#endif
string version =
#if NET_40 || NET_45
"4.0.0.0";
Index: System.Data.SQLite/SQLite3.cs
==================================================================
--- System.Data.SQLite/SQLite3.cs
+++ System.Data.SQLite/SQLite3.cs
@@ -55,11 +55,11 @@
"b621ddff5d844727418956997f475eb829429e411aff3e93f97b70de698b972640925bdd44280df0" +
"a25a843266973704137cbb0e7441c1fe7cae4e2440ae91ab8cde3933febcb1ac48dd33b40e13c421" +
"d8215c18a4349a436dd499e3c385cc683015f886f6c10bd90115eb2bd61b67750839e3a19941dc9c";
#if !PLATFORM_COMPACTFRAMEWORK
- internal const string DesignerVersion = "1.0.83.0";
+ internal const string DesignerVersion = "1.0.85.0";
#endif
///
/// The opaque pointer returned to us by the sqlite provider
///
@@ -516,20 +516,18 @@
}
SQLiteConnectionFlags flags =
(cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default;
-#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogPrepare) == SQLiteConnectionFlags.LogPrepare)
{
if ((strSql == null) || (strSql.Length == 0) || (strSql.Trim().Length == 0))
SQLiteLog.LogMessage("Preparing {}...");
else
SQLiteLog.LogMessage(String.Format(
CultureInfo.CurrentCulture, "Preparing {{{0}}}...", strSql));
}
-#endif
IntPtr stmt = IntPtr.Zero;
IntPtr ptr = IntPtr.Zero;
int len = 0;
SQLiteErrorCode n = SQLiteErrorCode.Schema;
@@ -651,11 +649,10 @@
{
handle.Free();
}
}
-#if !PLATFORM_COMPACTFRAMEWORK
protected static void LogBind(SQLiteStatementHandle handle, int index)
{
IntPtr handleIntPtr = handle;
SQLiteLog.LogMessage(String.Format(
@@ -726,22 +723,21 @@
SQLiteLog.LogMessage(String.Format(
"Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...",
handleIntPtr, index, typeof(Byte[]), (value != null) ? ToHexadecimalString(value) : ""));
}
-#endif
internal override void Bind_Double(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, double value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
-#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
+#if !PLATFORM_COMPACTFRAMEWORK
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
#else
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
@@ -749,16 +745,14 @@
internal override void Bind_Int32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, int value)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
-#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
LogBind(handle, index, value);
}
-#endif
SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int(handle, index, value);
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
@@ -771,11 +765,26 @@
{
LogBind(handle, index, value);
}
#endif
- SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint(handle, index, value);
+ SQLiteErrorCode n;
+
+ if ((flags & SQLiteConnectionFlags.BindUInt32AsInt64) == SQLiteConnectionFlags.BindUInt32AsInt64)
+ {
+ long value2 = value;
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value2);
+#else
+ n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value2);
+#endif
+ }
+ else
+ {
+ n = UnsafeNativeMethods.sqlite3_bind_uint(handle, index, value);
+ }
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
}
internal override void Bind_Int64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, long value)
{
@@ -950,20 +959,18 @@
internal override int Bind_ParamCount(SQLiteStatement stmt, SQLiteConnectionFlags flags)
{
SQLiteStatementHandle handle = stmt._sqlite_stmt;
int value = UnsafeNativeMethods.sqlite3_bind_parameter_count(handle);
-#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
IntPtr handleIntPtr = handle;
SQLiteLog.LogMessage(String.Format(
"Statement {0} paramter count is {1}.",
handleIntPtr, value));
}
-#endif
return value;
}
internal override string Bind_ParamName(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index)
@@ -976,39 +983,35 @@
name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name_interop(handle, index, out len), len);
#else
name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name(handle, index), -1);
#endif
-#if !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
IntPtr handleIntPtr = handle;
SQLiteLog.LogMessage(String.Format(
"Statement {0} paramter #{1} name is {{{2}}}.",
handleIntPtr, index, name));
}
-#endif
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 !PLATFORM_COMPACTFRAMEWORK
if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
{
IntPtr handleIntPtr = handle;
SQLiteLog.LogMessage(String.Format(
"Statement {0} paramter index of name {{{1}}} is #{2}.",
handleIntPtr, paramName, index));
}
-#endif
return index;
}
internal override int ColumnCount(SQLiteStatement stmt)
@@ -1146,15 +1149,40 @@
#else
UnsafeNativeMethods.sqlite3_column_double_interop(stmt._sqlite_stmt, index, out value);
#endif
return value;
}
+
+ internal override sbyte GetSByte(SQLiteStatement stmt, int index)
+ {
+ return unchecked((sbyte)(GetInt32(stmt, index) & byte.MaxValue));
+ }
+
+ internal override byte GetByte(SQLiteStatement stmt, int index)
+ {
+ return unchecked((byte)(GetInt32(stmt, index) & byte.MaxValue));
+ }
+
+ internal override short GetInt16(SQLiteStatement stmt, int index)
+ {
+ return unchecked((short)(GetInt32(stmt, index) & ushort.MaxValue));
+ }
+
+ internal override ushort GetUInt16(SQLiteStatement stmt, int index)
+ {
+ return unchecked((ushort)(GetInt32(stmt, index) & ushort.MaxValue));
+ }
internal override int GetInt32(SQLiteStatement stmt, int index)
{
return UnsafeNativeMethods.sqlite3_column_int(stmt._sqlite_stmt, index);
}
+
+ internal override uint GetUInt32(SQLiteStatement stmt, int index)
+ {
+ return unchecked((uint)GetInt32(stmt, index));
+ }
internal override long GetInt64(SQLiteStatement stmt, int index)
{
long value;
#if !PLATFORM_COMPACTFRAMEWORK
@@ -1162,10 +1190,15 @@
#else
UnsafeNativeMethods.sqlite3_column_int64_interop(stmt._sqlite_stmt, index, out value);
#endif
return value;
}
+
+ internal override ulong GetUInt64(SQLiteStatement stmt, int index)
+ {
+ return unchecked((ulong)GetInt64(stmt, index));
+ }
internal override string GetText(SQLiteStatement stmt, int index)
{
#if !SQLITE_STANDARD
int len;
@@ -1844,21 +1877,19 @@
// BUGFIX: Prevent races with other threads for this entire block, due
// to the try/finally semantics. See ticket [72905c9a77].
//
lock (syncRoot)
{
-#if !PLATFORM_COMPACTFRAMEWORK
//
// NOTE: Save the state of the logging class and then restore it
// after we are done to avoid logging too many false errors.
//
bool savedEnabled = SQLiteLog.Enabled;
SQLiteLog.Enabled = false;
try
{
-#endif
//
// NOTE: This method [ab]uses the fact that SQLite will always
// return SQLITE_ERROR for any unknown configuration option
// *unless* the SQLite library has already been initialized.
// In that case it will always return SQLITE_MISUSE.
@@ -1865,17 +1896,15 @@
//
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_none(
SQLiteConfigOpsEnum.SQLITE_CONFIG_NONE);
return (rc == SQLiteErrorCode.Misuse);
-#if !PLATFORM_COMPACTFRAMEWORK
}
finally
{
SQLiteLog.Enabled = savedEnabled;
}
-#endif
}
}
///
/// Helper function to retrieve a column of data from an active statement.
@@ -1912,16 +1941,21 @@
return b;
case TypeAffinity.DateTime:
return GetDateTime(stmt, index);
case TypeAffinity.Double:
if (t == null) return GetDouble(stmt, index);
- else
- return Convert.ChangeType(GetDouble(stmt, index), t, null);
+ return Convert.ChangeType(GetDouble(stmt, index), t, null);
case TypeAffinity.Int64:
if (t == null) return GetInt64(stmt, index);
- else
- return Convert.ChangeType(GetInt64(stmt, index), t, null);
+ if (t == typeof(SByte)) return GetSByte(stmt, index);
+ if (t == typeof(Byte)) return GetByte(stmt, index);
+ if (t == typeof(Int16)) return GetInt16(stmt, index);
+ if (t == typeof(UInt16)) return GetUInt16(stmt, index);
+ if (t == typeof(Int32)) return GetInt32(stmt, index);
+ if (t == typeof(UInt32)) return GetUInt32(stmt, index);
+ if (t == typeof(UInt64)) return GetUInt64(stmt, index);
+ return Convert.ChangeType(GetInt64(stmt, index), t, null);
default:
return GetText(stmt, index);
}
}
Index: System.Data.SQLite/SQLiteBase.cs
==================================================================
--- System.Data.SQLite/SQLiteBase.cs
+++ System.Data.SQLite/SQLiteBase.cs
@@ -161,12 +161,18 @@
internal abstract string ColumnTableName(SQLiteStatement stmt, int index);
internal abstract void ColumnMetaData(string dataBase, string table, string column, out string dataType, out string collateSequence, out bool notNull, out bool primaryKey, out bool autoIncrement);
internal abstract void GetIndexColumnExtendedInfo(string database, string index, string column, out int sortMode, out int onError, out string collationSequence);
internal abstract double GetDouble(SQLiteStatement stmt, int index);
+ internal abstract SByte GetSByte(SQLiteStatement stmt, int index);
+ internal abstract Byte GetByte(SQLiteStatement stmt, int index);
+ internal abstract Int16 GetInt16(SQLiteStatement stmt, int index);
+ internal abstract UInt16 GetUInt16(SQLiteStatement stmt, int index);
internal abstract Int32 GetInt32(SQLiteStatement stmt, int index);
+ internal abstract UInt32 GetUInt32(SQLiteStatement stmt, int index);
internal abstract Int64 GetInt64(SQLiteStatement stmt, int index);
+ internal abstract UInt64 GetUInt64(SQLiteStatement stmt, int index);
internal abstract string GetText(SQLiteStatement stmt, int index);
internal abstract long GetBytes(SQLiteStatement stmt, int index, int nDataoffset, byte[] bDest, int nStart, int nLength);
internal abstract long GetChars(SQLiteStatement stmt, int index, int nDataoffset, char[] bDest, int nStart, int nLength);
internal abstract DateTime GetDateTime(SQLiteStatement stmt, int index);
internal abstract bool IsNull(SQLiteStatement stmt, int index);
@@ -588,10 +594,11 @@
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError(hdl, db));
}
}
}
+#if !INTEROP_LEGACY_CLOSE
internal static void CloseConnectionV2(SQLiteConnectionHandle hdl, IntPtr db)
{
if ((hdl == null) || (db == IntPtr.Zero)) return;
try
@@ -615,10 +622,11 @@
#endif
if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError(hdl, db));
}
}
}
+#endif
internal static bool ResetConnection(SQLiteConnectionHandle hdl, IntPtr db, bool canThrow)
{
if ((hdl == null) || (db == IntPtr.Zero)) return false;
@@ -774,10 +782,24 @@
/// Skip adding the extension functions provided by the native
/// interop assembly.
///
NoExtensionFunctions = 0x20,
+ ///
+ /// When binding parameter values with the
+ BindUInt32AsInt64 = 0x40,
+
+ ///
+ /// When binding parameter values, always bind them as though they were
+ /// plain text (i.e. no numeric, date/time, or other conversions should
+ /// be attempted).
+ ///
+ BindAllAsText = 0x80,
+
///
/// Enable all logging.
///
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup,
Index: System.Data.SQLite/SQLiteCommand.cs
==================================================================
--- System.Data.SQLite/SQLiteCommand.cs
+++ System.Data.SQLite/SQLiteCommand.cs
@@ -20,10 +20,17 @@
#if !PLATFORM_COMPACTFRAMEWORK
[Designer("SQLite.Designer.SQLiteCommandDesigner, SQLite.Designer, Version=" + SQLite3.DesignerVersion + ", Culture=neutral, PublicKeyToken=db937bc2d44ff139"), ToolboxItem(true)]
#endif
public sealed class SQLiteCommand : DbCommand, ICloneable
{
+ ///
+ /// The default connection string to be used when creating a temporary
+ /// connection to execute a command via the static
+ private static readonly string DefaultConnectionString = "Data Source=:memory:;";
+
///
/// The command text this command is based on
///
private string _commandText;
///
@@ -593,10 +600,93 @@
/// Returns a SQLiteDataReader object
protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
{
return ExecuteReader(behavior);
}
+
+ ///
+ /// This method creates a new connection, executes the query using the given
+ /// execution type, closes the connection, and returns the results. If the
+ /// connection string is null, a temporary in-memory database connection will
+ /// be used.
+ ///
+ ///
+ /// The text of the command to be executed.
+ ///
+ ///
+ /// The execution type for the command. This is used to determine which method
+ /// of the command object to call, which then determines the type of results
+ /// returned, if any.
+ ///
+ ///
+ /// The connection string to the database to be opened, used, and closed. If
+ /// this parameter is null, a temporary in-memory databse will be used.
+ ///
+ ///
+ /// The SQL parameter values to be used when building the command object to be
+ /// executed, if any.
+ ///
+ ///
+ /// The results of the query -OR- null if no results were produced from the
+ /// given execution type.
+ ///
+ public static object Execute(
+ string commandText,
+ SQLiteExecuteType executeType,
+ string connectionString,
+ params object[] args
+ )
+ {
+ if (connectionString == null)
+ connectionString = DefaultConnectionString;
+
+ using (SQLiteConnection connection = new SQLiteConnection(connectionString))
+ {
+ connection.Open();
+
+ using (SQLiteCommand command = connection.CreateCommand())
+ {
+ command.CommandText = commandText;
+
+ if (args != null)
+ {
+ foreach (object arg in args)
+ {
+ if (arg is SQLiteParameter)
+ command.Parameters.Add((SQLiteParameter)arg);
+ else
+ command.Parameters.Add(new SQLiteParameter(DbType.Object, arg));
+ }
+ }
+
+ switch (executeType)
+ {
+ case SQLiteExecuteType.None:
+ {
+ //
+ // NOTE: Do nothing.
+ //
+ break;
+ }
+ case SQLiteExecuteType.NonQuery:
+ {
+ return command.ExecuteNonQuery();
+ }
+ case SQLiteExecuteType.Scalar:
+ {
+ return command.ExecuteScalar();
+ }
+ case SQLiteExecuteType.Reader:
+ {
+ return command.ExecuteReader();
+ }
+ }
+ }
+ }
+
+ return null;
+ }
///
/// Overrides the default behavior to return a SQLiteDataReader specialization class
///
/// The flags to be associated with the reader
Index: System.Data.SQLite/SQLiteConnection.cs
==================================================================
--- System.Data.SQLite/SQLiteConnection.cs
+++ System.Data.SQLite/SQLiteConnection.cs
@@ -14,10 +14,11 @@
using System.Collections.Generic;
using System.Globalization;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.IO;
+ using System.Text;
/////////////////////////////////////////////////////////////////////////////////////////////////
///
/// Event data for connection event handlers.
@@ -179,19 +180,32 @@
/// Password
/// {password} - Using this parameter requires that the CryptoAPI based codec be enabled at compile-time for both the native interop assembly and the core managed assemblies; otherwise, using this parameter may result in an exception being thrown when attempting to open the connection.
/// N
///
/// True if a new row was successfully loaded and is ready for processing
public override bool Read()
{
CheckDisposed();
- CheckClosed();
- SQLiteCommand.Check(_command);
+ CheckClosed();
+ if (_throwOnDisposed) SQLiteCommand.Check(_command);
if (_readingState == -1) // First step was already done at the NextResult() level, so don't step again, just return true.
{
_readingState = 0;
return true;
Index: System.Data.SQLite/SQLiteDefineConstants.cs
==================================================================
--- System.Data.SQLite/SQLiteDefineConstants.cs
+++ System.Data.SQLite/SQLiteDefineConstants.cs
@@ -33,10 +33,14 @@
#endif
#if INTEROP_EXTENSION_FUNCTIONS
"INTEROP_EXTENSION_FUNCTIONS",
#endif
+
+#if INTEROP_LEGACY_CLOSE
+ "INTEROP_LEGACY_CLOSE",
+#endif
#if INTEROP_LOG
"INTEROP_LOG",
#endif
Index: System.Data.SQLite/SQLiteException.cs
==================================================================
--- System.Data.SQLite/SQLiteException.cs
+++ System.Data.SQLite/SQLiteException.cs
@@ -1,119 +1,119 @@
-/********************************************************
- * ADO.NET 2.0 Data Provider for SQLite Version 3.X
- * Written by Robert Simpson (robert@blackcastlesoft.com)
- *
- * Released to the public domain, use at your own risk!
- ********************************************************/
-
-namespace System.Data.SQLite
-{
+/********************************************************
+ * ADO.NET 2.0 Data Provider for SQLite Version 3.X
+ * Written by Robert Simpson (robert@blackcastlesoft.com)
+ *
+ * Released to the public domain, use at your own risk!
+ ********************************************************/
+
+namespace System.Data.SQLite
+{
using System;
- using System.Data.Common;
-
-#if !PLATFORM_COMPACTFRAMEWORK
- using System.Reflection;
- using System.Runtime.Serialization;
+ using System.Data.Common;
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ using System.Reflection;
+ using System.Runtime.Serialization;
using System.Security.Permissions;
-#endif
-
- ///
- /// SQLite exception class.
- ///
-#if !PLATFORM_COMPACTFRAMEWORK
- [Serializable()]
- public sealed class SQLiteException : DbException, ISerializable
-#else
- public sealed class SQLiteException : Exception
-#endif
- {
- private SQLiteErrorCode _errorCode;
-
-#if !PLATFORM_COMPACTFRAMEWORK
- ///
- /// Private constructor for use with serialization.
- ///
- ///
- /// Holds the serialized object data about the exception being thrown.
- ///
- ///
- /// Contains contextual information about the source or destination.
- ///
- private SQLiteException(SerializationInfo info, StreamingContext context)
- : base(info, context)
- {
- _errorCode = (SQLiteErrorCode)info.GetInt32("errorCode");
- }
-#endif
-
- ///
- /// Public constructor for generating a SQLite exception given the error
- /// code and message.
- ///
- ///
- /// The SQLite return code to report.
- ///
- ///
- /// Message text to go along with the return code message text.
- ///
- public SQLiteException(SQLiteErrorCode errorCode, string message)
- : base(GetStockErrorMessage(errorCode, message))
- {
- _errorCode = errorCode;
- }
-
- ///
- /// Public constructor that uses the base class constructor for the error
- /// message.
- ///
- /// Error message text.
- public SQLiteException(string message)
- : base(message)
- {
- }
-
- ///
- /// Public constructor that uses the default base class constructor.
- ///
- public SQLiteException()
- {
- }
-
- ///
- /// Public constructor that uses the base class constructor for the error
- /// message and inner exception.
- ///
- /// Error message text.
- /// The original (inner) exception.
- public SQLiteException(string message, Exception innerException)
- : base(message, innerException)
- {
- }
-
-#if !PLATFORM_COMPACTFRAMEWORK
- ///
- /// Adds extra information to the serialized object data specific to this
- /// class type. This is only used for serialization.
- ///
- ///
- /// Holds the serialized object data about the exception being thrown.
- ///
- ///
- /// Contains contextual information about the source or destination.
- ///
- [SecurityPermission(
- SecurityAction.LinkDemand,
- Flags = SecurityPermissionFlag.SerializationFormatter)]
- public override void GetObjectData(
- SerializationInfo info,
- StreamingContext context)
- {
- if (info != null)
- info.AddValue("errorCode", _errorCode);
-
- base.GetObjectData(info, context);
- }
+#endif
+
+ ///
+ /// SQLite exception class.
+ ///
+#if !PLATFORM_COMPACTFRAMEWORK
+ [Serializable()]
+ public sealed class SQLiteException : DbException, ISerializable
+#else
+ public sealed class SQLiteException : Exception
+#endif
+ {
+ private SQLiteErrorCode _errorCode;
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ ///
+ /// Private constructor for use with serialization.
+ ///
+ ///
+ /// Holds the serialized object data about the exception being thrown.
+ ///
+ ///
+ /// Contains contextual information about the source or destination.
+ ///
+ private SQLiteException(SerializationInfo info, StreamingContext context)
+ : base(info, context)
+ {
+ _errorCode = (SQLiteErrorCode)info.GetInt32("errorCode");
+ }
+#endif
+
+ ///
+ /// Public constructor for generating a SQLite exception given the error
+ /// code and message.
+ ///
+ ///
+ /// The SQLite return code to report.
+ ///
+ ///
+ /// Message text to go along with the return code message text.
+ ///
+ public SQLiteException(SQLiteErrorCode errorCode, string message)
+ : base(GetStockErrorMessage(errorCode, message))
+ {
+ _errorCode = errorCode;
+ }
+
+ ///
+ /// Public constructor that uses the base class constructor for the error
+ /// message.
+ ///
+ /// Error message text.
+ public SQLiteException(string message)
+ : base(message)
+ {
+ }
+
+ ///
+ /// Public constructor that uses the default base class constructor.
+ ///
+ public SQLiteException()
+ {
+ }
+
+ ///
+ /// Public constructor that uses the base class constructor for the error
+ /// message and inner exception.
+ ///
+ /// Error message text.
+ /// The original (inner) exception.
+ public SQLiteException(string message, Exception innerException)
+ : base(message, innerException)
+ {
+ }
+
+#if !PLATFORM_COMPACTFRAMEWORK
+ ///
+ /// Adds extra information to the serialized object data specific to this
+ /// class type. This is only used for serialization.
+ ///
+ ///
+ /// Holds the serialized object data about the exception being thrown.
+ ///
+ ///
+ /// Contains contextual information about the source or destination.
+ ///
+ [SecurityPermission(
+ SecurityAction.LinkDemand,
+ Flags = SecurityPermissionFlag.SerializationFormatter)]
+ public override void GetObjectData(
+ SerializationInfo info,
+ StreamingContext context)
+ {
+ if (info != null)
+ info.AddValue("errorCode", _errorCode);
+
+ base.GetObjectData(info, context);
+ }
#endif
///
/// Gets the associated SQLite return code for this exception as a
///
public SQLiteErrorCode ReturnCode
{
get { return _errorCode; }
}
-
+
///
- /// Gets the associated SQLite return code for this exception as an
+ /// Gets the associated SQLite return code for this exception as an
///
-#if !PLATFORM_COMPACTFRAMEWORK
- public override int ErrorCode
-#else
- public int ErrorCode
-#endif
- {
- get { return (int)_errorCode; }
- }
-
- ///
- /// Returns the error message for the specified SQLite return code.
- ///
- /// The SQLite return code.
- /// The error message or null if it cannot be found.
- private static string GetErrorString(
- SQLiteErrorCode errorCode
- )
- {
-#if !PLATFORM_COMPACTFRAMEWORK
- //
- // HACK: This must be done via reflection in order to prevent
- // the RuntimeHelpers.PrepareDelegate method from over-
- // eagerly attempting to locate the new (and optional)
- // sqlite3_errstr() function in the SQLite core library
- // because it happens to be in the static call graph for
- // the AppDomain.DomainUnload event handler registered
- // by the SQLiteLog class.
- //
- BindingFlags flags = BindingFlags.Static |
- BindingFlags.NonPublic | BindingFlags.InvokeMethod;
-
- return typeof(SQLiteBase).InvokeMember("GetErrorString",
- flags, null, null, new object[] { errorCode }) as string;
-#else
- return SQLiteBase.GetErrorString(errorCode);
-#endif
- }
-
- ///
- /// Returns the composite error message based on the SQLite return code
- /// and the optional detailed error message.
- ///
- /// The SQLite return code.
- /// Optional detailed error message.
- /// Error message text for the return code.
- private static string GetStockErrorMessage(
- SQLiteErrorCode errorCode,
- string message
- )
- {
- return String.Format("{0}{1}{2}",
- GetErrorString(errorCode),
- Environment.NewLine, message).Trim();
- }
- }
-
- ///
- /// SQLite error codes. Actually, this enumeration represents a return code,
- /// which may also indicate success in one of several ways (e.g. SQLITE_OK,
- /// SQLITE_ROW, and SQLITE_DONE). Therefore, the name of this enumeration is
- /// something of a misnomer.
- ///
- public enum SQLiteErrorCode
- {
- ///
- /// Successful result
- ///
- Ok /* 0 */,
- ///
- /// SQL error or missing database
- ///
- Error /* 1 */,
- ///
- /// Internal logic error in SQLite
- ///
- Internal /* 2 */,
- ///
- /// Access permission denied
- ///
- Perm /* 3 */,
- ///
- /// Callback routine requested an abort
- ///
- Abort /* 4 */,
- ///
- /// The database file is locked
- ///
- Busy /* 5 */,
- ///
- /// A table in the database is locked
- ///
- Locked /* 6 */,
- ///
- /// A malloc() failed
- ///
- NoMem /* 7 */,
- ///
- /// Attempt to write a readonly database
- ///
- ReadOnly /* 8 */,
- ///
- /// Operation terminated by sqlite3_interrupt()
- ///
- Interrupt /* 9 */,
- ///
- /// Some kind of disk I/O error occurred
- ///
- IoErr /* 10 */,
- ///
- /// The database disk image is malformed
- ///
- Corrupt /* 11 */,
- ///
- /// Unknown opcode in sqlite3_file_control()
- ///
- NotFound /* 12 */,
- ///
- /// Insertion failed because database is full
- ///
- Full /* 13 */,
- ///
- /// Unable to open the database file
- ///
- CantOpen /* 14 */,
- ///
- /// Database lock protocol error
- ///
- Protocol /* 15 */,
- ///
- /// Database is empty
- ///
- Empty /* 16 */,
- ///
- /// The database schema changed
- ///
- Schema /* 17 */,
- ///
- /// String or BLOB exceeds size limit
- ///
- TooBig /* 18 */,
- ///
- /// Abort due to constraint violation
- ///
- Constraint /* 19 */,
- ///
- /// Data type mismatch
- ///
- Mismatch /* 20 */,
- ///
- /// Library used incorrectly
- ///
- Misuse /* 21 */,
- ///
- /// Uses OS features not supported on host
- ///
- NoLfs /* 22 */,
- ///
- /// Authorization denied
- ///
- Auth /* 23 */,
- ///
- /// Auxiliary database format error
- ///
- Format /* 24 */,
- ///
- /// 2nd parameter to sqlite3_bind out of range
- ///
- Range /* 25 */,
- ///
- /// File opened that is not a database file
- ///
- NotADb /* 26 */,
- ///
- /// sqlite3_step() has another row ready
- ///
- Row = 100,
- ///
- /// sqlite3_step() has finished executing
- ///
- Done /* 101 */
- }
-}
+ ///
+#if !PLATFORM_COMPACTFRAMEWORK
+ public override int ErrorCode
+#else
+ public int ErrorCode
+#endif
+ {
+ get { return (int)_errorCode; }
+ }
+
+ ///
+ /// Returns the error message for the specified SQLite return code.
+ ///
+ /// The SQLite return code.
+ /// The error message or null if it cannot be found.
+ private static string GetErrorString(
+ SQLiteErrorCode errorCode
+ )
+ {
+#if !PLATFORM_COMPACTFRAMEWORK
+ //
+ // HACK: This must be done via reflection in order to prevent
+ // the RuntimeHelpers.PrepareDelegate method from over-
+ // eagerly attempting to locate the new (and optional)
+ // sqlite3_errstr() function in the SQLite core library
+ // because it happens to be in the static call graph for
+ // the AppDomain.DomainUnload event handler registered
+ // by the SQLiteLog class.
+ //
+ BindingFlags flags = BindingFlags.Static |
+ BindingFlags.NonPublic | BindingFlags.InvokeMethod;
+
+ return typeof(SQLiteBase).InvokeMember("GetErrorString",
+ flags, null, null, new object[] { errorCode }) as string;
+#else
+ return SQLiteBase.GetErrorString(errorCode);
+#endif
+ }
+
+ ///
+ /// Returns the composite error message based on the SQLite return code
+ /// and the optional detailed error message.
+ ///
+ /// The SQLite return code.
+ /// Optional detailed error message.
+ /// Error message text for the return code.
+ private static string GetStockErrorMessage(
+ SQLiteErrorCode errorCode,
+ string message
+ )
+ {
+ return String.Format("{0}{1}{2}",
+ GetErrorString(errorCode),
+#if !NET_COMPACT_20
+ Environment.NewLine, message).Trim();
+#else
+ "\r\n", message).Trim();
+#endif
+ }
+ }
+
+ ///
+ /// SQLite error codes. Actually, this enumeration represents a return code,
+ /// which may also indicate success in one of several ways (e.g. SQLITE_OK,
+ /// SQLITE_ROW, and SQLITE_DONE). Therefore, the name of this enumeration is
+ /// something of a misnomer.
+ ///
+ public enum SQLiteErrorCode
+ {
+ ///
+ /// Successful result
+ ///
+ Ok /* 0 */,
+ ///
+ /// SQL error or missing database
+ ///
+ Error /* 1 */,
+ ///
+ /// Internal logic error in SQLite
+ ///
+ Internal /* 2 */,
+ ///
+ /// Access permission denied
+ ///
+ Perm /* 3 */,
+ ///
+ /// Callback routine requested an abort
+ ///
+ Abort /* 4 */,
+ ///
+ /// The database file is locked
+ ///
+ Busy /* 5 */,
+ ///
+ /// A table in the database is locked
+ ///
+ Locked /* 6 */,
+ ///
+ /// A malloc() failed
+ ///
+ NoMem /* 7 */,
+ ///
+ /// Attempt to write a readonly database
+ ///
+ ReadOnly /* 8 */,
+ ///
+ /// Operation terminated by sqlite3_interrupt()
+ ///
+ Interrupt /* 9 */,
+ ///
+ /// Some kind of disk I/O error occurred
+ ///
+ IoErr /* 10 */,
+ ///
+ /// The database disk image is malformed
+ ///
+ Corrupt /* 11 */,
+ ///
+ /// Unknown opcode in sqlite3_file_control()
+ ///
+ NotFound /* 12 */,
+ ///
+ /// Insertion failed because database is full
+ ///
+ Full /* 13 */,
+ ///
+ /// Unable to open the database file
+ ///
+ CantOpen /* 14 */,
+ ///
+ /// Database lock protocol error
+ ///
+ Protocol /* 15 */,
+ ///
+ /// Database is empty
+ ///
+ Empty /* 16 */,
+ ///
+ /// The database schema changed
+ ///
+ Schema /* 17 */,
+ ///
+ /// String or BLOB exceeds size limit
+ ///
+ TooBig /* 18 */,
+ ///
+ /// Abort due to constraint violation
+ ///
+ Constraint /* 19 */,
+ ///
+ /// Data type mismatch
+ ///
+ Mismatch /* 20 */,
+ ///
+ /// Library used incorrectly
+ ///
+ Misuse /* 21 */,
+ ///
+ /// Uses OS features not supported on host
+ ///
+ NoLfs /* 22 */,
+ ///
+ /// Authorization denied
+ ///
+ Auth /* 23 */,
+ ///
+ /// Auxiliary database format error
+ ///
+ Format /* 24 */,
+ ///
+ /// 2nd parameter to sqlite3_bind out of range
+ ///
+ Range /* 25 */,
+ ///
+ /// File opened that is not a database file
+ ///
+ NotADb /* 26 */,
+ ///
+ /// sqlite3_step() has another row ready
+ ///
+ Row = 100,
+ ///
+ /// sqlite3_step() has finished executing
+ ///
+ Done /* 101 */
+ }
+}
Index: System.Data.SQLite/SQLiteFunction.cs
==================================================================
--- System.Data.SQLite/SQLiteFunction.cs
+++ System.Data.SQLite/SQLiteFunction.cs
@@ -1,41 +1,41 @@
-/********************************************************
- * ADO.NET 2.0 Data Provider for SQLite Version 3.X
- * Written by Robert Simpson (robert@blackcastlesoft.com)
- *
- * Released to the public domain, use at your own risk!
- ********************************************************/
-
-namespace System.Data.SQLite
-{
+/********************************************************
+ * ADO.NET 2.0 Data Provider for SQLite Version 3.X
+ * Written by Robert Simpson (robert@blackcastlesoft.com)
+ *
+ * Released to the public domain, use at your own risk!
+ ********************************************************/
+
+namespace System.Data.SQLite
+{
using System;
- using System.Collections.Generic;
- using System.Runtime.InteropServices;
- using System.Globalization;
-
- ///
- /// This abstract class is designed to handle user-defined functions easily. An instance of the derived class is made for each
- /// connection to the database.
- ///
- ///
- /// Although there is one instance of a class derived from SQLiteFunction per database connection, the derived class has no access
- /// to the underlying connection. This is necessary to deter implementers from thinking it would be a good idea to make database
- /// calls during processing.
- ///
- /// It is important to distinguish between a per-connection instance, and a per-SQL statement context. One instance of this class
- /// services all SQL statements being stepped through on that connection, and there can be many. One should never store per-statement
- /// information in member variables of user-defined function classes.
- ///
- /// For aggregate functions, always create and store your per-statement data in the contextData object on the 1st step. This data will
- /// be automatically freed for you (and Dispose() called if the item supports IDisposable) when the statement completes.
- ///
- public abstract class SQLiteFunction : IDisposable
- {
- private class AggregateData
- {
- internal int _count = 1;
- internal object _data;
+ using System.Collections.Generic;
+ using System.Runtime.InteropServices;
+ using System.Globalization;
+
+ ///
+ /// This abstract class is designed to handle user-defined functions easily. An instance of the derived class is made for each
+ /// connection to the database.
+ ///
+ ///
+ /// Although there is one instance of a class derived from SQLiteFunction per database connection, the derived class has no access
+ /// to the underlying connection. This is necessary to deter implementers from thinking it would be a good idea to make database
+ /// calls during processing.
+ ///
+ /// It is important to distinguish between a per-connection instance, and a per-SQL statement context. One instance of this class
+ /// services all SQL statements being stepped through on that connection, and there can be many. One should never store per-statement
+ /// information in member variables of user-defined function classes.
+ ///
+ /// For aggregate functions, always create and store your per-statement data in the contextData object on the 1st step. This data will
+ /// be automatically freed for you (and Dispose() called if the item supports IDisposable) when the statement completes.
+ ///
+ public abstract class SQLiteFunction : IDisposable
+ {
+ private class AggregateData
+ {
+ internal int _count = 1;
+ internal object _data;
}
/////////////////////////////////////////////////////////////////////////
#region Private Constants
@@ -45,62 +45,62 @@
///
private const int COR_E_EXCEPTION = unchecked((int)0x80131500);
#endregion
/////////////////////////////////////////////////////////////////////////
-
- ///
- /// The base connection this function is attached to
- ///
- internal SQLiteBase _base;
-
- ///
- /// Internal array used to keep track of aggregate function context data
+
+ ///
+ /// The base connection this function is attached to
+ ///
+ internal SQLiteBase _base;
+
+ ///
+ /// Internal array used to keep track of aggregate function context data
///
private Dictionary _contextDataList;
///
/// The connection flags associated with this object (this should be the
/// same value as the flags associated with the parent connection object).
///
private SQLiteConnectionFlags _flags;
-
- ///
- /// Holds a reference to the callback function for user functions
- ///
- private SQLiteCallback _InvokeFunc;
- ///
- /// Holds a reference to the callbakc function for stepping in an aggregate function
- ///
- private SQLiteCallback _StepFunc;
- ///
- /// Holds a reference to the callback function for finalizing an aggregate function
- ///
- private SQLiteFinalCallback _FinalFunc;
- ///
- /// Holds a reference to the callback function for collation sequences
- ///
- private SQLiteCollation _CompareFunc;
-
- private SQLiteCollation _CompareFunc16;
-
- ///
- /// Current context of the current callback. Only valid during a callback
- ///
- internal IntPtr _context;
-
- ///
- /// This static list contains all the user-defined functions declared using the proper attributes.
- ///
- private static List _registeredFunctions;
-
- ///
- /// Internal constructor, initializes the function's internal variables.
- ///
- protected SQLiteFunction()
- {
- _contextDataList = new Dictionary();
+
+ ///
+ /// Holds a reference to the callback function for user functions
+ ///
+ private SQLiteCallback _InvokeFunc;
+ ///
+ /// Holds a reference to the callbakc function for stepping in an aggregate function
+ ///
+ private SQLiteCallback _StepFunc;
+ ///
+ /// Holds a reference to the callback function for finalizing an aggregate function
+ ///
+ private SQLiteFinalCallback _FinalFunc;
+ ///
+ /// Holds a reference to the callback function for collation sequences
+ ///
+ private SQLiteCollation _CompareFunc;
+
+ private SQLiteCollation _CompareFunc16;
+
+ ///
+ /// Current context of the current callback. Only valid during a callback
+ ///
+ internal IntPtr _context;
+
+ ///
+ /// This static list contains all the user-defined functions declared using the proper attributes.
+ ///
+ private static List _registeredFunctions;
+
+ ///
+ /// Internal constructor, initializes the function's internal variables.
+ ///
+ protected SQLiteFunction()
+ {
+ _contextDataList = new Dictionary();
}
///////////////////////////////////////////////////////////////////////////////////////////////
#region IDisposable Members
@@ -181,211 +181,210 @@
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////
- ///
- /// Returns a reference to the underlying connection's SQLiteConvert class, which can be used to convert
- /// strings and DateTime's into the current connection's encoding schema.
- ///
- public SQLiteConvert SQLiteConvert
- {
- get
- {
- CheckDisposed();
- return _base;
- }
- }
-
- ///
- /// Scalar functions override this method to do their magic.
- ///
- ///
- /// Parameters passed to functions have only an affinity for a certain data type, there is no underlying schema available
- /// to force them into a certain type. Therefore the only types you will ever see as parameters are
- /// DBNull.Value, Int64, Double, String or byte[] array.
- ///
- /// The arguments for the command to process
- /// You may return most simple types as a return value, null or DBNull.Value to return null, DateTime, or
- /// you may return an Exception-derived class if you wish to return an error to SQLite. Do not actually throw the error,
- /// just return it!
+ ///
+ /// Returns a reference to the underlying connection's SQLiteConvert class, which can be used to convert
+ /// strings and DateTime's into the current connection's encoding schema.
+ ///
+ public SQLiteConvert SQLiteConvert
+ {
+ get
+ {
+ CheckDisposed();
+ return _base;
+ }
+ }
+
+ ///
+ /// Scalar functions override this method to do their magic.
+ ///
+ ///
+ /// Parameters passed to functions have only an affinity for a certain data type, there is no underlying schema available
+ /// to force them into a certain type. Therefore the only types you will ever see as parameters are
+ /// DBNull.Value, Int64, Double, String or byte[] array.
+ ///
+ /// The arguments for the command to process
+ /// You may return most simple types as a return value, null or DBNull.Value to return null, DateTime, or
+ /// you may return an Exception-derived class if you wish to return an error to SQLite. Do not actually throw the error,
+ /// just return it!
public virtual object Invoke(object[] args)
{
- CheckDisposed();
- return null;
- }
-
- ///
- /// Aggregate functions override this method to do their magic.
- ///
- ///
- /// Typically you'll be updating whatever you've placed in the contextData field and returning as quickly as possible.
- ///
- /// The arguments for the command to process
- /// The 1-based step number. This is incrememted each time the step method is called.
- /// A placeholder for implementers to store contextual data pertaining to the current context.
+ CheckDisposed();
+ return null;
+ }
+
+ ///
+ /// Aggregate functions override this method to do their magic.
+ ///
+ ///
+ /// Typically you'll be updating whatever you've placed in the contextData field and returning as quickly as possible.
+ ///
+ /// The arguments for the command to process
+ /// The 1-based step number. This is incrememted each time the step method is called.
+ /// A placeholder for implementers to store contextual data pertaining to the current context.
public virtual void Step(object[] args, int stepNumber, ref object contextData)
{
- CheckDisposed();
- }
-
- ///
- /// Aggregate functions override this method to finish their aggregate processing.
- ///
- ///
- /// If you implemented your aggregate function properly,
- /// you've been recording and keeping track of your data in the contextData object provided, and now at this stage you should have
- /// all the information you need in there to figure out what to return.
- /// NOTE: It is possible to arrive here without receiving a previous call to Step(), in which case the contextData will
- /// be null. This can happen when no rows were returned. You can either return null, or 0 or some other custom return value
- /// if that is the case.
- ///
- /// Your own assigned contextData, provided for you so you can return your final results.
- /// You may return most simple types as a return value, null or DBNull.Value to return null, DateTime, or
- /// you may return an Exception-derived class if you wish to return an error to SQLite. Do not actually throw the error,
- /// just return it!
- ///
- public virtual object Final(object contextData)
- {
- CheckDisposed();
- return null;
- }
-
- ///
- /// User-defined collation sequences override this method to provide a custom string sorting algorithm.
- ///
- /// The first string to compare
- /// The second strnig to compare
- /// 1 if param1 is greater than param2, 0 if they are equal, or -1 if param1 is less than param2
+ CheckDisposed();
+ }
+
+ ///
+ /// Aggregate functions override this method to finish their aggregate processing.
+ ///
+ ///
+ /// If you implemented your aggregate function properly,
+ /// you've been recording and keeping track of your data in the contextData object provided, and now at this stage you should have
+ /// all the information you need in there to figure out what to return.
+ /// NOTE: It is possible to arrive here without receiving a previous call to Step(), in which case the contextData will
+ /// be null. This can happen when no rows were returned. You can either return null, or 0 or some other custom return value
+ /// if that is the case.
+ ///
+ /// Your own assigned contextData, provided for you so you can return your final results.
+ /// You may return most simple types as a return value, null or DBNull.Value to return null, DateTime, or
+ /// you may return an Exception-derived class if you wish to return an error to SQLite. Do not actually throw the error,
+ /// just return it!
+ ///
+ public virtual object Final(object contextData)
+ {
+ CheckDisposed();
+ return null;
+ }
+
+ ///
+ /// User-defined collation sequences override this method to provide a custom string sorting algorithm.
+ ///
+ /// The first string to compare
+ /// The second strnig to compare
+ /// 1 if param1 is greater than param2, 0 if they are equal, or -1 if param1 is less than param2
public virtual int Compare(string param1, string param2)
{
- CheckDisposed();
- return 0;
- }
-
- ///
- /// Converts an IntPtr array of context arguments to an object array containing the resolved parameters the pointers point to.
- ///
- ///
- /// Parameters passed to functions have only an affinity for a certain data type, there is no underlying schema available
- /// to force them into a certain type. Therefore the only types you will ever see as parameters are
- /// DBNull.Value, Int64, Double, String or byte[] array.
- ///
- /// The number of arguments
- /// A pointer to the array of arguments
- /// An object array of the arguments once they've been converted to .NET values
- internal object[] ConvertParams(int nArgs, IntPtr argsptr)
- {
- object[] parms = new object[nArgs];
-#if !PLATFORM_COMPACTFRAMEWORK
- IntPtr[] argint = new IntPtr[nArgs];
-#else
- int[] argint = new int[nArgs];
-#endif
- Marshal.Copy(argsptr, argint, 0, nArgs);
-
- for (int n = 0; n < nArgs; n++)
- {
- switch (_base.GetParamValueType((IntPtr)argint[n]))
- {
- case TypeAffinity.Null:
- parms[n] = DBNull.Value;
- break;
- case TypeAffinity.Int64:
- parms[n] = _base.GetParamValueInt64((IntPtr)argint[n]);
- break;
- case TypeAffinity.Double:
- parms[n] = _base.GetParamValueDouble((IntPtr)argint[n]);
- break;
- case TypeAffinity.Text:
- parms[n] = _base.GetParamValueText((IntPtr)argint[n]);
- break;
- case TypeAffinity.Blob:
- {
- int x;
- byte[] blob;
-
- x = (int)_base.GetParamValueBytes((IntPtr)argint[n], 0, null, 0, 0);
- blob = new byte[x];
- _base.GetParamValueBytes((IntPtr)argint[n], 0, blob, 0, x);
- parms[n] = blob;
- }
- break;
- case TypeAffinity.DateTime: // Never happens here but what the heck, maybe it will one day.
- parms[n] = _base.ToDateTime(_base.GetParamValueText((IntPtr)argint[n]));
- break;
- }
- }
- return parms;
- }
-
- ///
- /// Takes the return value from Invoke() and Final() and figures out how to return it to SQLite's context.
- ///
- /// The context the return value applies to
- /// The parameter to return to SQLite
- private void SetReturnValue(IntPtr context, object returnValue)
- {
- if (returnValue == null || returnValue == DBNull.Value)
- {
- _base.ReturnNull(context);
- return;
- }
-
- Type t = returnValue.GetType();
- if (t == typeof(DateTime))
- {
- _base.ReturnText(context, _base.ToString((DateTime)returnValue));
- return;
- }
- else
- {
- Exception r = returnValue as Exception;
-
- if (r != null)
- {
- _base.ReturnError(context, r.Message);
- return;
- }
- }
-
- switch (SQLiteConvert.TypeToAffinity(t))
- {
- case TypeAffinity.Null:
- _base.ReturnNull(context);
- return;
- case TypeAffinity.Int64:
- _base.ReturnInt64(context, Convert.ToInt64(returnValue, CultureInfo.CurrentCulture));
- return;
- case TypeAffinity.Double:
- _base.ReturnDouble(context, Convert.ToDouble(returnValue, CultureInfo.CurrentCulture));
- return;
- case TypeAffinity.Text:
- _base.ReturnText(context, returnValue.ToString());
- return;
- case TypeAffinity.Blob:
- _base.ReturnBlob(context, (byte[])returnValue);
- return;
- }
- }
-
- ///
+ CheckDisposed();
+ return 0;
+ }
+
+ ///
+ /// Converts an IntPtr array of context arguments to an object array containing the resolved parameters the pointers point to.
+ ///
+ ///
+ /// Parameters passed to functions have only an affinity for a certain data type, there is no underlying schema available
+ /// to force them into a certain type. Therefore the only types you will ever see as parameters are
+ /// DBNull.Value, Int64, Double, String or byte[] array.
+ ///
+ /// The number of arguments
+ /// A pointer to the array of arguments
+ /// An object array of the arguments once they've been converted to .NET values
+ internal object[] ConvertParams(int nArgs, IntPtr argsptr)
+ {
+ object[] parms = new object[nArgs];
+#if !PLATFORM_COMPACTFRAMEWORK
+ IntPtr[] argint = new IntPtr[nArgs];
+#else
+ int[] argint = new int[nArgs];
+#endif
+ Marshal.Copy(argsptr, argint, 0, nArgs);
+
+ for (int n = 0; n < nArgs; n++)
+ {
+ switch (_base.GetParamValueType((IntPtr)argint[n]))
+ {
+ case TypeAffinity.Null:
+ parms[n] = DBNull.Value;
+ break;
+ case TypeAffinity.Int64:
+ parms[n] = _base.GetParamValueInt64((IntPtr)argint[n]);
+ break;
+ case TypeAffinity.Double:
+ parms[n] = _base.GetParamValueDouble((IntPtr)argint[n]);
+ break;
+ case TypeAffinity.Text:
+ parms[n] = _base.GetParamValueText((IntPtr)argint[n]);
+ break;
+ case TypeAffinity.Blob:
+ {
+ int x;
+ byte[] blob;
+
+ x = (int)_base.GetParamValueBytes((IntPtr)argint[n], 0, null, 0, 0);
+ blob = new byte[x];
+ _base.GetParamValueBytes((IntPtr)argint[n], 0, blob, 0, x);
+ parms[n] = blob;
+ }
+ break;
+ case TypeAffinity.DateTime: // Never happens here but what the heck, maybe it will one day.
+ parms[n] = _base.ToDateTime(_base.GetParamValueText((IntPtr)argint[n]));
+ break;
+ }
+ }
+ return parms;
+ }
+
+ ///
+ /// Takes the return value from Invoke() and Final() and figures out how to return it to SQLite's context.
+ ///
+ /// The context the return value applies to
+ /// The parameter to return to SQLite
+ private void SetReturnValue(IntPtr context, object returnValue)
+ {
+ if (returnValue == null || returnValue == DBNull.Value)
+ {
+ _base.ReturnNull(context);
+ return;
+ }
+
+ Type t = returnValue.GetType();
+ if (t == typeof(DateTime))
+ {
+ _base.ReturnText(context, _base.ToString((DateTime)returnValue));
+ return;
+ }
+ else
+ {
+ Exception r = returnValue as Exception;
+
+ if (r != null)
+ {
+ _base.ReturnError(context, r.Message);
+ return;
+ }
+ }
+
+ switch (SQLiteConvert.TypeToAffinity(t))
+ {
+ case TypeAffinity.Null:
+ _base.ReturnNull(context);
+ return;
+ case TypeAffinity.Int64:
+ _base.ReturnInt64(context, Convert.ToInt64(returnValue, CultureInfo.CurrentCulture));
+ return;
+ case TypeAffinity.Double:
+ _base.ReturnDouble(context, Convert.ToDouble(returnValue, CultureInfo.CurrentCulture));
+ return;
+ case TypeAffinity.Text:
+ _base.ReturnText(context, returnValue.ToString());
+ return;
+ case TypeAffinity.Blob:
+ _base.ReturnBlob(context, (byte[])returnValue);
+ return;
+ }
+ }
+
+ ///
/// Internal scalar callback function, which wraps the raw context pointer and calls the virtual Invoke() method.
- /// WARNING: Must not throw exceptions.
- ///
- /// A raw context pointer
- /// Number of arguments passed in
+ /// WARNING: Must not throw exceptions.
+ ///
+ /// A raw context pointer
+ /// Number of arguments passed in
/// A pointer to the array of arguments
internal void ScalarCallback(IntPtr context, int nArgs, IntPtr argsptr)
{
try
{
_context = context;
SetReturnValue(context,
Invoke(ConvertParams(nArgs, argsptr))); /* throw */
}
-#if !PLATFORM_COMPACTFRAMEWORK
catch (Exception e) /* NOTE: Must catch ALL. */
{
try
{
if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
@@ -400,37 +399,30 @@
catch
{
// do nothing.
}
}
-#else
- catch /* NOTE: Must catch ALL. */
- {
- // do nothing (Windows CE).
- }
-#endif
- }
-
- ///
+ }
+
+ ///
/// Internal collation sequence function, which wraps up the raw string pointers and executes the Compare() virtual function.
- /// WARNING: Must not throw exceptions.
- ///
- /// Not used
- /// Length of the string pv1
- /// Pointer to the first string to compare
- /// Length of the string pv2
- /// Pointer to the second string to compare
- /// Returns -1 if the first string is less than the second. 0 if they are equal, or 1 if the first string is greater
+ /// WARNING: Must not throw exceptions.
+ ///
+ /// Not used
+ /// Length of the string pv1
+ /// Pointer to the first string to compare
+ /// Length of the string pv2
+ /// Pointer to the second string to compare
+ /// Returns -1 if the first string is less than the second. 0 if they are equal, or 1 if the first string is greater
/// than the second. Returns 0 if an exception is caught.
internal int CompareCallback(IntPtr ptr, int len1, IntPtr ptr1, int len2, IntPtr ptr2)
{
try
{
return Compare(SQLiteConvert.UTF8ToString(ptr1, len1),
SQLiteConvert.UTF8ToString(ptr2, len2)); /* throw */
}
-#if !PLATFORM_COMPACTFRAMEWORK
catch (Exception e) /* NOTE: Must catch ALL. */
{
try
{
if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
@@ -445,16 +437,10 @@
catch
{
// do nothing.
}
}
-#else
- catch /* NOTE: Must catch ALL. */
- {
- // do nothing (Windows CE).
- }
-#endif
//
// NOTE: This must be done to prevent the core SQLite library from
// using our (invalid) result.
//
@@ -480,11 +466,10 @@
try
{
return Compare(SQLite3_UTF16.UTF16ToString(ptr1, len1),
SQLite3_UTF16.UTF16ToString(ptr2, len2)); /* throw */
}
-#if !PLATFORM_COMPACTFRAMEWORK
catch (Exception e) /* NOTE: Must catch ALL. */
{
try
{
if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
@@ -499,38 +484,32 @@
catch
{
// do nothing.
}
}
-#else
- catch /* NOTE: Must catch ALL. */
- {
- // do nothing (Windows CE).
- }
-#endif
//
// NOTE: This must be done to prevent the core SQLite library from
// using our (invalid) result.
//
if (_base != null)
_base.Cancel();
return 0;
- }
-
- ///
+ }
+
+ ///
/// The internal aggregate Step function callback, which wraps the raw context pointer and calls the virtual Step() method.
- /// WARNING: Must not throw exceptions.
- ///
- ///
- /// This function takes care of doing the lookups and getting the important information put together to call the Step() function.
- /// That includes pulling out the user's contextData and updating it after the call is made. We use a sorted list for this so
- /// binary searches can be done to find the data.
- ///
- /// A raw context pointer
- /// Number of arguments passed in
+ /// WARNING: Must not throw exceptions.
+ ///
+ ///
+ /// This function takes care of doing the lookups and getting the important information put together to call the Step() function.
+ /// That includes pulling out the user's contextData and updating it after the call is made. We use a sorted list for this so
+ /// binary searches can be done to find the data.
+ ///
+ /// A raw context pointer
+ /// Number of arguments passed in
/// A pointer to the array of arguments
internal void StepCallback(IntPtr context, int nArgs, IntPtr argsptr)
{
try
{
@@ -560,11 +539,10 @@
finally
{
data._count++;
}
}
-#if !PLATFORM_COMPACTFRAMEWORK
catch (Exception e) /* NOTE: Must catch ALL. */
{
try
{
if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
@@ -579,22 +557,16 @@
catch
{
// do nothing.
}
}
-#else
- catch /* NOTE: Must catch ALL. */
- {
- // do nothing (Windows CE).
- }
-#endif
- }
-
- ///
+ }
+
+ ///
/// An internal aggregate Final function callback, which wraps the context pointer and calls the virtual Final() method.
- /// WARNING: Must not throw exceptions.
- ///
+ /// WARNING: Must not throw exceptions.
+ ///
/// A raw context pointer
internal void FinalCallback(IntPtr context)
{
try
{
@@ -622,11 +594,10 @@
{
IDisposable disp = obj as IDisposable;
if (disp != null) disp.Dispose(); /* throw */
}
}
-#if !PLATFORM_COMPACTFRAMEWORK
catch (Exception e) /* NOTE: Must catch ALL. */
{
try
{
if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
@@ -641,172 +612,173 @@
catch
{
// do nothing.
}
}
-#else
- catch /* NOTE: Must catch ALL. */
- {
- // do nothing (Windows CE).
- }
-#endif
- }
-
- ///
- /// Using reflection, enumerate all assemblies in the current appdomain looking for classes that
- /// have a SQLiteFunctionAttribute attribute, and registering them accordingly.
- ///
-#if !PLATFORM_COMPACTFRAMEWORK
- [Security.Permissions.FileIOPermission(Security.Permissions.SecurityAction.Assert, AllFiles = Security.Permissions.FileIOPermissionAccess.PathDiscovery)]
-#endif
- static SQLiteFunction()
- {
- _registeredFunctions = new List();
- try
- {
-#if !PLATFORM_COMPACTFRAMEWORK
- SQLiteFunctionAttribute at;
- System.Reflection.Assembly[] arAssemblies = System.AppDomain.CurrentDomain.GetAssemblies();
- int w = arAssemblies.Length;
- System.Reflection.AssemblyName sqlite = System.Reflection.Assembly.GetCallingAssembly().GetName();
-
- for (int n = 0; n < w; n++)
- {
- Type[] arTypes;
- bool found = false;
- System.Reflection.AssemblyName[] references;
- try
- {
- // Inspect only assemblies that reference SQLite
- references = arAssemblies[n].GetReferencedAssemblies();
- int t = references.Length;
- for (int z = 0; z < t; z++)
- {
- if (references[z].Name == sqlite.Name)
- {
- found = true;
- break;
- }
- }
-
- if (found == false)
- continue;
-
- arTypes = arAssemblies[n].GetTypes();
- }
- catch (Reflection.ReflectionTypeLoadException e)
- {
- arTypes = e.Types;
- }
-
- int v = arTypes.Length;
- for (int x = 0; x < v; x++)
- {
- if (arTypes[x] == null) continue;
-
- object[] arAtt = arTypes[x].GetCustomAttributes(typeof(SQLiteFunctionAttribute), false);
- int u = arAtt.Length;
- for (int y = 0; y < u; y++)
- {
- at = arAtt[y] as SQLiteFunctionAttribute;
- if (at != null)
- {
- at._instanceType = arTypes[x];
- _registeredFunctions.Add(at);
- }
- }
- }
- }
-#endif
- }
- catch // SQLite provider can continue without being able to find built-in functions
- {
- }
- }
-
- ///
- /// Manual method of registering a function. The type must still have the SQLiteFunctionAttributes in order to work
- /// properly, but this is a workaround for the Compact Framework where enumerating assemblies is not currently supported.
- ///
- /// The type of the function to register
- public static void RegisterFunction(Type typ)
- {
- object[] arAtt = typ.GetCustomAttributes(typeof(SQLiteFunctionAttribute), false);
- int u = arAtt.Length;
- SQLiteFunctionAttribute at;
-
- for (int y = 0; y < u; y++)
- {
- at = arAtt[y] as SQLiteFunctionAttribute;
- if (at != null)
- {
- at._instanceType = typ;
- _registeredFunctions.Add(at);
- }
- }
- }
-
- ///
- /// Called by SQLiteBase derived classes, this function binds all user-defined functions to a connection.
- /// It is done this way so that all user-defined functions will access the database using the same encoding scheme
- /// as the connection (UTF-8 or UTF-16).
- ///
- ///
- /// The wrapper functions that interop with SQLite will create a unique cookie value, which internally is a pointer to
- /// all the wrapped callback functions. The interop function uses it to map CDecl callbacks to StdCall callbacks.
- ///
- /// The base object on which the functions are to bind
- /// The flags associated with the parent connection object
- /// Returns an array of functions which the connection object should retain until the connection is closed.
- internal static SQLiteFunction[] BindFunctions(SQLiteBase sqlbase, SQLiteConnectionFlags flags)
- {
- SQLiteFunction f;
- List lFunctions = new List();
-
- foreach (SQLiteFunctionAttribute pr in _registeredFunctions)
- {
+ }
+
+ ///
+ /// Using reflection, enumerate all assemblies in the current appdomain looking for classes that
+ /// have a SQLiteFunctionAttribute attribute, and registering them accordingly.
+ ///
+#if !PLATFORM_COMPACTFRAMEWORK
+ [Security.Permissions.FileIOPermission(Security.Permissions.SecurityAction.Assert, AllFiles = Security.Permissions.FileIOPermissionAccess.PathDiscovery)]
+#endif
+ static SQLiteFunction()
+ {
+ _registeredFunctions = new List();
+ try
+ {
+#if !PLATFORM_COMPACTFRAMEWORK
+ //
+ // NOTE: If the "No_SQLiteFunctions" environment variable is set,
+ // skip all our special code and simply return.
+ //
+ if (Environment.GetEnvironmentVariable("No_SQLiteFunctions") != null)
+ return;
+
+ SQLiteFunctionAttribute at;
+ System.Reflection.Assembly[] arAssemblies = System.AppDomain.CurrentDomain.GetAssemblies();
+ int w = arAssemblies.Length;
+ System.Reflection.AssemblyName sqlite = System.Reflection.Assembly.GetCallingAssembly().GetName();
+
+ for (int n = 0; n < w; n++)
+ {
+ Type[] arTypes;
+ bool found = false;
+ System.Reflection.AssemblyName[] references;
+ try
+ {
+ // Inspect only assemblies that reference SQLite
+ references = arAssemblies[n].GetReferencedAssemblies();
+ int t = references.Length;
+ for (int z = 0; z < t; z++)
+ {
+ if (references[z].Name == sqlite.Name)
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (found == false)
+ continue;
+
+ arTypes = arAssemblies[n].GetTypes();
+ }
+ catch (Reflection.ReflectionTypeLoadException e)
+ {
+ arTypes = e.Types;
+ }
+
+ int v = arTypes.Length;
+ for (int x = 0; x < v; x++)
+ {
+ if (arTypes[x] == null) continue;
+
+ object[] arAtt = arTypes[x].GetCustomAttributes(typeof(SQLiteFunctionAttribute), false);
+ int u = arAtt.Length;
+ for (int y = 0; y < u; y++)
+ {
+ at = arAtt[y] as SQLiteFunctionAttribute;
+ if (at != null)
+ {
+ at._instanceType = arTypes[x];
+ _registeredFunctions.Add(at);
+ }
+ }
+ }
+ }
+#endif
+ }
+ catch // SQLite provider can continue without being able to find built-in functions
+ {
+ }
+ }
+
+ ///
+ /// Manual method of registering a function. The type must still have the SQLiteFunctionAttributes in order to work
+ /// properly, but this is a workaround for the Compact Framework where enumerating assemblies is not currently supported.
+ ///
+ /// The type of the function to register
+ public static void RegisterFunction(Type typ)
+ {
+ object[] arAtt = typ.GetCustomAttributes(typeof(SQLiteFunctionAttribute), false);
+ int u = arAtt.Length;
+ SQLiteFunctionAttribute at;
+
+ for (int y = 0; y < u; y++)
+ {
+ at = arAtt[y] as SQLiteFunctionAttribute;
+ if (at != null)
+ {
+ at._instanceType = typ;
+ _registeredFunctions.Add(at);
+ }
+ }
+ }
+
+ ///
+ /// Called by SQLiteBase derived classes, this function binds all user-defined functions to a connection.
+ /// It is done this way so that all user-defined functions will access the database using the same encoding scheme
+ /// as the connection (UTF-8 or UTF-16).
+ ///
+ ///
+ /// The wrapper functions that interop with SQLite will create a unique cookie value, which internally is a pointer to
+ /// all the wrapped callback functions. The interop function uses it to map CDecl callbacks to StdCall callbacks.
+ ///
+ /// The base object on which the functions are to bind
+ /// The flags associated with the parent connection object
+ /// Returns an array of functions which the connection object should retain until the connection is closed.
+ internal static SQLiteFunction[] BindFunctions(SQLiteBase sqlbase, SQLiteConnectionFlags flags)
+ {
+ SQLiteFunction f;
+ List lFunctions = new List();
+
+ foreach (SQLiteFunctionAttribute pr in _registeredFunctions)
+ {
f = (SQLiteFunction)Activator.CreateInstance(pr._instanceType);
f._base = sqlbase;
f._flags = flags;
- f._InvokeFunc = (pr.FuncType == FunctionType.Scalar) ? new SQLiteCallback(f.ScalarCallback) : null;
- f._StepFunc = (pr.FuncType == FunctionType.Aggregate) ? new SQLiteCallback(f.StepCallback) : null;
- f._FinalFunc = (pr.FuncType == FunctionType.Aggregate) ? new SQLiteFinalCallback(f.FinalCallback) : null;
- f._CompareFunc = (pr.FuncType == FunctionType.Collation) ? new SQLiteCollation(f.CompareCallback) : null;
- f._CompareFunc16 = (pr.FuncType == FunctionType.Collation) ? new SQLiteCollation(f.CompareCallback16) : null;
-
- if (pr.FuncType != FunctionType.Collation)
- sqlbase.CreateFunction(pr.Name, pr.Arguments, (f is SQLiteFunctionEx), f._InvokeFunc, f._StepFunc, f._FinalFunc);
- else
- sqlbase.CreateCollation(pr.Name, f._CompareFunc, f._CompareFunc16);
-
-
- lFunctions.Add(f);
- }
-
- SQLiteFunction[] arFunctions = new SQLiteFunction[lFunctions.Count];
- lFunctions.CopyTo(arFunctions, 0);
-
- return arFunctions;
- }
- }
-
- ///
- /// Extends SQLiteFunction and allows an inherited class to obtain the collating sequence associated with a function call.
- ///
- ///
- /// User-defined functions can call the GetCollationSequence() method in this class and use it to compare strings and char arrays.
- ///
- public class SQLiteFunctionEx : SQLiteFunction
- {
- ///
- /// Obtains the collating sequence in effect for the given function.
- ///
- ///
+ /// Extends SQLiteFunction and allows an inherited class to obtain the collating sequence associated with a function call.
+ ///
+ ///
+ /// User-defined functions can call the GetCollationSequence() method in this class and use it to compare strings and char arrays.
+ ///
+ public class SQLiteFunctionEx : SQLiteFunction
+ {
+ ///
+ /// Obtains the collating sequence in effect for the given function.
+ ///
+ ///
- /// The type of user-defined function to declare
- ///
- public enum FunctionType
- {
- ///
- /// Scalar functions are designed to be called and return a result immediately. Examples include ABS(), Upper(), Lower(), etc.
- ///
- Scalar = 0,
- ///
- /// Aggregate functions are designed to accumulate data until the end of a call and then return a result gleaned from the accumulated data.
- /// Examples include SUM(), COUNT(), AVG(), etc.
- ///
- Aggregate = 1,
- ///
- /// Collation sequences are used to sort textual data in a custom manner, and appear in an ORDER BY clause. Typically text in an ORDER BY is
- /// sorted using a straight case-insensitive comparison function. Custom collating sequences can be used to alter the behavior of text sorting
- /// in a user-defined manner.
- ///
- Collation = 2,
- }
-
- ///
- /// An internal callback delegate declaration.
- ///
- /// Raw context pointer for the user function
- /// Count of arguments to the function
- /// A pointer to the array of argument pointers
-#if !PLATFORM_COMPACTFRAMEWORK
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-#endif
- internal delegate void SQLiteCallback(IntPtr context, int nArgs, IntPtr argsptr);
- ///
- /// An internal final callback delegate declaration.
- ///
- /// Raw context pointer for the user function
-#if !PLATFORM_COMPACTFRAMEWORK
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-#endif
- internal delegate void SQLiteFinalCallback(IntPtr context);
- ///
- /// Internal callback delegate for implementing collation sequences
- ///
- /// Not used
- /// Length of the string pv1
- /// Pointer to the first string to compare
- /// Length of the string pv2
- /// Pointer to the second string to compare
- /// Returns -1 if the first string is less than the second. 0 if they are equal, or 1 if the first string is greater
- /// than the second.
-#if !PLATFORM_COMPACTFRAMEWORK
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-#endif
- internal delegate int SQLiteCollation(IntPtr puser, int len1, IntPtr pv1, int len2, IntPtr pv2);
-
- ///
- /// The type of collating sequence
- ///
- public enum CollationTypeEnum
- {
- ///
- /// The built-in BINARY collating sequence
- ///
- Binary = 1,
- ///
- /// The built-in NOCASE collating sequence
- ///
- NoCase = 2,
- ///
- /// The built-in REVERSE collating sequence
- ///
- Reverse = 3,
- ///
- /// A custom user-defined collating sequence
- ///
- Custom = 0,
- }
-
- ///
- /// The encoding type the collation sequence uses
- ///
- public enum CollationEncodingEnum
- {
- ///
- /// The collation sequence is UTF8
- ///
- UTF8 = 1,
- ///
- /// The collation sequence is UTF16 little-endian
- ///
- UTF16LE = 2,
- ///
- /// The collation sequence is UTF16 big-endian
- ///
- UTF16BE = 3,
- }
-
- ///
- /// A struct describing the collating sequence a function is executing in
- ///
- public struct CollationSequence
- {
- ///
- /// The name of the collating sequence
- ///
- public string Name;
- ///
- /// The type of collating sequence
- ///
- public CollationTypeEnum Type;
-
- ///
- /// The text encoding of the collation sequence
- ///
- public CollationEncodingEnum Encoding;
-
- ///
- /// Context of the function that requested the collating sequence
- ///
- internal SQLiteFunction _func;
-
- ///
- /// Calls the base collating sequence to compare two strings
- ///
- /// The first string to compare
- /// The second string to compare
- /// -1 if s1 is less than s2, 0 if s1 is equal to s2, and 1 if s1 is greater than s2
- public int Compare(string s1, string s2)
- {
- return _func._base.ContextCollateCompare(Encoding, _func._context, s1, s2);
- }
-
- ///
- /// Calls the base collating sequence to compare two character arrays
- ///
- /// The first array to compare
- /// The second array to compare
- /// -1 if c1 is less than c2, 0 if c1 is equal to c2, and 1 if c1 is greater than c2
- public int Compare(char[] c1, char[] c2)
- {
- return _func._base.ContextCollateCompare(Encoding, _func._context, c1, c2);
- }
- }
-}
+ #endregion
+ }
+
+ ///
+ /// The type of user-defined function to declare
+ ///
+ public enum FunctionType
+ {
+ ///
+ /// Scalar functions are designed to be called and return a result immediately. Examples include ABS(), Upper(), Lower(), etc.
+ ///
+ Scalar = 0,
+ ///
+ /// Aggregate functions are designed to accumulate data until the end of a call and then return a result gleaned from the accumulated data.
+ /// Examples include SUM(), COUNT(), AVG(), etc.
+ ///
+ Aggregate = 1,
+ ///
+ /// Collation sequences are used to sort textual data in a custom manner, and appear in an ORDER BY clause. Typically text in an ORDER BY is
+ /// sorted using a straight case-insensitive comparison function. Custom collating sequences can be used to alter the behavior of text sorting
+ /// in a user-defined manner.
+ ///
+ Collation = 2,
+ }
+
+ ///
+ /// An internal callback delegate declaration.
+ ///
+ /// Raw context pointer for the user function
+ /// Count of arguments to the function
+ /// A pointer to the array of argument pointers
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ internal delegate void SQLiteCallback(IntPtr context, int nArgs, IntPtr argsptr);
+ ///
+ /// An internal final callback delegate declaration.
+ ///
+ /// Raw context pointer for the user function
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ internal delegate void SQLiteFinalCallback(IntPtr context);
+ ///
+ /// Internal callback delegate for implementing collation sequences
+ ///
+ /// Not used
+ /// Length of the string pv1
+ /// Pointer to the first string to compare
+ /// Length of the string pv2
+ /// Pointer to the second string to compare
+ /// Returns -1 if the first string is less than the second. 0 if they are equal, or 1 if the first string is greater
+ /// than the second.
+#if !PLATFORM_COMPACTFRAMEWORK
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+#endif
+ internal delegate int SQLiteCollation(IntPtr puser, int len1, IntPtr pv1, int len2, IntPtr pv2);
+
+ ///
+ /// The type of collating sequence
+ ///
+ public enum CollationTypeEnum
+ {
+ ///
+ /// The built-in BINARY collating sequence
+ ///
+ Binary = 1,
+ ///
+ /// The built-in NOCASE collating sequence
+ ///
+ NoCase = 2,
+ ///
+ /// The built-in REVERSE collating sequence
+ ///
+ Reverse = 3,
+ ///
+ /// A custom user-defined collating sequence
+ ///
+ Custom = 0,
+ }
+
+ ///
+ /// The encoding type the collation sequence uses
+ ///
+ public enum CollationEncodingEnum
+ {
+ ///
+ /// The collation sequence is UTF8
+ ///
+ UTF8 = 1,
+ ///
+ /// The collation sequence is UTF16 little-endian
+ ///
+ UTF16LE = 2,
+ ///
+ /// The collation sequence is UTF16 big-endian
+ ///
+ UTF16BE = 3,
+ }
+
+ ///
+ /// A struct describing the collating sequence a function is executing in
+ ///
+ public struct CollationSequence
+ {
+ ///
+ /// The name of the collating sequence
+ ///
+ public string Name;
+ ///
+ /// The type of collating sequence
+ ///
+ public CollationTypeEnum Type;
+
+ ///
+ /// The text encoding of the collation sequence
+ ///
+ public CollationEncodingEnum Encoding;
+
+ ///
+ /// Context of the function that requested the collating sequence
+ ///
+ internal SQLiteFunction _func;
+
+ ///
+ /// Calls the base collating sequence to compare two strings
+ ///
+ /// The first string to compare
+ /// The second string to compare
+ /// -1 if s1 is less than s2, 0 if s1 is equal to s2, and 1 if s1 is greater than s2
+ public int Compare(string s1, string s2)
+ {
+ return _func._base.ContextCollateCompare(Encoding, _func._context, s1, s2);
+ }
+
+ ///
+ /// Calls the base collating sequence to compare two character arrays
+ ///
+ /// The first array to compare
+ /// The second array to compare
+ /// -1 if c1 is less than c2, 0 if c1 is equal to c2, and 1 if c1 is greater than c2
+ public int Compare(char[] c1, char[] c2)
+ {
+ return _func._base.ContextCollateCompare(Encoding, _func._context, c1, c2);
+ }
+ }
+}
Index: System.Data.SQLite/SQLiteLog.cs
==================================================================
--- System.Data.SQLite/SQLiteLog.cs
+++ System.Data.SQLite/SQLiteLog.cs
@@ -64,11 +64,10 @@
/// Event arguments of the trace
public delegate void SQLiteLogEventHandler(object sender, LogEventArgs e);
///////////////////////////////////////////////////////////////////////////
-#if !PLATFORM_COMPACTFRAMEWORK
///
/// Manages the SQLite custom logging functionality and the associated
/// callback for the whole process.
///
public static class SQLiteLog
@@ -77,40 +76,57 @@
/// Object used to synchronize access to the static instance data
/// for this class.
///
private static object syncRoot = new object();
+ ///////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
///
/// Member variable to store the AppDomain.DomainUnload event handler.
///
private static EventHandler _domainUnload;
+#endif
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Member variable to store the application log handler to call.
///
private static event SQLiteLogEventHandler _handlers;
+
+ ///////////////////////////////////////////////////////////////////////
+
///
/// The default log event handler.
///
private static SQLiteLogEventHandler _defaultHandler;
+
+ ///////////////////////////////////////////////////////////////////////
///
/// The log callback passed to native SQLite engine. This must live
/// as long as the SQLite library has a pointer to it.
///
private static SQLiteLogCallback _callback;
+ ///////////////////////////////////////////////////////////////////////
+
///
/// The base SQLite object to interop with.
///
private static SQLiteBase _sql;
+ ///////////////////////////////////////////////////////////////////////
+
///
/// This will be non-zero if logging is currently enabled.
///
private static bool _enabled;
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Initializes the SQLite logging facilities.
///
public static void Initialize()
@@ -121,10 +137,11 @@
// the process (see ticket [2ce0870fad]).
//
if (SQLite3.StaticIsInitialized())
return;
+#if !PLATFORM_COMPACTFRAMEWORK
//
// BUGFIX: To avoid nasty situations where multiple AppDomains are
// attempting to initialize and/or shutdown what is really
// a shared native resource (i.e. the SQLite core library
// is loaded per-process and has only one logging callback,
@@ -136,13 +153,15 @@
if (!AppDomain.CurrentDomain.IsDefaultAppDomain() &&
Environment.GetEnvironmentVariable("Force_SQLiteLog") == null)
{
return;
}
+#endif
lock (syncRoot)
{
+#if !PLATFORM_COMPACTFRAMEWORK
//
// NOTE: Add an event handler for the DomainUnload event so
// that we can unhook our logging managed function
// pointer from the native SQLite code prior to it
// being invalidated.
@@ -153,10 +172,11 @@
if (_domainUnload == null)
{
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
+#endif
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
@@ -190,10 +210,13 @@
//
AddDefaultHandler();
}
}
+ ///////////////////////////////////////////////////////////////////////
+
+#if !PLATFORM_COMPACTFRAMEWORK
///
/// Handles the AppDomain being unloaded.
///
/// Should be null.
/// The data associated with this event.
@@ -256,10 +279,13 @@
AppDomain.CurrentDomain.DomainUnload -= _domainUnload;
_domainUnload = null;
}
}
}
+#endif
+
+ ///////////////////////////////////////////////////////////////////////
///
/// This event is raised whenever SQLite raises a logging event.
/// Note that this should be set as one of the first things in the
/// application.
@@ -286,19 +312,23 @@
_handlers -= value;
}
}
}
+ ///////////////////////////////////////////////////////////////////////
+
///
/// If this property is true, logging is enabled; otherwise, logging is
/// disabled. When logging is disabled, no logging events will fire.
///
public static bool Enabled
{
get { lock (syncRoot) { return _enabled; } }
set { lock (syncRoot) { _enabled = value; } }
}
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Log a message to all the registered log event handlers without going
/// through the SQLite library.
///
@@ -307,10 +337,12 @@
string message
)
{
LogMessage(null, message);
}
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Log a message to all the registered log event handlers without going
/// through the SQLite library.
///
@@ -322,10 +354,12 @@
)
{
LogMessage((object)errorCode, message);
}
+ ///////////////////////////////////////////////////////////////////////
+
///
/// Log a message to all the registered log event handlers without going
/// through the SQLite library.
///
/// The integer error code.
@@ -335,10 +369,12 @@
string message
)
{
LogMessage((object)errorCode, message);
}
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Log a message to all the registered log event handlers without going
/// through the SQLite library.
///
@@ -356,17 +392,23 @@
SQLiteLogEventHandler handlers;
lock (syncRoot)
{
enabled = _enabled;
- handlers = _handlers;
+
+ if (_handlers != null)
+ handlers = _handlers.Clone() as SQLiteLogEventHandler;
+ else
+ handlers = null;
}
if (enabled && (handlers != null))
handlers(null, new LogEventArgs(
IntPtr.Zero, errorCode, message, null));
}
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Creates and initializes the default log event handler.
///
private static void InitializeDefaultHandler()
@@ -376,27 +418,33 @@
if (_defaultHandler == null)
_defaultHandler = new SQLiteLogEventHandler(LogEventHandler);
}
}
+ ///////////////////////////////////////////////////////////////////////
+
///
/// Adds the default log event handler to the list of handlers.
///
public static void AddDefaultHandler()
{
InitializeDefaultHandler();
Log += _defaultHandler;
}
+ ///////////////////////////////////////////////////////////////////////
+
///
/// Removes the default log event handler from the list of handlers.
///
public static void RemoveDefaultHandler()
{
InitializeDefaultHandler();
Log -= _defaultHandler;
}
+
+ ///////////////////////////////////////////////////////////////////////
///
/// Internal proxy function that calls any registered application log
/// event handlers.
///
@@ -434,10 +482,12 @@
if (enabled && (handlers != null))
handlers(null, new LogEventArgs(pUserData, errorCode,
SQLiteBase.UTF8ToString(pMessage, -1), null));
}
+ ///////////////////////////////////////////////////////////////////////
+
///
/// Default logger. Currently, uses the Trace class (i.e. sends events
/// to the current trace listeners, if any).
///
/// Should be null.
@@ -474,7 +524,6 @@
Trace.WriteLine(String.Format("SQLite {0} ({1}): {2}",
success ? "message" : "error", errorCode, message));
}
}
-#endif
}
Index: System.Data.SQLite/SQLiteStatement.cs
==================================================================
--- System.Data.SQLite/SQLiteStatement.cs
+++ System.Data.SQLite/SQLiteStatement.cs
@@ -298,25 +298,29 @@
DbType objType = param.DbType;
if ((obj != null) && (objType == DbType.Object))
objType = SQLiteConvert.TypeToDbType(obj.GetType());
-#if !PLATFORM_COMPACTFRAMEWORK
if ((_flags & SQLiteConnectionFlags.LogPreBind) == SQLiteConnectionFlags.LogPreBind)
{
IntPtr handle = _sqlite_stmt;
SQLiteLog.LogMessage(String.Format(
"Binding statement {0} paramter #{1} with database type {2} and raw value {{{3}}}...",
handle, index, objType, obj));
}
-#endif
if ((obj == null) || Convert.IsDBNull(obj))
{
_sql.Bind_Null(this, _flags, index);
return;
+ }
+
+ if ((_flags & SQLiteConnectionFlags.BindAllAsText) == SQLiteConnectionFlags.BindAllAsText)
+ {
+ _sql.Bind_Text(this, _flags, index, obj.ToString());
+ return;
}
switch (objType)
{
case DbType.Date:
Index: System.Data.SQLite/System.Data.SQLite.Properties.targets
==================================================================
--- System.Data.SQLite/System.Data.SQLite.Properties.targets
+++ System.Data.SQLite/System.Data.SQLite.Properties.targets
@@ -151,10 +151,18 @@
-->
$(DefineConstants);INTEROP_DEBUG
+
+
+ $(DefineConstants);INTEROP_LEGACY_CLOSE
+
+
Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -24,11 +24,11 @@
using System.Security;
#endif
using System.Runtime.InteropServices;
-#if !PLATFORM_COMPACTFRAMEWORK
+#if !PLATFORM_COMPACTFRAMEWORK || COUNT_HANDLE
using System.Threading;
#endif
#if !PLATFORM_COMPACTFRAMEWORK && !DEBUG
[SuppressUnmanagedCodeSecurity]
@@ -139,12 +139,12 @@
///
internal static void Initialize()
{
#if !PLATFORM_COMPACTFRAMEWORK
//
- // NOTE: If the "NoPreLoadSQLite" environment variable is set, skip
- // all our special code and simply return.
+ // NOTE: If the "No_PreLoadSQLite" environment variable is set (to
+ // anything), skip all our special code and simply return.
//
if (Environment.GetEnvironmentVariable("No_PreLoadSQLite") != null)
return;
#endif
@@ -202,10 +202,38 @@
string directory = Environment.GetEnvironmentVariable(
"PreLoadSQLite_BaseDirectory");
if (directory != null)
return directory;
+
+ //
+ // NOTE: If the "PreLoadSQLite_UseAssemblyDirectory" environment
+ // variable is set (to anything), attempt to use the directory
+ // containing the currently executing assembly (i.e.
+ // System.Data.SQLite) intsead of the application domain base
+ // directory.
+ //
+ if (Environment.GetEnvironmentVariable(
+ "PreLoadSQLite_UseAssemblyDirectory") != null)
+ {
+ try
+ {
+ Assembly assembly = Assembly.GetExecutingAssembly();
+
+ if (assembly != null)
+ {
+ directory = Path.GetDirectoryName(assembly.Location);
+
+ if (!String.IsNullOrEmpty(directory))
+ return directory;
+ }
+ }
+ catch
+ {
+ // do nothing.
+ }
+ }
//
// NOTE: Otherwise, fallback on using the base directory of the
// current application domain.
//
@@ -506,11 +534,11 @@
// be used because it provides several workarounds to .NET Compact
// Framework limitations important for proper operation of the core
// System.Data.SQLite functionality (e.g. being able to bind
// parameters and handle column values of types Int64 and Double).
//
- internal const string SQLITE_DLL = "SQLite.Interop.083.dll";
+ internal const string SQLITE_DLL = "SQLite.Interop.085.dll";
#elif SQLITE_STANDARD
//
// NOTE: Otherwise, if the standard SQLite library is enabled, use it.
//
private const string SQLITE_DLL = "sqlite3";
@@ -641,16 +669,18 @@
#else
[DllImport(SQLITE_DLL)]
#endif
internal static extern SQLiteErrorCode sqlite3_close(IntPtr db);
+#if !INTEROP_LEGACY_CLOSE
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
[DllImport(SQLITE_DLL)]
#endif
internal static extern SQLiteErrorCode sqlite3_close_v2(IntPtr db); /* 3.7.14+ */
+#endif
#if !PLATFORM_COMPACTFRAMEWORK
[DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]
#else
[DllImport(SQLITE_DLL)]
Index: Tests/backup.eagle
==================================================================
--- Tests/backup.eagle
+++ Tests/backup.eagle
@@ -18,10 +18,11 @@
package require System.Data.SQLite.Test
runSQLiteTestPrologue
###############################################################################
+checkForSQLiteDirectories $test_channel
getSQLiteHandleCounts $test_channel
reportSQLiteResources $test_channel
###############################################################################
@@ -233,12 +234,13 @@
unset -nocomplain i params pages callback
###############################################################################
+checkForSQLiteDirectories $test_channel
getSQLiteHandleCounts $test_channel
reportSQLiteResources $test_channel
###############################################################################
runSQLiteTestEpilogue
runTestEpilogue
Index: Tests/basic.eagle
==================================================================
--- Tests/basic.eagle
+++ Tests/basic.eagle
@@ -312,11 +312,10 @@
set dataSource [file join [getDatabaseDirectory] $fileName]
unset -nocomplain results errors
set code [compileCSharpWith [subst {
- using System.Data;
using System.Data.SQLite;
namespace _Dynamic${id}
{
public static class Test${id}
@@ -421,11 +420,10 @@
}
unset -nocomplain results errors
set code [compileCSharpWith [subst {
- using System.Data;
using System.Data.SQLite;
namespace _Dynamic${id}
{
public static class Test${id}
@@ -479,11 +477,10 @@
}
unset -nocomplain results errors
set code [compileCSharpWith [subst {
- using System.Data;
using System.Data.SQLite;
namespace _Dynamic${id}
{
public static class Test${id}
@@ -935,15 +932,35 @@
set code [compileCSharpWith [subst {
using System;
using System.Data.SQLite;
using System.Reflection;
+ using System.Text;
namespace _Dynamic${id}
{
public static class Test${id}
{
+ private static string ToHexString(
+ byte\[\] array
+ )
+ {
+ if (array == null)
+ return null;
+
+ StringBuilder result = new StringBuilder();
+
+ int length = array.Length;
+
+ for (int index = 0; index < length; index++)
+ result.AppendFormat("{0:x2}", array\[index\]);
+
+ return result.ToString();
+ }
+
+ ///////////////////////////////////////////////////////////////////////
+
public static string GetConnectionString(
string key,
string value,
string propertyName
)
@@ -961,11 +978,12 @@
propertyValue = typeof(SQLiteConnectionStringBuilder).InvokeMember(
propertyName, BindingFlags.Instance | BindingFlags.Public |
BindingFlags.GetProperty, null, builder, null);
}
- return String.Format("{0}, {1}", propertyValue, builder);
+ return String.Format("{0}, {1}", (propertyValue is byte\[\]) ?
+ ToHexString((byte\[\])propertyValue) : propertyValue, builder);
}
///////////////////////////////////////////////////////////////////////
public static void Main()
@@ -983,27 +1001,27 @@
BinaryGUID "Data Source" Uri FullUri "Default Timeout" \
Enlist FailIfMissing "Legacy Format" "Read Only" \
Password "Page Size" "Max Page Count" "Cache Size" \
DateTimeFormat DateTimeKind BaseSchemaName \
"Journal Mode" "Default IsolationLevel" "Foreign Keys" \
- Flags SetDefaults ToFullPath]
+ Flags SetDefaults ToFullPath HexPassword]
set values [list null 3 Normal True False \
True test.db test.db file:test.db 60 \
False True False True \
secret 4096 1024 8192 \
UnixEpoch Utc sqlite_schema \
Memory Serializable False \
- Default False False]
+ Default False False 736563726574]
set propertyNames [list null Version SyncMode UseUTF16Encoding Pooling \
BinaryGUID DataSource Uri FullUri DefaultTimeout \
Enlist FailIfMissing LegacyFormat ReadOnly \
Password PageSize MaxPageCount CacheSize \
DateTimeFormat DateTimeKind BaseSchemaName \
JournalMode DefaultIsolationLevel ForeignKeys \
- Flags SetDefaults ToFullPath]
+ Flags SetDefaults ToFullPath HexPassword]
foreach key $keys value $values propertyName $propertyNames {
set code [catch {
object invoke _Dynamic${id}.Test${id} GetConnectionString \
$key $value $propertyName
@@ -1030,11 +1048,11 @@
\{UnixEpoch, DateTimeFormat=UnixEpoch\} 0 \{Utc, DateTimeKind=Utc\} 0\
\{sqlite_schema, BaseSchemaName=sqlite_schema\} 0 \{Memory, Journal\
Mode=Memory\} 0 \{Serializable, Default IsolationLevel=Serializable\} 0\
\{False, Foreign Keys=False\} 0 \{(?:Default|LogCallbackException),\
Flags=(?:Default|LogCallbackException)\} 0 \{False, SetDefaults=False\} 0\
-\{False, ToFullPath=False\}$}}
+\{False, ToFullPath=False\} 0 {736563726574, HexPassword=736563726574}$}}
###############################################################################
runTest {test data-1.17 {SQLiteConvert ToDateTime (Julian Day)} -body {
set dateTime [object invoke System.Data.SQLite.SQLiteConvert ToDateTime \
@@ -1434,11 +1452,11 @@
[object invoke -flags +NonPublic System.Data.SQLite.SQLiteConvert \
TypeNameToDbType "VARCHAR (1)"] \
[object invoke -flags +NonPublic System.Data.SQLite.SQLiteConvert \
TypeNameToDbType "NVARCHAR (1)"] \
} -constraints {eagle System.Data.SQLite} -result \
-{String String String String String String}}
+{AnsiString String AnsiString String AnsiString String}}
###############################################################################
runTest {test data-1.28 {SetMemoryStatus method} -setup {
#
@@ -1690,21 +1708,21 @@
{[llength [file list $directory(data) $fileName]] == 1}]
set t [object create -alias Thread threadStart]
sql execute $db "BEGIN TRANSACTION;"; $t Start
- for {set i 1} {$i < 100} {incr i} {
+ for {set i 1} {$i < 1000} {incr i} {
#
# NOTE: Execute a query that should force the creation of a temporary file
# for its statement journal.
#
sql execute $db "UPDATE t1 SET x = ?;" [list param1 String $i]
#
# NOTE: Give the other thread some time to notice the temporary file.
#
- after 1000
+ after [expr {int(rand() * 1000)}]
#
# NOTE: Stop when the other thread confirms that the temporary file was
# created in the correct directory.
#
@@ -1712,11 +1730,13 @@
break
}
}
$t Join; sql execute $db "COMMIT TRANSACTION;"
- lappend result $found(data) $found(temp); set result
+
+ lappend result $found(data) [expr {[info exists found(temp)] ? \
+ $found(temp) : False}]; set result
} -cleanup {
#
# NOTE: Close the database; however, do not attempt to delete the file as
# it is not located in the database directory known to the cleanupDb
# procedure (i.e. the one returned by getDatabaseDirectory).
@@ -2233,10 +2253,101 @@
unset -nocomplain result db fileName
} -constraints \
{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
{{x 0 1} {y 1 foo} {z 2 1234}}}
+
+###############################################################################
+
+runTest {test data-1.47 {nullable value types} -setup {
+ setupDb [set fileName data-1.47.db]
+} -body {
+ sql execute $db {
+ CREATE TABLE t1(x INTEGER);
+ INSERT INTO t1 (x) VALUES(NULL);
+ INSERT INTO t1 (x) VALUES(1);
+ }
+
+ set dataReader [sql execute -execute reader -format datareader \
+ -alias $db "SELECT x FROM t1 ORDER BY x;"]
+
+ set result [list]
+
+ while {[$dataReader Read]} {
+ foreach {a b c d e} [list "" "" "" "" ""] break
+
+ set x [$dataReader GetOrdinal x]
+
+ foreach {a b c e} [list \
+ [$dataReader GetName $x] [$dataReader GetValue $x] \
+ [catch {$dataReader GetInt64 $x} d] [$dataReader Item x]] break
+
+ lappend result [list $x $a $b $c $d $e]
+ }
+
+ set result
+} -cleanup {
+ unset -nocomplain dataReader
+
+ cleanupDb $fileName
+
+ unset -nocomplain e d c b a x result db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \
+regexp -result {^\{0 x System#DBNull#\d+ 1\
+\{System\.Reflection\.TargetInvocationException: Exception has been thrown by\
+the target of an invocation\. ---> System\.InvalidCastException:.*\}\
+System#DBNull#\d+\} \{0 x 1 0 1 1\}$}}
+
+###############################################################################
+
+runTest {test data-1.48 {static SQLiteCommand.Execute method} -setup {
+ unset -nocomplain result sql
+} -body {
+ set sql(1) { \
+ CREATE TABLE t1(x); \
+ INSERT INTO t1 (x) VALUES (NULL); \
+ SELECT x FROM t1 ORDER BY x; \
+ }
+
+ set sql(2) { \
+ CREATE TABLE t1(x); \
+ INSERT INTO t1 (x) VALUES (?); \
+ SELECT x FROM t1 ORDER BY x; \
+ }
+
+ set result(1) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ "this will not execute" None null]
+
+ set result(2) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(1) NonQuery null]
+
+ set result(3) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(1) Scalar null]
+
+ set result(4) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(1) Reader null]
+
+ set result(5) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ "this will not execute" None null 1]
+
+ set result(6) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(2) NonQuery null 1]
+
+ set result(7) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(2) Scalar null 1]
+
+ set result(8) [object invoke System.Data.SQLite.SQLiteCommand Execute \
+ $sql(2) Reader null 1]
+
+ list $result(1) $result(2) $result(3) $result(4) $result(5) $result(6) \
+ $result(7) $result(8)
+} -cleanup {
+ unset -nocomplain result sql
+} -constraints {eagle monoBug28 SQLite System.Data.SQLite} -match regexp \
+-result {^\{\} 1 System#DBNull#\d+ System#Data#SQLite#SQLiteDataReader#\d+ \{\}\
+1 1 System#Data#SQLite#SQLiteDataReader#\d+$}}
###############################################################################
unset -nocomplain systemDataSQLiteDllFile systemDataSQLiteLinqDllFile \
testExeFile testLinqExeFile northwindEfDbFile testLinqOutFile
Index: Tests/common.eagle
==================================================================
--- Tests/common.eagle
+++ Tests/common.eagle
@@ -87,10 +87,59 @@
return 2008; # TODO: Good "fallback" default?
}
}
}
}
+
+ proc getBuildYears {} {
+ #
+ # NOTE: See if the list of test years has been overridden by the user
+ # (e.g. on the command line).
+ #
+ if {[info exists ::test_years] && [llength $::test_years] > 0} then {
+ #
+ # NOTE: Use the specified list of test years.
+ #
+ return $::test_years
+ } else {
+ #
+ # NOTE: Use the default list of test years.
+ #
+ return [list 2005 2008 2010 2012]
+ }
+ }
+
+ proc getBuildPlatform { native } {
+ if {[info exists ::test_platform] && \
+ [string length $::test_platform] > 0} then {
+ #
+ # NOTE: Use the specified test platform. If this variable is not set,
+ # the default value will be based on the machine architecture.
+ #
+ return [expr {$native ? $::test_platform : ""}]
+ } elseif {[info exists ::test_machine] && \
+ [string length $::test_machine] > 0} then {
+ #
+ # NOTE: For native builds, return the platform name corresponding to
+ # the test machine architecture; otherwise, return an empty
+ # string.
+ #
+ return [expr {$native ? [machineToPlatform $::test_machine] : ""}]
+ } elseif {[info exists ::tcl_platform(machine)]} then {
+ #
+ # NOTE: For native builds, return the platform name corresponding to
+ # the machine architecture; otherwise, return an empty string.
+ #
+ return [expr {$native ? \
+ [machineToPlatform $::tcl_platform(machine)] : ""}]
+ } else {
+ #
+ # NOTE: No machine architecture is available, return an empty string.
+ #
+ return ""
+ }
+ }
proc getBuildConfiguration {} {
#
# NOTE: See if the "configuration" setting has been overridden by the user
# (e.g. on the command line). This helps control exactly which set
@@ -123,10 +172,79 @@
# from the -preTest option to the test suite.
#
return $::eagle_platform(configuration)
}
}
+
+ proc getBuildConfigurations {} {
+ #
+ # NOTE: See if the list of test configurations has been overridden by
+ # the user (e.g. on the command line).
+ #
+ if {[info exists ::test_configurations] && \
+ [llength $::test_configurations] > 0} then {
+ #
+ # NOTE: Use the specified list of test configurations.
+ #
+ return $::test_configurations
+ } else {
+ #
+ # NOTE: Use the default list of test configurations.
+ #
+ return [list Debug Release]
+ }
+ }
+
+ proc getBuildBaseDirectory {} {
+ #
+ # NOTE: Figure out the base directory where all the builds should be
+ # located. This will be the directory that contains the actual
+ # build output directory (e.g. parent of "bin").
+ #
+ if {[info exists ::build_base_directory] && \
+ [string length $::build_base_directory] > 0} then {
+ #
+ # NOTE: The location of the build base directory has been overridden;
+ # therefore, use it verbatim.
+ #
+ return $::build_base_directory
+ } elseif {[info exists ::common_directory] && \
+ [string length $::common_directory] > 0} then {
+ #
+ # NOTE: Next, fallback to the parent directory of the one containing
+ # this file (i.e. "common.eagle"), if available.
+ #
+ return [file dirname $::common_directory]
+ } elseif {[info exists ::path] && \
+ [string length $::path] > 0} then {
+ #
+ # NOTE: Finally, fallback to the parent directory of the EagleTest
+ # path. The EagleTest package guarantees that this variable
+ # will be set to the directory containing the first file to
+ # execute the [runTestPrologue] script library procedure.
+ #
+ return [file dirname $::path]
+ } else {
+ #
+ # NOTE: No path is available, return an empty string. This point
+ # should not be reached.
+ #
+ return ""
+ }
+ }
+
+ proc joinBuildDirectory { path native year platform configuration } {
+ #
+ # NOTE: Figure out and then return the fully qualified path to the build
+ # directory based on all the arguments provided by our caller.
+ #
+ if {$native} then {
+ return [file join $path bin $year $platform $configuration]
+ } else {
+ return [file join $path bin $year $configuration bin]
+ }
+ }
proc getBuildDirectory {} {
#
# NOTE: See if the "native" runtime option has been set. If so, use the
# directory for the mixed-mode assembly (a.k.a. the native interop
@@ -150,38 +268,10 @@
# NOTE: The location of the build directory has been overridden;
# therefore, use it verbatim.
#
return $::build_directory
} else {
- #
- # NOTE: Figure out the build base directory. This will be the directory
- # that contains the actual build output directory (e.g. "bin").
- #
- if {[info exists ::build_base_directory] && \
- [string length $::build_base_directory] > 0} then {
- #
- # NOTE: The location of the build base directory has been overridden;
- # therefore, use it verbatim.
- #
- set path $::build_base_directory
- } elseif {[info exists ::common_directory] && \
- [string length $::common_directory] > 0} then {
- #
- # NOTE: Next, fallback to the parent directory of the one containing
- # this file (i.e. "common.eagle"), if available.
- #
- set path [file dirname $::common_directory]
- } else {
- #
- # NOTE: Finally, fallback to the parent directory of the EagleTest
- # path. The EagleTest package guarantees that this variable
- # will be set to the directory containing the first file to
- # execute the [runTestPrologue] script library procedure.
- #
- set path [file dirname $::path]
- }
-
#
# NOTE: If the "native" runtime option is set, the mixed-mode assembly
# is being tested. In that case, the path to the build directory
# will contain the platform name and all the binaries under test
# should be present in that directory. If the "native" runtime
@@ -218,17 +308,14 @@
# the latest version of MSBuild available and the "test_year" may
# need to be adjusted accordingly to actually run the test suite.
# Refer to the comments in [getBuildYear] for more information on
# how to set this variable.
#
- if {[hasRuntimeOption native]} then {
- return [file join $path bin [getBuildYear] [machineToPlatform \
- $::tcl_platform(machine)] [getBuildConfiguration]]
- } else {
- return [file join $path bin [getBuildYear] [getBuildConfiguration] \
- bin]
- }
+ set native [hasRuntimeOption native]
+
+ return [joinBuildDirectory [getBuildBaseDirectory] $native \
+ [getBuildYear] [getBuildPlatform $native] [getBuildConfiguration]]
}
}
proc getBuildFileName { fileName } {
#
@@ -470,14 +557,40 @@
object invoke Interpreter.GetActive AddRuntimeOption native
}
} [getTestOverridesPreamble [list path test_channel]] $suffix]]]
}
- proc tryCopyBuildFile { fileName } {
- #
- # NOTE: If we cannot copy the assembly then it is probably already loaded.
- #
+ proc tryCopyBinaryFile { fileName {newFileName ""} } {
+ set sourceFileName [getBinaryFileName $fileName]
+
+ if {![file exists $sourceFileName]} then {
+ tputs $::test_channel [appendArgs \
+ "---- skipped copying binary file \"" $sourceFileName \
+ "\", it does not exist\n"]
+
+ return
+ }
+
+ if {[string length $newFileName] > 0} then {
+ set targetFileName [getBuildFileName $newFileName]
+ } else {
+ set targetFileName [getBuildFileName $fileName]
+ }
+
+ if {[catch {
+ file copy -force $sourceFileName $targetFileName}] == 0} then {
+ tputs $::test_channel [appendArgs \
+ "---- copied binary file from \"" $sourceFileName "\" to \"" \
+ $targetFileName \"\n]
+ } else {
+ tputs $::test_channel [appendArgs \
+ "---- failed to copy binary file from \"" $sourceFileName \
+ "\" to \"" $targetFileName \"\n]
+ }
+ }
+
+ proc tryCopyBuildFile { fileName {newFileName ""} } {
set sourceFileName [getBuildFileName $fileName]
if {![file exists $sourceFileName]} then {
tputs $::test_channel [appendArgs \
"---- skipped copying build file \"" $sourceFileName \
@@ -484,11 +597,15 @@
"\", it does not exist\n"]
return
}
- set targetFileName [getBinaryFileName $fileName]
+ if {[string length $newFileName] > 0} then {
+ set targetFileName [getBinaryFileName $newFileName]
+ } else {
+ set targetFileName [getBinaryFileName $fileName]
+ }
if {[catch {
file copy -force $sourceFileName $targetFileName}] == 0} then {
tputs $::test_channel [appendArgs \
"---- copied build file from \"" $sourceFileName "\" to \"" \
@@ -517,10 +634,30 @@
} else {
tputs $::test_channel [appendArgs \
"---- failed to delete binary file \"" $fileName \"\n]
}
}
+
+ proc tryDeleteBuildFile { fileName } {
+ set fileName [getBuildFileName $fileName]
+
+ if {![file exists $fileName]} then {
+ tputs $::test_channel [appendArgs \
+ "---- skipped deleting build file \"" $fileName \
+ "\", it does not exist\n"]
+
+ return
+ }
+
+ if {[catch {file delete $fileName}] == 0} then {
+ tputs $::test_channel [appendArgs \
+ "---- deleted build file \"" $fileName \"\n]
+ } else {
+ tputs $::test_channel [appendArgs \
+ "---- failed to delete build file \"" $fileName \"\n]
+ }
+ }
proc tryCopyAssembly { fileName {pdb true} } {
tryCopyBuildFile $fileName
if {$pdb} then {
@@ -574,10 +711,37 @@
# always return zero.
#
return [expr {[haveConstraint System.Data.SQLite] && \
[haveConstraint SQLite]}]
}
+
+ proc checkForSQLiteBuilds { channel } {
+ #
+ # NOTE: Check for every possible valid combination of values used when
+ # locating out the build output directory, showing each available
+ # build variation along the way.
+ #
+ foreach native [list false true] {
+ foreach year [getBuildYears] {
+ foreach configuration [getBuildConfigurations] {
+ tputs $channel [appendArgs \
+ "---- checking for System.Data.SQLite build \"" [expr \
+ {$native ? "native/" : ""}] $year / $configuration "\"... "]
+
+ set fileName [file nativename [file join [joinBuildDirectory \
+ [getBuildBaseDirectory] $native $year [getBuildPlatform \
+ $native] $configuration] System.Data.SQLite.dll]]
+
+ if {[file exists $fileName]} then {
+ tputs $channel yes\n
+ } else {
+ tputs $channel no\n
+ }
+ }
+ }
+ }
+ }
proc checkForSQLite { channel } {
tputs $channel "---- checking for core SQLite library... "
if {[catch {
@@ -1076,10 +1240,72 @@
set code 0
}
return $code
}
+
+ proc setupDbInterruptCallback { channel log } {
+ tputs $channel "---- setting up debugger interrupt callback... "
+
+ if {[catch {
+ #
+ # NOTE: Make sure the script debugger and the isolated interpreter are
+ # setup and ready for use.
+ #
+ debug setup true true
+
+ #
+ # NOTE: Load the necessary packages into the isolated interpreter.
+ #
+ debug eval {
+ package require Eagle
+ package require Eagle.Library
+ package require Eagle.Test
+ }
+
+ #
+ # NOTE: Copy the necessary variables into the isolated interpreter.
+ #
+ debug invoke 0 set ::test_channel $channel; # NOTE: For [tputs].
+ debug invoke 0 set ::test_log $log; # NOTE: For [tlog].
+
+ #
+ # NOTE: Install the callback script to be evaluated in the isolated
+ # interpreter when this interpreter is interrupted by script
+ # cancellation, etc.
+ #
+ debug callback apply {{sender e} {
+ #
+ # NOTE: Check if this callback is one that we care about.
+ #
+ if {"Canceled" in [split [$e InterruptType] ", "]} then {
+ #
+ # NOTE: Iterate through all database connections known to the
+ # parent interpreter.
+ #
+ object foreach -alias pair \
+ [object invoke -flags +NonPublic $e Interpreter.connections] {
+ #
+ # NOTE: Attempt to cancel any SQL queries in progress on this
+ # database connection.
+ #
+ if {[catch {$pair Value.Cancel} error] != 0} then {
+ tputs $::test_channel [appendArgs \n \
+ "==== WARNING: failed to cancel query for connection \"" \
+ [$pair Key] "\", error: " \n\t $error \n]
+ }
+ }
+ }
+ }}
+ } error] == 0} then {
+ addConstraint interruptCallback.sqlite3
+
+ tputs $channel yes\n
+ } else {
+ tputs $channel [appendArgs "no, error: " \n\t $error \n]
+ }
+ }
proc cleanupFile { fileName {collect true} {force false} } {
#
# NOTE: Attempt to force all pending "garbage" objects to be collected,
# including SQLite statements and backup objects; this should allow
@@ -1220,10 +1446,16 @@
# the SQLiteLog class being able to setup its logging callback).
# Normally, this should only be performed if SQLite is loaded and
# ready for use by the test suite.
#
if {$force || [isSQLiteReady]} then {
+ #
+ # BUGFIX: Before calling the native shutdown function, make sure both
+ # of the PRAGMA related directory names are freed.
+ #
+ checkForSQLiteDirectories $channel true
+
if {[catch {object invoke -flags +NonPublic \
System.Data.SQLite.UnsafeNativeMethods \
sqlite3_shutdown} result] == 0} then {
if {!$quiet} then {
tputs $channel [appendArgs \
@@ -1448,10 +1680,16 @@
tputs $channel [appendArgs \
"==== WARNING: failed to load per-user settings file \"" \
$userSettingsFileName "\", error: " \n\t $error \n]
}
}
+ } else {
+ if {!$quiet} then {
+ tputs $channel [appendArgs \
+ "---- skipped loading per-user test settings file \"" \
+ $userSettingsFileName "\", it does not exist\n"]
+ }
}
}
#######################################################################
@@ -1472,10 +1710,16 @@
tputs $channel [appendArgs \
"==== WARNING: failed to load per-host settings file \"" \
$hostSettingsFileName "\", error: " \n\t $error \n]
}
}
+ } else {
+ if {!$quiet} then {
+ tputs $channel [appendArgs \
+ "---- skipped loading per-host test settings file \"" \
+ $hostSettingsFileName "\", it does not exist\n"]
+ }
}
}
}
}
@@ -1528,10 +1772,34 @@
#
if {![info exists ::no(loadSqliteFiles)]} then {
tryLoadAssembly System.Data.SQLite.dll
tryLoadAssembly System.Data.SQLite.Linq.dll
}
+
+ #
+ # NOTE: Skip trying to delete external files if we are so instructed.
+ #
+ if {![info exists ::no(deleteSqliteExternalFiles)]} then {
+ tryDeleteBuildFile Installer.exe.mda.config
+ tryDeleteBuildFile test.exe.mda.config
+ tryDeleteBuildFile testlinq.exe.mda.config
+ }
+
+ #
+ # NOTE: Skip trying to copy external files if we are so instructed.
+ #
+ if {![info exists ::no(copySqliteExternalFiles)]} then {
+ #
+ # NOTE: Copy the MDA configuration file for the Eagle shell to the
+ # build output directory; however, use the name of the legacy
+ # test executable. This will make sure that the legacy tests
+ # run with the same set of MDAs configured.
+ #
+ tryCopyBinaryFile EagleShell.exe.mda.config Installer.exe.mda.config
+ tryCopyBinaryFile EagleShell.exe.mda.config test.exe.mda.config
+ tryCopyBinaryFile EagleShell.exe.mda.config testlinq.exe.mda.config
+ }
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"sqlite3.dll\"... " \
@@ -1577,10 +1845,15 @@
} else {
tputs $::test_channel unknown\n
}
}
+ #
+ # NOTE: Check the available builds of SQLite and System.Data.SQLite.
+ #
+ checkForSQLiteBuilds $::test_channel
+
#
# NOTE: Now, we need to know if the SQLite core library is available
# (i.e. because the managed-only System.Data.SQLite assembly can
# load without it; however, it cannot do anything useful without
# it). If we are using the mixed-mode assembly and we already
@@ -1600,12 +1873,12 @@
# for the interop assembly in order to be effective. For those
# options, it will be assumed that it was enabled for the interop
# assembly if it was enabled for the managed assembly.
#
foreach defineConstant [list CHECK_STATE COUNT_HANDLE INTEROP_CODEC \
- INTEROP_DEBUG INTEROP_LOG \
- INTEROP_EXTENSION_FUNCTIONS \
+ INTEROP_DEBUG INTEROP_LEGACY_CLOSE \
+ INTEROP_LOG INTEROP_EXTENSION_FUNCTIONS \
INTEROP_TEST_EXTENSION SQLITE_STANDARD \
USE_INTEROP_DLL] {
#
# NOTE: Check if the compile-time option is listed in the list of
# "define constants" kept track of by the managed assembly.
@@ -1631,12 +1904,21 @@
#
tputs $::test_channel \
"---- checking for System.Data.SQLite build configuration... "
set configuration [getBuildConfiguration]
- addConstraint [appendArgs buildConfiguration $configuration]
+ addConstraint [appendArgs buildConfiguration. $configuration]
tputs $::test_channel [appendArgs \" $configuration \"\n]
+
+ #
+ # NOTE: Try to setup an interrupt callback using the script debugger
+ # that will cancel all SQL queries in progress for all database
+ # connections known to this interpreter.
+ #
+ if {![info exists ::no(sqliteInterruptCallback)]} then {
+ setupDbInterruptCallback $::test_channel $::test_log
+ }
#
# NOTE: Check for the native runtime option, which would mean we are
# using the mixed-mode assembly.
#
@@ -1666,11 +1948,11 @@
[formatList [lsort [getConstraints]]] \n]
#
# NOTE: Save the test constraints for use by threads created in this
# application domain. This is necessary because all the Eagle
- # "test context" information, is per-thread.
+ # "test context" information is per-thread.
#
if {![info exists ::test_constraints]} then {
set ::test_constraints $::eagle_tests(constraints)
}
@@ -1700,10 +1982,16 @@
#
tputs $::test_channel [appendArgs \
"---- System.Data.SQLite tests ended at " \
[clock format [clock seconds]] \n]
+ #
+ # BUGFIX: Before checking the final resources in use by SQLite, make
+ # sure both of the PRAGMA related directory names are freed.
+ #
+ checkForSQLiteDirectories $::test_channel true
+
#
# NOTE: Also report the resource usage after running the tests.
#
reportSQLiteResources $::test_channel
}
Index: Tests/stress.eagle
==================================================================
--- Tests/stress.eagle
+++ Tests/stress.eagle
@@ -21,10 +21,11 @@
###############################################################################
#
# NOTE: Report before test, before shutdown.
#
+checkForSQLiteDirectories $test_channel
getSQLiteHandleCounts $test_channel
reportSQLiteResources $test_channel
###############################################################################
@@ -37,20 +38,21 @@
###############################################################################
#
# NOTE: Report before test, after shutdown.
#
+checkForSQLiteDirectories $test_channel
getSQLiteHandleCounts $test_channel
reportSQLiteResources $test_channel
###############################################################################
runTest {test stress-1.1 {multithreaded stress testing} -setup {
unset -nocomplain result thread index workload priority noWorkload \
priorities srcDb db fileName compiled options count times logFileName \
- logListener connection indicators iterations exitOnFail coTaskMem \
- noTrace failures status
+ logListener event timeout connection indicators iterations exitOnFail \
+ coTaskMem noTrace failures status
#############################################################################
proc setupWorkloadMemDb { fileName {varName db} } {
#
@@ -139,10 +141,19 @@
#############################################################################
proc delayTest { {extra 0} } {
after [expr {int((rand() * 1000) + $extra)}]
}
+
+ #############################################################################
+
+ proc waitTest { indicator } {
+ if {![$::event WaitOne $::timeout]} then {
+ error [appendArgs "timeout while starting workload #" \
+ [expr {[string ordinal $indicator 0] - [string ordinal A 0] + 1}]]
+ }
+ }
#############################################################################
proc showTest { indicator } {
tputs $::test_channel $indicator
@@ -352,11 +363,11 @@
# NOTE: Load custom per-user and/or per-host test settings. Currently, this
# is done after processing the command line options. The settings file
# should take into account the existing workload parameters and avoid
# changing any that may have already been overridden.
#
- loadSQLiteTestSettings $test_channel
+ loadSQLiteTestSettings $test_channel .stress
#############################################################################
#
# NOTE: The trace listener used with the SQLiteLog class to capture output
@@ -464,10 +475,24 @@
#
set connection [getDbConnection]
$connection LogMessage 0 [appendArgs \
"starting stress test using database \"" $fileName(2) \"...]
+
+ #############################################################################
+
+ set timeout [object invoke -flags +NonPublic \
+ Eagle._Components.Private.ThreadOps DefaultJoinTimeout]
+
+ tputs $test_channel [appendArgs \
+ "---- workloads will start before or timeout after " $timeout \
+ " millisecond(s)\n"]
+
+ #############################################################################
+
+ set event [object create -alias \
+ System.Threading.EventWaitHandle false ManualReset]
#############################################################################
# WORKLOAD #1 (A) #
#############################################################################
@@ -474,10 +499,11 @@
set workload(1) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #1, CREATE TABLE statements.
#
+ waitTest A
lappend ::times(1) [lindex [time {
initTest A
setupWorkloadFileDb $dstFileName
for {set index 2} {$index <= $count1} {incr index} {
if {[catch {
@@ -505,10 +531,11 @@
set workload(2) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #2, DROP TABLE statements.
#
+ waitTest B
lappend ::times(2) [lindex [time {
initTest B
setupWorkloadFileDb $dstFileName
for {set index 2} {$index <= $count1} {incr index} {
if {[catch {
@@ -535,10 +562,11 @@
set workload(3) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #3, "small" SELECT statements.
#
+ waitTest C
lappend ::times(3) [lindex [time {
initTest C
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -572,10 +600,11 @@
set workload(4) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #4, "big" SELECT statements.
#
+ waitTest D
lappend ::times(4) [lindex [time {
initTest D
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -609,10 +638,11 @@
set workload(5) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #5, "small" INSERT statements.
#
+ waitTest E
lappend ::times(5) [lindex [time {
initTest E
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -641,10 +671,11 @@
set workload(6) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #6, "big" INSERT statements.
#
+ waitTest F
lappend ::times(6) [lindex [time {
initTest F
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -672,10 +703,11 @@
set workload(7) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #7, "small" UPDATE statements.
#
+ waitTest G
lappend ::times(7) [lindex [time {
initTest G
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -703,10 +735,11 @@
set workload(8) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #8, "big" UPDATE statements.
#
+ waitTest H
lappend ::times(8) [lindex [time {
initTest H
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -734,10 +767,11 @@
set workload(9) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #9, "small" DELETE statements.
#
+ waitTest I
lappend ::times(9) [lindex [time {
initTest I
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -764,10 +798,11 @@
set workload(10) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #10, "big" DELETE statements.
#
+ waitTest J
lappend ::times(10) [lindex [time {
initTest J
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -794,10 +829,11 @@
set workload(11) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #11, VACUUM statement.
#
+ waitTest K
lappend ::times(11) [lindex [time {
initTest K
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -823,10 +859,11 @@
set workload(12) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #12, backup to in-memory database.
#
+ waitTest L
lappend ::times(12) [lindex [time {
initTest L
for {set index 1} {$index <= $count1} {incr index} {
if {[string is integer -strict $::compiled(12)]} then {
set id $::compiled(12); # NOTE: Already compiled.
@@ -905,10 +942,11 @@
set workload(13) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #13, backup from an in-memory database.
#
+ waitTest M
lappend ::times(13) [lindex [time {
initTest M
for {set index 1} {$index <= $count1} {incr index} {
if {[string is integer -strict $::compiled(13)]} then {
set id $::compiled(13); # NOTE: Already compiled.
@@ -987,10 +1025,11 @@
set workload(14) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #14, PRAGMA integrity check statement.
#
+ waitTest N
lappend ::times(14) [lindex [time {
initTest N
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -1020,10 +1059,11 @@
set workload(15) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #15, force managed garbage collection
#
+ waitTest O
lappend ::times(15) [lindex [time {
initTest O
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
collectGarbage $::test_channel
@@ -1047,10 +1087,11 @@
set workload(16) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #16, allocate (exclude) some native heap memory
#
+ waitTest P
lappend ::times(16) [lindex [time {
initTest P
set maxSize $::count(5)
object invoke GC AddMemoryPressure $maxSize
try {
@@ -1086,10 +1127,11 @@
set workload(17) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #17, change the database journal mode
#
+ waitTest Q
lappend ::times(17) [lindex [time {
initTest Q
setupWorkloadFileDb $dstFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -1116,10 +1158,11 @@
set workload(18) [list \
[list srcFileName dstFileName table count1 count2 count3] {
#
# NOTE: Workload #18, execute queries against the in-memory database
#
+ waitTest R
lappend ::times(18) [lindex [time {
initTest R
setupWorkloadMemDb $srcFileName
for {set index 1} {$index <= $count1} {incr index} {
if {[catch {
@@ -1233,22 +1276,26 @@
set thread($index(1)) [object create -alias System.Threading.Thread \
[list apply $workload($index(1)) $fileName(1) $fileName(2) t1 \
$count(1) $count(3) $count(4)] 1048576]
$thread($index(1)) Name [appendArgs \
- [file rootname [file tail $fileName(2)]] " #" $index(1)]
+ [file rootname [file tail $fileName(2)]] " #" $index(1)]
if {[info exists priority($index(1))]} then {
$thread($index(1)) Priority $priority($index(1))
}
}
}
- foreach index(1) [list Start Join] {
- foreach index(2) [array names thread] {
- $thread($index(2)) $index(1)
- }
+ foreach index(1) [array names thread] {
+ $thread($index(1)) Start
+ }
+
+ $event Set; # GO
+
+ foreach index(1) [array names thread] {
+ $thread($index(1)) Join
}
foreach index(1) [array names thread] {
if {[info exists thread($index(1))] && \
[cleanupThread $thread($index(1))]} then {
@@ -1348,10 +1395,11 @@
rename useMem ""
rename allocMem ""
rename failTest ""
rename doneTest ""
rename showTest ""
+ rename waitTest ""
rename delayTest ""
rename initTest ""
rename isExpectedError ""
rename formatWorkloadTime ""
rename formatWorkloadResult ""
@@ -1377,22 +1425,23 @@
rename cleanupLogging ""
rename setupLogging ""
unset -nocomplain result thread index workload priority noWorkload \
priorities srcDb db fileName compiled options count times logFileName \
- logListener connection indicators iterations exitOnFail coTaskMem \
- noTrace failures status
+ logListener event timeout connection indicators iterations exitOnFail \
+ coTaskMem noTrace failures status
} -time true -constraints {eagle monoBug28 command.sql compile.DATA SQLite\
System.Data.SQLite} -result {0}}
###############################################################################
#
# NOTE: Report after test.
#
+checkForSQLiteDirectories $test_channel
getSQLiteHandleCounts $test_channel
reportSQLiteResources $test_channel
###############################################################################
runSQLiteTestEpilogue
runTestEpilogue
Index: Tests/thread.eagle
==================================================================
--- Tests/thread.eagle
+++ Tests/thread.eagle
@@ -88,15 +88,16 @@
INSERT INTO t1 (y) VALUES(RANDOMBLOB(${count(4)}));
INSERT INTO t1 (y) VALUES(RANDOMBLOB(${count(4)}));
}]
#
- # NOTE: The temporary directory must be reset here because it allocates
- # some SQLite memory and this test requires an extremely accurate
- # reading.
+ # NOTE: The data and temporary directories must be reset here (after the
+ # setupDb call above) because they allocate some SQLite memory and
+ # this test requires an extremely accurate reading.
#
sql execute $db {
+ PRAGMA data_store_directory = "";
PRAGMA temp_store_directory = "";
}
#
# NOTE: Close the database now, freeing any native SQLite memory and/or
ADDED Tests/tkt-1c456ae75f.eagle
Index: Tests/tkt-1c456ae75f.eagle
==================================================================
--- /dev/null
+++ Tests/tkt-1c456ae75f.eagle
@@ -0,0 +1,192 @@
+###############################################################################
+#
+# tkt-1c456ae75f.eagle --
+#
+# Written by Joe Mistachkin.
+# Released to the public domain, use at your own risk!
+#
+###############################################################################
+
+package require Eagle
+package require Eagle.Library
+package require Eagle.Test
+
+runTestPrologue
+
+###############################################################################
+
+package require System.Data.SQLite.Test
+runSQLiteTestPrologue
+
+###############################################################################
+
+runTest {test tkt-1c456ae75f-1.1 {unencrypted database, hex password} -setup {
+ setupDb [set fileName tkt-1c456ae75f-1.1.db]
+} -body {
+ sql execute $db "CREATE TABLE t1(x);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(1);"
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "HexPassword=3132333435;" true false
+
+ set result [list]
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "" true false
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ set result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain error result db fileName
+} -constraints {eagle defineConstant.System.Data.SQLite.INTEROP_CODEC monoBug28\
+command.sql compile.DATA SQLite System.Data.SQLite} -match regexp -result {^1\
+\{System\.Data\.SQLite\.SQLiteException \(0x80004005\): file is encrypted or is\
+not a database.*?\} 1 \{System\.Data\.SQLite\.SQLiteException \(0x80004005\):\
+file is encrypted or is not a database.*?\} 0 1 0 2$}}
+
+###############################################################################
+
+runTest {test tkt-1c456ae75f-1.2 {database, hex password} -setup {
+ setupDb [set fileName tkt-1c456ae75f-1.2.db] "" "" "" "" \
+ "HexPassword=3132333435;"
+} -body {
+ sql execute $db "CREATE TABLE t1(x);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(1);"
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "Password=12345;" true false
+
+ set result [list]
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "HexPassword=3132333435;" true false
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ set result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain error result db fileName
+} -constraints {eagle defineConstant.System.Data.SQLite.INTEROP_CODEC monoBug28\
+command.sql compile.DATA SQLite System.Data.SQLite} -result {0 1 0 1 0 1 0 3}}
+
+###############################################################################
+
+runTest {test tkt-1c456ae75f-1.3 {database, wrong hex password} -setup {
+ setupDb [set fileName tkt-1c456ae75f-1.3.db] "" "" "" "" \
+ "HexPassword=3132333435;"
+} -body {
+ sql execute $db "CREATE TABLE t1(x);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(1);"
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "HexPassword=3132333436;" true false
+
+ set result [list]
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "HexPassword=3132333435;" true false
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ set result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain error result db fileName
+} -constraints {eagle defineConstant.System.Data.SQLite.INTEROP_CODEC monoBug28\
+command.sql compile.DATA SQLite System.Data.SQLite} -match regexp -result {^1\
+\{System\.Data\.SQLite\.SQLiteException \(0x80004005\): file is encrypted or is\
+not a database.*?\} 1 \{System\.Data\.SQLite\.SQLiteException \(0x80004005\):\
+file is encrypted or is not a database.*?\} 0 1 0 2$}}
+
+###############################################################################
+
+runTest {test tkt-1c456ae75f-1.4 {database, hex password via builder} -setup {
+ setupDb [set fileName tkt-1c456ae75f-1.4.db] "" "" "" "" \
+ "HexPassword=3132333435;"
+} -body {
+ sql execute $db "CREATE TABLE t1(x);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(1);"
+
+ cleanupDb $fileName db true false false
+
+ set connectionStringBuilder [object create -alias \
+ System.Data.SQLite.SQLiteConnectionStringBuilder]
+
+ $connectionStringBuilder DataSource \
+ [file join [getDatabaseDirectory] $fileName]
+
+ $connectionStringBuilder HexPassword [list 0x31 0x32 0x33 0x34 0x35]
+
+ set connection [object create -alias \
+ System.Data.SQLite.SQLiteConnection \
+ [$connectionStringBuilder ToString] true]
+
+ $connection Open; addDbConnection $connection
+
+ set result [list]
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ cleanupDb $fileName db true false false
+ setupDb $fileName "" "" "" "" "Password=\"12345\";" true false
+
+ lappend result [catch {sql execute $db \
+ "INSERT INTO t1 (x) VALUES(1);"} error] $error
+
+ lappend result [catch {sql execute -execute scalar $db \
+ "SELECT COUNT(*) FROM t1;"} error] $error
+
+ set result
+} -cleanup {
+ unset -nocomplain connection
+
+ cleanupDb $fileName; # NOTE: After object disposal.
+
+ unset -nocomplain connectionStringBuilder error result db fileName
+} -constraints {eagle defineConstant.System.Data.SQLite.INTEROP_CODEC monoBug28\
+command.sql compile.DATA SQLite System.Data.SQLite} -result {0 1 0 1 0 1 0 3}}
+
+###############################################################################
+
+runSQLiteTestEpilogue
+runTestEpilogue
ADDED Tests/tkt-393d954be0.eagle
Index: Tests/tkt-393d954be0.eagle
==================================================================
--- /dev/null
+++ Tests/tkt-393d954be0.eagle
@@ -0,0 +1,72 @@
+###############################################################################
+#
+# tkt-393d954be0.eagle --
+#
+# Written by Joe Mistachkin.
+# Released to the public domain, use at your own risk!
+#
+###############################################################################
+
+package require Eagle
+package require Eagle.Library
+package require Eagle.Test
+
+runTestPrologue
+
+###############################################################################
+
+package require System.Data.SQLite.Test
+runSQLiteTestPrologue
+
+###############################################################################
+
+runTest {test tkt-393d954be0-1.1 {custom connection pool} -setup {
+ set nullPool [object create -flags +NonPublic -alias \
+ System.Data.SQLite.NullConnectionPool true]
+
+ object invoke System.Data.SQLite.SQLiteConnection ConnectionPool $nullPool
+
+ setupDb [set fileName tkt-393d954be0-1.1.db] "" "" "" "" "Pooling=True;"
+} -body {
+ set exists(0) [file exists [file join [getDatabaseDirectory] [file tail \
+ $fileName]]]
+
+ cleanupDb $fileName
+
+ set exists(1) [file exists [file join [getDatabaseDirectory] [file tail \
+ $fileName]]]
+
+ set counts null; set openCount 0; set closeCount 0; set totalCount 0
+ object invoke -flags +NonPublic System.Data.SQLite.SQLiteConnectionPool \
+ GetCounts $fileName counts openCount closeCount totalCount
+
+ object invoke -flags +NonPublic System.Data.SQLite.SQLiteConnectionPool \
+ ClearPool $fileName
+
+ object invoke -flags +NonPublic System.Data.SQLite.SQLiteConnectionPool \
+ ClearAllPools
+
+ list $exists(0) $exists(1) $counts $openCount $closeCount $totalCount \
+ [object invoke $nullPool ToString]
+} -cleanup {
+ cleanupDb $fileName
+
+ catch {object invoke System.Data.SQLite.SQLiteConnection ConnectionPool null}
+
+ unset -nocomplain db fileName exists counts openCount closeCount totalCount \
+ nullPool
+} -constraints {eagle monoBug28 buildConfiguration.Debug command.sql\
+compile.DATA SQLite System.Data.SQLite} -match regexp -result [string map \
+[list \n \r\n] {^True False \{\} 0 0 0\
+\{Remove\(".*?\\tkt-393d954be0-1\.1\.db",\
+100, 0\)
+Add\(".*?\\tkt-393d954be0-1\.1\.db", -?\d+, 0\)
+GetCounts\("tkt-393d954be0-1\.1\.db", , 0, 0, 0\)
+ClearPool\("tkt-393d954be0-1\.1\.db"\)
+ClearAllPools\(\)
+\}$}]}
+
+###############################################################################
+
+runSQLiteTestEpilogue
+runTestEpilogue
ADDED Tests/tkt-6434e23a0f.eagle
Index: Tests/tkt-6434e23a0f.eagle
==================================================================
--- /dev/null
+++ Tests/tkt-6434e23a0f.eagle
@@ -0,0 +1,86 @@
+###############################################################################
+#
+# tkt-6434e23a0f.eagle --
+#
+# Written by Joe Mistachkin.
+# Released to the public domain, use at your own risk!
+#
+###############################################################################
+
+package require Eagle
+package require Eagle.Library
+package require Eagle.Test
+
+runTestPrologue
+
+###############################################################################
+
+package require System.Data.SQLite.Test
+runSQLiteTestPrologue
+
+###############################################################################
+
+runTest {test tkt-6434e23a0f-1.1 {SQLiteDataAdapter command disposal} -setup {
+ setupDb [set fileName tkt-6434e23a0f-1.1.db]
+} -body {
+ sql execute $db "CREATE TABLE t1(x);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(1);"
+ sql execute $db "INSERT INTO t1 (x) VALUES(2);"
+
+ cleanupDb $fileName db true false false
+
+ set id [object invoke Interpreter.GetActive NextId]
+ set dataSource [file join [getDatabaseDirectory] $fileName]
+
+ set sql { \
+ SELECT x FROM t1; \
+ }
+
+ unset -nocomplain results errors
+
+ set code [compileCSharpWith [subst {
+ using System.Data;
+ using System.Data.SQLite;
+ using System.IO;
+
+ namespace _Dynamic${id}
+ {
+ public static class Test${id}
+ {
+ public static void Main()
+ {
+ using (SQLiteConnection connection = new SQLiteConnection(
+ "Data Source=${dataSource};"))
+ {
+ connection.Open();
+
+ using (SQLiteDataAdapter dataAdapter = new SQLiteDataAdapter(
+ "${sql}", connection))
+ {
+ dataAdapter.Fill(new DataSet());
+ }
+ }
+
+ File.Delete("${dataSource}");
+ }
+ }
+ }
+ }] true true true results errors System.Data.SQLite.dll]
+
+ list $code $results \
+ [expr {[info exists errors] ? $errors : ""}] \
+ [expr {$code eq "Ok" ? [catch {
+ object invoke _Dynamic${id}.Test${id} Main
+ } result] : [set result ""]}] $result
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain result results errors code sql dataSource id db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \
+regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
+
+###############################################################################
+
+runSQLiteTestEpilogue
+runTestEpilogue
Index: Tests/tkt-ae5267b863.eagle
==================================================================
--- Tests/tkt-ae5267b863.eagle
+++ Tests/tkt-ae5267b863.eagle
@@ -18,10 +18,14 @@
package require System.Data.SQLite.Test
runSQLiteTestPrologue
###############################################################################
+#
+# NOTE: For some reason, this test does not play nicely when all the managed
+# debugging assistants are enabled.
+#
runTest {test tkt-ae5267b863-1.1 {segfault during command GC} -setup {
setupDb [set fileName tkt-ae5267b863-1.1.db]
} -body {
set id [object invoke Interpreter.GetActive NextId]
set dataSource [file join [getDatabaseDirectory] $fileName]
@@ -140,13 +144,14 @@
} result] : [set result ""]}] $result
} -cleanup {
cleanupDb $fileName
unset -nocomplain result code results errors sql dataSource id db fileName
-} -constraints \
-{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \
-regexp -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
+} -constraints [fixConstraints {eagle monoBug28 command.sql compile.DATA\
+SQLite System.Data.SQLite !mda\
+!defineConstant.System.Data.SQLite.INTEROP_LEGACY_CLOSE}] -match regexp \
+-result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
###############################################################################
runSQLiteTestEpilogue
runTestEpilogue
Index: Tests/tkt-bb4b04d457.eagle
==================================================================
--- Tests/tkt-bb4b04d457.eagle
+++ Tests/tkt-bb4b04d457.eagle
@@ -18,11 +18,11 @@
package require System.Data.SQLite.Test
runSQLiteTestPrologue
###############################################################################
-runTest {test tkt-bb4b04d457-1.1 {} -setup {
+runTest {test tkt-bb4b04d457-1.1 {TIMESTAMP column with Ticks} -setup {
setupDb [set fileName tkt-bb4b04d457-1.1.db] "" Ticks Utc
} -body {
set dateTime [object invoke -alias DateTime Parse 2011-11-29T12:34:56Z]
set dateTime [$dateTime -alias ToUniversalTime]
ADDED Tests/tkt-c010fa6584.eagle
Index: Tests/tkt-c010fa6584.eagle
==================================================================
--- /dev/null
+++ Tests/tkt-c010fa6584.eagle
@@ -0,0 +1,566 @@
+###############################################################################
+#
+# tkt-c010fa6584.eagle --
+#
+# Written by Joe Mistachkin.
+# Released to the public domain, use at your own risk!
+#
+###############################################################################
+
+package require Eagle
+package require Eagle.Library
+package require Eagle.Test
+
+runTestPrologue
+
+###############################################################################
+
+package require System.Data.SQLite.Test
+runSQLiteTestPrologue
+
+###############################################################################
+
+runTest {test tkt-c010fa6584-1.1 {column "integral" type handling} -setup {
+ setupDb [set fileName tkt-c010fa6584-1.1.db]
+} -body {
+ #
+ # NOTE: Create a database table with all the integral type names that are
+ # recognized by System.Data.SQLite. Subsequently, each column will
+ # be tested against a list of values that meet and/or exceed the
+ # bounds for the underlying primitive integral CLR type.
+ #
+ sql execute $db {
+ CREATE TABLE t1(
+ a00 SYSNAME, -- This is the 'payload' column name.
+ a01, -- String
+ a02 TEXT, -- String
+ a03 BIGINT, -- Int64
+ a04 BIGUINT, -- UInt64
+ a05 COUNTER, -- Int64
+ a06 IDENTITY, -- Int64
+ a07 INT, -- Int32
+ a08 INT8, -- SByte
+ a09 INT16, -- Int16
+ a10 INT32, -- Int32
+ a11 INT64, -- Int64
+ a12 INTEGER, -- Int64
+ a13 INTEGER8, -- SByte
+ a14 INTEGER16, -- Int16
+ a15 INTEGER32, -- Int32
+ a16 INTEGER64, -- Int64
+ a17 LONG, -- Int64
+ a18 SMALLINT, -- Int16
+ a19 SMALLUINT, -- UInt16
+ a20 TINYINT, -- Byte
+ a21 TINYSINT, -- SByte
+ a22 UINT, -- UInt32
+ a23 UINT8, -- Byte
+ a24 UINT16, -- UInt16
+ a25 UINT32, -- UInt32
+ a26 UINT64, -- UInt64
+ a27 ULONG, -- UInt64
+ a28 UNSIGNEDINTEGER, -- UInt32
+ a29 UNSIGNEDINTEGER8, -- Byte
+ a30 UNSIGNEDINTEGER16, -- UInt16
+ a31 UNSIGNEDINTEGER32, -- UInt32
+ a32 UNSIGNEDINTEGER64 -- UInt64
+ );
+ }
+
+ #
+ # NOTE: These are the numeric values being tested against all the types in
+ # the database table defined above. This list includes values that
+ # are out-of-bounds for each primitive integral type.
+ #
+ set values [list \
+ -9223372036854775809 -9223372036854775808 \
+ -2147483649 -2147483648 \
+ -32769 -32768 \
+ -129 -128 \
+ -1 0 1 \
+ 127 128 \
+ 255 256 \
+ 32767 32768 \
+ 65535 65536 \
+ 2147483647 2147483648 \
+ 4294967295 4294967296 \
+ 9223372036854775807 9223372036854775808 \
+ 18446744073709551615 18446744073709551616]
+
+ for {set index 1} {$index <= 32} {incr index} {
+ set name [appendArgs a [format %02d $index]]
+ foreach value $values {
+ sql execute $db [subst {
+ INSERT INTO t1 (a00, $name) VALUES('$name', $value);
+ }]
+ }
+ }
+
+ set results [list]
+
+ for {set index 1} {$index <= 32} {incr index} {
+ set name [appendArgs a [format %02d $index]]
+ set count [sql execute -execute scalar $db [subst {
+ SELECT COUNT(*) FROM t1 WHERE a00 = '$name';
+ }]]
+ for {set offset 0} {$offset < $count} {incr offset} {
+ set code [catch {
+ sql execute -execute scalar $db [subst {
+ SELECT $name FROM t1 WHERE a00 = '$name' LIMIT 1 OFFSET $offset;
+ }]
+ } result]
+
+ set match [expr {$result eq [lindex $values $offset]}]
+
+ lappend results [list \
+ $name $offset $match [lindex $values $offset] \
+ $code [expr {$code == 0 ? $result : $errorCode}]]
+ }
+ }
+
+ set results
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain match result code offset count results value name index \
+ values db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
+{{a01 0 False -9223372036854775809 0 -9.22337203685478E+18} {a01 1 True\
+-9223372036854775808 0 -9223372036854775808} {a01 2 True -2147483649 0\
+-2147483649} {a01 3 True -2147483648 0 -2147483648} {a01 4 True -32769 0\
+-32769} {a01 5 True -32768 0 -32768} {a01 6 True -129 0 -129} {a01 7 True -128\
+0 -128} {a01 8 True -1 0 -1} {a01 9 True 0 0 0} {a01 10 True 1 0 1} {a01 11\
+True 127 0 127} {a01 12 True 128 0 128} {a01 13 True 255 0 255} {a01 14 True\
+256 0 256} {a01 15 True 32767 0 32767} {a01 16 True 32768 0 32768} {a01 17 True\
+65535 0 65535} {a01 18 True 65536 0 65536} {a01 19 True 2147483647 0\
+2147483647} {a01 20 True 2147483648 0 2147483648} {a01 21 True 4294967295 0\
+4294967295} {a01 22 True 4294967296 0 4294967296} {a01 23 True\
+9223372036854775807 0 9223372036854775807} {a01 24 False 9223372036854775808 0\
+9.22337203685478E+18} {a01 25 False 18446744073709551615 0\
+1.84467440737096E+19} {a01 26 False 18446744073709551616 0\
+1.84467440737096E+19} {a02 0 False -9223372036854775809 0\
+-9.22337203685478e+18} {a02 1 True -9223372036854775808 0 -9223372036854775808}\
+{a02 2 True -2147483649 0 -2147483649} {a02 3 True -2147483648 0 -2147483648}\
+{a02 4 True -32769 0 -32769} {a02 5 True -32768 0 -32768} {a02 6 True -129 0\
+-129} {a02 7 True -128 0 -128} {a02 8 True -1 0 -1} {a02 9 True 0 0 0} {a02 10\
+True 1 0 1} {a02 11 True 127 0 127} {a02 12 True 128 0 128} {a02 13 True 255 0\
+255} {a02 14 True 256 0 256} {a02 15 True 32767 0 32767} {a02 16 True 32768 0\
+32768} {a02 17 True 65535 0 65535} {a02 18 True 65536 0 65536} {a02 19 True\
+2147483647 0 2147483647} {a02 20 True 2147483648 0 2147483648} {a02 21 True\
+4294967295 0 4294967295} {a02 22 True 4294967296 0 4294967296} {a02 23 True\
+9223372036854775807 0 9223372036854775807} {a02 24 False 9223372036854775808 0\
+9.22337203685478e+18} {a02 25 False 18446744073709551615 0\
+1.84467440737096e+19} {a02 26 False 18446744073709551616 0\
+1.84467440737096e+19} {a03 0 False -9223372036854775809 0 -9223372036854775808}\
+{a03 1 True -9223372036854775808 0 -9223372036854775808} {a03 2 True\
+-2147483649 0 -2147483649} {a03 3 True -2147483648 0 -2147483648} {a03 4 True\
+-32769 0 -32769} {a03 5 True -32768 0 -32768} {a03 6 True -129 0 -129} {a03 7\
+True -128 0 -128} {a03 8 True -1 0 -1} {a03 9 True 0 0 0} {a03 10 True 1 0 1}\
+{a03 11 True 127 0 127} {a03 12 True 128 0 128} {a03 13 True 255 0 255} {a03 14\
+True 256 0 256} {a03 15 True 32767 0 32767} {a03 16 True 32768 0 32768} {a03 17\
+True 65535 0 65535} {a03 18 True 65536 0 65536} {a03 19 True 2147483647 0\
+2147483647} {a03 20 True 2147483648 0 2147483648} {a03 21 True 4294967295 0\
+4294967295} {a03 22 True 4294967296 0 4294967296} {a03 23 True\
+9223372036854775807 0 9223372036854775807} {a03 24 False 9223372036854775808 0\
+-9223372036854775808} {a03 25 False 18446744073709551615 0\
+-9223372036854775808} {a03 26 False 18446744073709551616 0\
+-9223372036854775808} {a04 0 False -9223372036854775809 0 9223372036854775808}\
+{a04 1 False -9223372036854775808 0 9223372036854775808} {a04 2 False\
+-2147483649 0 18446744071562067967} {a04 3 False -2147483648 0\
+18446744071562067968} {a04 4 False -32769 0 18446744073709518847} {a04 5 False\
+-32768 0 18446744073709518848} {a04 6 False -129 0 18446744073709551487} {a04 7\
+False -128 0 18446744073709551488} {a04 8 False -1 0 18446744073709551615} {a04\
+9 True 0 0 0} {a04 10 True 1 0 1} {a04 11 True 127 0 127} {a04 12 True 128 0\
+128} {a04 13 True 255 0 255} {a04 14 True 256 0 256} {a04 15 True 32767 0\
+32767} {a04 16 True 32768 0 32768} {a04 17 True 65535 0 65535} {a04 18 True\
+65536 0 65536} {a04 19 True 2147483647 0 2147483647} {a04 20 True 2147483648 0\
+2147483648} {a04 21 True 4294967295 0 4294967295} {a04 22 True 4294967296 0\
+4294967296} {a04 23 True 9223372036854775807 0 9223372036854775807} {a04 24\
+True 9223372036854775808 0 9223372036854775808} {a04 25 False\
+18446744073709551615 0 9223372036854775808} {a04 26 False 18446744073709551616\
+0 9223372036854775808} {a05 0 False -9223372036854775809 0\
+-9223372036854775808} {a05 1 True -9223372036854775808 0 -9223372036854775808}\
+{a05 2 True -2147483649 0 -2147483649} {a05 3 True -2147483648 0 -2147483648}\
+{a05 4 True -32769 0 -32769} {a05 5 True -32768 0 -32768} {a05 6 True -129 0\
+-129} {a05 7 True -128 0 -128} {a05 8 True -1 0 -1} {a05 9 True 0 0 0} {a05 10\
+True 1 0 1} {a05 11 True 127 0 127} {a05 12 True 128 0 128} {a05 13 True 255 0\
+255} {a05 14 True 256 0 256} {a05 15 True 32767 0 32767} {a05 16 True 32768 0\
+32768} {a05 17 True 65535 0 65535} {a05 18 True 65536 0 65536} {a05 19 True\
+2147483647 0 2147483647} {a05 20 True 2147483648 0 2147483648} {a05 21 True\
+4294967295 0 4294967295} {a05 22 True 4294967296 0 4294967296} {a05 23 True\
+9223372036854775807 0 9223372036854775807} {a05 24 False 9223372036854775808 0\
+-9223372036854775808} {a05 25 False 18446744073709551615 0\
+-9223372036854775808} {a05 26 False 18446744073709551616 0\
+-9223372036854775808} {a06 0 False -9223372036854775809 0 -9223372036854775808}\
+{a06 1 True -9223372036854775808 0 -9223372036854775808} {a06 2 True\
+-2147483649 0 -2147483649} {a06 3 True -2147483648 0 -2147483648} {a06 4 True\
+-32769 0 -32769} {a06 5 True -32768 0 -32768} {a06 6 True -129 0 -129} {a06 7\
+True -128 0 -128} {a06 8 True -1 0 -1} {a06 9 True 0 0 0} {a06 10 True 1 0 1}\
+{a06 11 True 127 0 127} {a06 12 True 128 0 128} {a06 13 True 255 0 255} {a06 14\
+True 256 0 256} {a06 15 True 32767 0 32767} {a06 16 True 32768 0 32768} {a06 17\
+True 65535 0 65535} {a06 18 True 65536 0 65536} {a06 19 True 2147483647 0\
+2147483647} {a06 20 True 2147483648 0 2147483648} {a06 21 True 4294967295 0\
+4294967295} {a06 22 True 4294967296 0 4294967296} {a06 23 True\
+9223372036854775807 0 9223372036854775807} {a06 24 False 9223372036854775808 0\
+-9223372036854775808} {a06 25 False 18446744073709551615 0\
+-9223372036854775808} {a06 26 False 18446744073709551616 0\
+-9223372036854775808} {a07 0 False -9223372036854775809 0 0} {a07 1 False\
+-9223372036854775808 0 0} {a07 2 False -2147483649 0 2147483647} {a07 3 True\
+-2147483648 0 -2147483648} {a07 4 True -32769 0 -32769} {a07 5 True -32768 0\
+-32768} {a07 6 True -129 0 -129} {a07 7 True -128 0 -128} {a07 8 True -1 0 -1}\
+{a07 9 True 0 0 0} {a07 10 True 1 0 1} {a07 11 True 127 0 127} {a07 12 True 128\
+0 128} {a07 13 True 255 0 255} {a07 14 True 256 0 256} {a07 15 True 32767 0\
+32767} {a07 16 True 32768 0 32768} {a07 17 True 65535 0 65535} {a07 18 True\
+65536 0 65536} {a07 19 True 2147483647 0 2147483647} {a07 20 False 2147483648 0\
+-2147483648} {a07 21 False 4294967295 0 -1} {a07 22 False 4294967296 0 0} {a07\
+23 False 9223372036854775807 0 -1} {a07 24 False 9223372036854775808 0 0} {a07\
+25 False 18446744073709551615 0 0} {a07 26 False 18446744073709551616 0 0} {a08\
+0 False -9223372036854775809 0 0} {a08 1 False -9223372036854775808 0 0} {a08 2\
+False -2147483649 0 -1} {a08 3 False -2147483648 0 0} {a08 4 False -32769 0 -1}\
+{a08 5 False -32768 0 0} {a08 6 False -129 0 127} {a08 7 True -128 0 -128} {a08\
+8 True -1 0 -1} {a08 9 True 0 0 0} {a08 10 True 1 0 1} {a08 11 True 127 0 127}\
+{a08 12 False 128 0 -128} {a08 13 False 255 0 -1} {a08 14 False 256 0 0} {a08\
+15 False 32767 0 -1} {a08 16 False 32768 0 0} {a08 17 False 65535 0 -1} {a08 18\
+False 65536 0 0} {a08 19 False 2147483647 0 -1} {a08 20 False 2147483648 0 0}\
+{a08 21 False 4294967295 0 -1} {a08 22 False 4294967296 0 0} {a08 23 False\
+9223372036854775807 0 -1} {a08 24 False 9223372036854775808 0 0} {a08 25 False\
+18446744073709551615 0 0} {a08 26 False 18446744073709551616 0 0} {a09 0 False\
+-9223372036854775809 0 0} {a09 1 False -9223372036854775808 0 0} {a09 2 False\
+-2147483649 0 -1} {a09 3 False -2147483648 0 0} {a09 4 False -32769 0 32767}\
+{a09 5 True -32768 0 -32768} {a09 6 True -129 0 -129} {a09 7 True -128 0 -128}\
+{a09 8 True -1 0 -1} {a09 9 True 0 0 0} {a09 10 True 1 0 1} {a09 11 True 127 0\
+127} {a09 12 True 128 0 128} {a09 13 True 255 0 255} {a09 14 True 256 0 256}\
+{a09 15 True 32767 0 32767} {a09 16 False 32768 0 -32768} {a09 17 False 65535 0\
+-1} {a09 18 False 65536 0 0} {a09 19 False 2147483647 0 -1} {a09 20 False\
+2147483648 0 0} {a09 21 False 4294967295 0 -1} {a09 22 False 4294967296 0 0}\
+{a09 23 False 9223372036854775807 0 -1} {a09 24 False 9223372036854775808 0 0}\
+{a09 25 False 18446744073709551615 0 0} {a09 26 False 18446744073709551616 0 0}\
+{a10 0 False -9223372036854775809 0 0} {a10 1 False -9223372036854775808 0 0}\
+{a10 2 False -2147483649 0 2147483647} {a10 3 True -2147483648 0 -2147483648}\
+{a10 4 True -32769 0 -32769} {a10 5 True -32768 0 -32768} {a10 6 True -129 0\
+-129} {a10 7 True -128 0 -128} {a10 8 True -1 0 -1} {a10 9 True 0 0 0} {a10 10\
+True 1 0 1} {a10 11 True 127 0 127} {a10 12 True 128 0 128} {a10 13 True 255 0\
+255} {a10 14 True 256 0 256} {a10 15 True 32767 0 32767} {a10 16 True 32768 0\
+32768} {a10 17 True 65535 0 65535} {a10 18 True 65536 0 65536} {a10 19 True\
+2147483647 0 2147483647} {a10 20 False 2147483648 0 -2147483648} {a10 21 False\
+4294967295 0 -1} {a10 22 False 4294967296 0 0} {a10 23 False\
+9223372036854775807 0 -1} {a10 24 False 9223372036854775808 0 0} {a10 25 False\
+18446744073709551615 0 0} {a10 26 False 18446744073709551616 0 0} {a11 0 False\
+-9223372036854775809 0 -9223372036854775808} {a11 1 True -9223372036854775808 0\
+-9223372036854775808} {a11 2 True -2147483649 0 -2147483649} {a11 3 True\
+-2147483648 0 -2147483648} {a11 4 True -32769 0 -32769} {a11 5 True -32768 0\
+-32768} {a11 6 True -129 0 -129} {a11 7 True -128 0 -128} {a11 8 True -1 0 -1}\
+{a11 9 True 0 0 0} {a11 10 True 1 0 1} {a11 11 True 127 0 127} {a11 12 True 128\
+0 128} {a11 13 True 255 0 255} {a11 14 True 256 0 256} {a11 15 True 32767 0\
+32767} {a11 16 True 32768 0 32768} {a11 17 True 65535 0 65535} {a11 18 True\
+65536 0 65536} {a11 19 True 2147483647 0 2147483647} {a11 20 True 2147483648 0\
+2147483648} {a11 21 True 4294967295 0 4294967295} {a11 22 True 4294967296 0\
+4294967296} {a11 23 True 9223372036854775807 0 9223372036854775807} {a11 24\
+False 9223372036854775808 0 -9223372036854775808} {a11 25 False\
+18446744073709551615 0 -9223372036854775808} {a11 26 False 18446744073709551616\
+0 -9223372036854775808} {a12 0 False -9223372036854775809 0\
+-9223372036854775808} {a12 1 True -9223372036854775808 0 -9223372036854775808}\
+{a12 2 True -2147483649 0 -2147483649} {a12 3 True -2147483648 0 -2147483648}\
+{a12 4 True -32769 0 -32769} {a12 5 True -32768 0 -32768} {a12 6 True -129 0\
+-129} {a12 7 True -128 0 -128} {a12 8 True -1 0 -1} {a12 9 True 0 0 0} {a12 10\
+True 1 0 1} {a12 11 True 127 0 127} {a12 12 True 128 0 128} {a12 13 True 255 0\
+255} {a12 14 True 256 0 256} {a12 15 True 32767 0 32767} {a12 16 True 32768 0\
+32768} {a12 17 True 65535 0 65535} {a12 18 True 65536 0 65536} {a12 19 True\
+2147483647 0 2147483647} {a12 20 True 2147483648 0 2147483648} {a12 21 True\
+4294967295 0 4294967295} {a12 22 True 4294967296 0 4294967296} {a12 23 True\
+9223372036854775807 0 9223372036854775807} {a12 24 False 9223372036854775808 0\
+-9223372036854775808} {a12 25 False 18446744073709551615 0\
+-9223372036854775808} {a12 26 False 18446744073709551616 0\
+-9223372036854775808} {a13 0 False -9223372036854775809 0 0} {a13 1 False\
+-9223372036854775808 0 0} {a13 2 False -2147483649 0 -1} {a13 3 False\
+-2147483648 0 0} {a13 4 False -32769 0 -1} {a13 5 False -32768 0 0} {a13 6\
+False -129 0 127} {a13 7 True -128 0 -128} {a13 8 True -1 0 -1} {a13 9 True 0 0\
+0} {a13 10 True 1 0 1} {a13 11 True 127 0 127} {a13 12 False 128 0 -128} {a13\
+13 False 255 0 -1} {a13 14 False 256 0 0} {a13 15 False 32767 0 -1} {a13 16\
+False 32768 0 0} {a13 17 False 65535 0 -1} {a13 18 False 65536 0 0} {a13 19\
+False 2147483647 0 -1} {a13 20 False 2147483648 0 0} {a13 21 False 4294967295 0\
+-1} {a13 22 False 4294967296 0 0} {a13 23 False 9223372036854775807 0 -1} {a13\
+24 False 9223372036854775808 0 0} {a13 25 False 18446744073709551615 0 0} {a13\
+26 False 18446744073709551616 0 0} {a14 0 False -9223372036854775809 0 0} {a14\
+1 False -9223372036854775808 0 0} {a14 2 False -2147483649 0 -1} {a14 3 False\
+-2147483648 0 0} {a14 4 False -32769 0 32767} {a14 5 True -32768 0 -32768} {a14\
+6 True -129 0 -129} {a14 7 True -128 0 -128} {a14 8 True -1 0 -1} {a14 9 True 0\
+0 0} {a14 10 True 1 0 1} {a14 11 True 127 0 127} {a14 12 True 128 0 128} {a14\
+13 True 255 0 255} {a14 14 True 256 0 256} {a14 15 True 32767 0 32767} {a14 16\
+False 32768 0 -32768} {a14 17 False 65535 0 -1} {a14 18 False 65536 0 0} {a14\
+19 False 2147483647 0 -1} {a14 20 False 2147483648 0 0} {a14 21 False\
+4294967295 0 -1} {a14 22 False 4294967296 0 0} {a14 23 False\
+9223372036854775807 0 -1} {a14 24 False 9223372036854775808 0 0} {a14 25 False\
+18446744073709551615 0 0} {a14 26 False 18446744073709551616 0 0} {a15 0 False\
+-9223372036854775809 0 0} {a15 1 False -9223372036854775808 0 0} {a15 2 False\
+-2147483649 0 2147483647} {a15 3 True -2147483648 0 -2147483648} {a15 4 True\
+-32769 0 -32769} {a15 5 True -32768 0 -32768} {a15 6 True -129 0 -129} {a15 7\
+True -128 0 -128} {a15 8 True -1 0 -1} {a15 9 True 0 0 0} {a15 10 True 1 0 1}\
+{a15 11 True 127 0 127} {a15 12 True 128 0 128} {a15 13 True 255 0 255} {a15 14\
+True 256 0 256} {a15 15 True 32767 0 32767} {a15 16 True 32768 0 32768} {a15 17\
+True 65535 0 65535} {a15 18 True 65536 0 65536} {a15 19 True 2147483647 0\
+2147483647} {a15 20 False 2147483648 0 -2147483648} {a15 21 False 4294967295 0\
+-1} {a15 22 False 4294967296 0 0} {a15 23 False 9223372036854775807 0 -1} {a15\
+24 False 9223372036854775808 0 0} {a15 25 False 18446744073709551615 0 0} {a15\
+26 False 18446744073709551616 0 0} {a16 0 False -9223372036854775809 0\
+-9223372036854775808} {a16 1 True -9223372036854775808 0 -9223372036854775808}\
+{a16 2 True -2147483649 0 -2147483649} {a16 3 True -2147483648 0 -2147483648}\
+{a16 4 True -32769 0 -32769} {a16 5 True -32768 0 -32768} {a16 6 True -129 0\
+-129} {a16 7 True -128 0 -128} {a16 8 True -1 0 -1} {a16 9 True 0 0 0} {a16 10\
+True 1 0 1} {a16 11 True 127 0 127} {a16 12 True 128 0 128} {a16 13 True 255 0\
+255} {a16 14 True 256 0 256} {a16 15 True 32767 0 32767} {a16 16 True 32768 0\
+32768} {a16 17 True 65535 0 65535} {a16 18 True 65536 0 65536} {a16 19 True\
+2147483647 0 2147483647} {a16 20 True 2147483648 0 2147483648} {a16 21 True\
+4294967295 0 4294967295} {a16 22 True 4294967296 0 4294967296} {a16 23 True\
+9223372036854775807 0 9223372036854775807} {a16 24 False 9223372036854775808 0\
+-9223372036854775808} {a16 25 False 18446744073709551615 0\
+-9223372036854775808} {a16 26 False 18446744073709551616 0\
+-9223372036854775808} {a17 0 False -9223372036854775809 0 -9223372036854775808}\
+{a17 1 True -9223372036854775808 0 -9223372036854775808} {a17 2 True\
+-2147483649 0 -2147483649} {a17 3 True -2147483648 0 -2147483648} {a17 4 True\
+-32769 0 -32769} {a17 5 True -32768 0 -32768} {a17 6 True -129 0 -129} {a17 7\
+True -128 0 -128} {a17 8 True -1 0 -1} {a17 9 True 0 0 0} {a17 10 True 1 0 1}\
+{a17 11 True 127 0 127} {a17 12 True 128 0 128} {a17 13 True 255 0 255} {a17 14\
+True 256 0 256} {a17 15 True 32767 0 32767} {a17 16 True 32768 0 32768} {a17 17\
+True 65535 0 65535} {a17 18 True 65536 0 65536} {a17 19 True 2147483647 0\
+2147483647} {a17 20 True 2147483648 0 2147483648} {a17 21 True 4294967295 0\
+4294967295} {a17 22 True 4294967296 0 4294967296} {a17 23 True\
+9223372036854775807 0 9223372036854775807} {a17 24 False 9223372036854775808 0\
+-9223372036854775808} {a17 25 False 18446744073709551615 0\
+-9223372036854775808} {a17 26 False 18446744073709551616 0\
+-9223372036854775808} {a18 0 False -9223372036854775809 0 0} {a18 1 False\
+-9223372036854775808 0 0} {a18 2 False -2147483649 0 -1} {a18 3 False\
+-2147483648 0 0} {a18 4 False -32769 0 32767} {a18 5 True -32768 0 -32768} {a18\
+6 True -129 0 -129} {a18 7 True -128 0 -128} {a18 8 True -1 0 -1} {a18 9 True 0\
+0 0} {a18 10 True 1 0 1} {a18 11 True 127 0 127} {a18 12 True 128 0 128} {a18\
+13 True 255 0 255} {a18 14 True 256 0 256} {a18 15 True 32767 0 32767} {a18 16\
+False 32768 0 -32768} {a18 17 False 65535 0 -1} {a18 18 False 65536 0 0} {a18\
+19 False 2147483647 0 -1} {a18 20 False 2147483648 0 0} {a18 21 False\
+4294967295 0 -1} {a18 22 False 4294967296 0 0} {a18 23 False\
+9223372036854775807 0 -1} {a18 24 False 9223372036854775808 0 0} {a18 25 False\
+18446744073709551615 0 0} {a18 26 False 18446744073709551616 0 0} {a19 0 False\
+-9223372036854775809 0 0} {a19 1 False -9223372036854775808 0 0} {a19 2 False\
+-2147483649 0 65535} {a19 3 False -2147483648 0 0} {a19 4 False -32769 0 32767}\
+{a19 5 False -32768 0 32768} {a19 6 False -129 0 65407} {a19 7 False -128 0\
+65408} {a19 8 False -1 0 65535} {a19 9 True 0 0 0} {a19 10 True 1 0 1} {a19 11\
+True 127 0 127} {a19 12 True 128 0 128} {a19 13 True 255 0 255} {a19 14 True\
+256 0 256} {a19 15 True 32767 0 32767} {a19 16 True 32768 0 32768} {a19 17 True\
+65535 0 65535} {a19 18 False 65536 0 0} {a19 19 False 2147483647 0 65535} {a19\
+20 False 2147483648 0 0} {a19 21 False 4294967295 0 65535} {a19 22 False\
+4294967296 0 0} {a19 23 False 9223372036854775807 0 65535} {a19 24 False\
+9223372036854775808 0 0} {a19 25 False 18446744073709551615 0 0} {a19 26 False\
+18446744073709551616 0 0} {a20 0 False -9223372036854775809 0 0} {a20 1 False\
+-9223372036854775808 0 0} {a20 2 False -2147483649 0 255} {a20 3 False\
+-2147483648 0 0} {a20 4 False -32769 0 255} {a20 5 False -32768 0 0} {a20 6\
+False -129 0 127} {a20 7 False -128 0 128} {a20 8 False -1 0 255} {a20 9 True 0\
+0 0} {a20 10 True 1 0 1} {a20 11 True 127 0 127} {a20 12 True 128 0 128} {a20\
+13 True 255 0 255} {a20 14 False 256 0 0} {a20 15 False 32767 0 255} {a20 16\
+False 32768 0 0} {a20 17 False 65535 0 255} {a20 18 False 65536 0 0} {a20 19\
+False 2147483647 0 255} {a20 20 False 2147483648 0 0} {a20 21 False 4294967295\
+0 255} {a20 22 False 4294967296 0 0} {a20 23 False 9223372036854775807 0 255}\
+{a20 24 False 9223372036854775808 0 0} {a20 25 False 18446744073709551615 0 0}\
+{a20 26 False 18446744073709551616 0 0} {a21 0 False -9223372036854775809 0 0}\
+{a21 1 False -9223372036854775808 0 0} {a21 2 False -2147483649 0 -1} {a21 3\
+False -2147483648 0 0} {a21 4 False -32769 0 -1} {a21 5 False -32768 0 0} {a21\
+6 False -129 0 127} {a21 7 True -128 0 -128} {a21 8 True -1 0 -1} {a21 9 True 0\
+0 0} {a21 10 True 1 0 1} {a21 11 True 127 0 127} {a21 12 False 128 0 -128} {a21\
+13 False 255 0 -1} {a21 14 False 256 0 0} {a21 15 False 32767 0 -1} {a21 16\
+False 32768 0 0} {a21 17 False 65535 0 -1} {a21 18 False 65536 0 0} {a21 19\
+False 2147483647 0 -1} {a21 20 False 2147483648 0 0} {a21 21 False 4294967295 0\
+-1} {a21 22 False 4294967296 0 0} {a21 23 False 9223372036854775807 0 -1} {a21\
+24 False 9223372036854775808 0 0} {a21 25 False 18446744073709551615 0 0} {a21\
+26 False 18446744073709551616 0 0} {a22 0 False -9223372036854775809 0 0} {a22\
+1 False -9223372036854775808 0 0} {a22 2 False -2147483649 0 2147483647} {a22 3\
+False -2147483648 0 2147483648} {a22 4 False -32769 0 4294934527} {a22 5 False\
+-32768 0 4294934528} {a22 6 False -129 0 4294967167} {a22 7 False -128 0\
+4294967168} {a22 8 False -1 0 4294967295} {a22 9 True 0 0 0} {a22 10 True 1 0\
+1} {a22 11 True 127 0 127} {a22 12 True 128 0 128} {a22 13 True 255 0 255} {a22\
+14 True 256 0 256} {a22 15 True 32767 0 32767} {a22 16 True 32768 0 32768} {a22\
+17 True 65535 0 65535} {a22 18 True 65536 0 65536} {a22 19 True 2147483647 0\
+2147483647} {a22 20 True 2147483648 0 2147483648} {a22 21 True 4294967295 0\
+4294967295} {a22 22 False 4294967296 0 0} {a22 23 False 9223372036854775807 0\
+4294967295} {a22 24 False 9223372036854775808 0 0} {a22 25 False\
+18446744073709551615 0 0} {a22 26 False 18446744073709551616 0 0} {a23 0 False\
+-9223372036854775809 0 0} {a23 1 False -9223372036854775808 0 0} {a23 2 False\
+-2147483649 0 255} {a23 3 False -2147483648 0 0} {a23 4 False -32769 0 255}\
+{a23 5 False -32768 0 0} {a23 6 False -129 0 127} {a23 7 False -128 0 128} {a23\
+8 False -1 0 255} {a23 9 True 0 0 0} {a23 10 True 1 0 1} {a23 11 True 127 0\
+127} {a23 12 True 128 0 128} {a23 13 True 255 0 255} {a23 14 False 256 0 0}\
+{a23 15 False 32767 0 255} {a23 16 False 32768 0 0} {a23 17 False 65535 0 255}\
+{a23 18 False 65536 0 0} {a23 19 False 2147483647 0 255} {a23 20 False\
+2147483648 0 0} {a23 21 False 4294967295 0 255} {a23 22 False 4294967296 0 0}\
+{a23 23 False 9223372036854775807 0 255} {a23 24 False 9223372036854775808 0 0}\
+{a23 25 False 18446744073709551615 0 0} {a23 26 False 18446744073709551616 0 0}\
+{a24 0 False -9223372036854775809 0 0} {a24 1 False -9223372036854775808 0 0}\
+{a24 2 False -2147483649 0 65535} {a24 3 False -2147483648 0 0} {a24 4 False\
+-32769 0 32767} {a24 5 False -32768 0 32768} {a24 6 False -129 0 65407} {a24 7\
+False -128 0 65408} {a24 8 False -1 0 65535} {a24 9 True 0 0 0} {a24 10 True 1\
+0 1} {a24 11 True 127 0 127} {a24 12 True 128 0 128} {a24 13 True 255 0 255}\
+{a24 14 True 256 0 256} {a24 15 True 32767 0 32767} {a24 16 True 32768 0 32768}\
+{a24 17 True 65535 0 65535} {a24 18 False 65536 0 0} {a24 19 False 2147483647 0\
+65535} {a24 20 False 2147483648 0 0} {a24 21 False 4294967295 0 65535} {a24 22\
+False 4294967296 0 0} {a24 23 False 9223372036854775807 0 65535} {a24 24 False\
+9223372036854775808 0 0} {a24 25 False 18446744073709551615 0 0} {a24 26 False\
+18446744073709551616 0 0} {a25 0 False -9223372036854775809 0 0} {a25 1 False\
+-9223372036854775808 0 0} {a25 2 False -2147483649 0 2147483647} {a25 3 False\
+-2147483648 0 2147483648} {a25 4 False -32769 0 4294934527} {a25 5 False -32768\
+0 4294934528} {a25 6 False -129 0 4294967167} {a25 7 False -128 0 4294967168}\
+{a25 8 False -1 0 4294967295} {a25 9 True 0 0 0} {a25 10 True 1 0 1} {a25 11\
+True 127 0 127} {a25 12 True 128 0 128} {a25 13 True 255 0 255} {a25 14 True\
+256 0 256} {a25 15 True 32767 0 32767} {a25 16 True 32768 0 32768} {a25 17 True\
+65535 0 65535} {a25 18 True 65536 0 65536} {a25 19 True 2147483647 0\
+2147483647} {a25 20 True 2147483648 0 2147483648} {a25 21 True 4294967295 0\
+4294967295} {a25 22 False 4294967296 0 0} {a25 23 False 9223372036854775807 0\
+4294967295} {a25 24 False 9223372036854775808 0 0} {a25 25 False\
+18446744073709551615 0 0} {a25 26 False 18446744073709551616 0 0} {a26 0 False\
+-9223372036854775809 0 9223372036854775808} {a26 1 False -9223372036854775808 0\
+9223372036854775808} {a26 2 False -2147483649 0 18446744071562067967} {a26 3\
+False -2147483648 0 18446744071562067968} {a26 4 False -32769 0\
+18446744073709518847} {a26 5 False -32768 0 18446744073709518848} {a26 6 False\
+-129 0 18446744073709551487} {a26 7 False -128 0 18446744073709551488} {a26 8\
+False -1 0 18446744073709551615} {a26 9 True 0 0 0} {a26 10 True 1 0 1} {a26 11\
+True 127 0 127} {a26 12 True 128 0 128} {a26 13 True 255 0 255} {a26 14 True\
+256 0 256} {a26 15 True 32767 0 32767} {a26 16 True 32768 0 32768} {a26 17 True\
+65535 0 65535} {a26 18 True 65536 0 65536} {a26 19 True 2147483647 0\
+2147483647} {a26 20 True 2147483648 0 2147483648} {a26 21 True 4294967295 0\
+4294967295} {a26 22 True 4294967296 0 4294967296} {a26 23 True\
+9223372036854775807 0 9223372036854775807} {a26 24 True 9223372036854775808 0\
+9223372036854775808} {a26 25 False 18446744073709551615 0 9223372036854775808}\
+{a26 26 False 18446744073709551616 0 9223372036854775808} {a27 0 False\
+-9223372036854775809 0 9223372036854775808} {a27 1 False -9223372036854775808 0\
+9223372036854775808} {a27 2 False -2147483649 0 18446744071562067967} {a27 3\
+False -2147483648 0 18446744071562067968} {a27 4 False -32769 0\
+18446744073709518847} {a27 5 False -32768 0 18446744073709518848} {a27 6 False\
+-129 0 18446744073709551487} {a27 7 False -128 0 18446744073709551488} {a27 8\
+False -1 0 18446744073709551615} {a27 9 True 0 0 0} {a27 10 True 1 0 1} {a27 11\
+True 127 0 127} {a27 12 True 128 0 128} {a27 13 True 255 0 255} {a27 14 True\
+256 0 256} {a27 15 True 32767 0 32767} {a27 16 True 32768 0 32768} {a27 17 True\
+65535 0 65535} {a27 18 True 65536 0 65536} {a27 19 True 2147483647 0\
+2147483647} {a27 20 True 2147483648 0 2147483648} {a27 21 True 4294967295 0\
+4294967295} {a27 22 True 4294967296 0 4294967296} {a27 23 True\
+9223372036854775807 0 9223372036854775807} {a27 24 True 9223372036854775808 0\
+9223372036854775808} {a27 25 False 18446744073709551615 0 9223372036854775808}\
+{a27 26 False 18446744073709551616 0 9223372036854775808} {a28 0 False\
+-9223372036854775809 0 9223372036854775808} {a28 1 False -9223372036854775808 0\
+9223372036854775808} {a28 2 False -2147483649 0 18446744071562067967} {a28 3\
+False -2147483648 0 18446744071562067968} {a28 4 False -32769 0\
+18446744073709518847} {a28 5 False -32768 0 18446744073709518848} {a28 6 False\
+-129 0 18446744073709551487} {a28 7 False -128 0 18446744073709551488} {a28 8\
+False -1 0 18446744073709551615} {a28 9 True 0 0 0} {a28 10 True 1 0 1} {a28 11\
+True 127 0 127} {a28 12 True 128 0 128} {a28 13 True 255 0 255} {a28 14 True\
+256 0 256} {a28 15 True 32767 0 32767} {a28 16 True 32768 0 32768} {a28 17 True\
+65535 0 65535} {a28 18 True 65536 0 65536} {a28 19 True 2147483647 0\
+2147483647} {a28 20 True 2147483648 0 2147483648} {a28 21 True 4294967295 0\
+4294967295} {a28 22 True 4294967296 0 4294967296} {a28 23 True\
+9223372036854775807 0 9223372036854775807} {a28 24 True 9223372036854775808 0\
+9223372036854775808} {a28 25 False 18446744073709551615 0 9223372036854775808}\
+{a28 26 False 18446744073709551616 0 9223372036854775808} {a29 0 False\
+-9223372036854775809 0 0} {a29 1 False -9223372036854775808 0 0} {a29 2 False\
+-2147483649 0 255} {a29 3 False -2147483648 0 0} {a29 4 False -32769 0 255}\
+{a29 5 False -32768 0 0} {a29 6 False -129 0 127} {a29 7 False -128 0 128} {a29\
+8 False -1 0 255} {a29 9 True 0 0 0} {a29 10 True 1 0 1} {a29 11 True 127 0\
+127} {a29 12 True 128 0 128} {a29 13 True 255 0 255} {a29 14 False 256 0 0}\
+{a29 15 False 32767 0 255} {a29 16 False 32768 0 0} {a29 17 False 65535 0 255}\
+{a29 18 False 65536 0 0} {a29 19 False 2147483647 0 255} {a29 20 False\
+2147483648 0 0} {a29 21 False 4294967295 0 255} {a29 22 False 4294967296 0 0}\
+{a29 23 False 9223372036854775807 0 255} {a29 24 False 9223372036854775808 0 0}\
+{a29 25 False 18446744073709551615 0 0} {a29 26 False 18446744073709551616 0 0}\
+{a30 0 False -9223372036854775809 0 0} {a30 1 False -9223372036854775808 0 0}\
+{a30 2 False -2147483649 0 65535} {a30 3 False -2147483648 0 0} {a30 4 False\
+-32769 0 32767} {a30 5 False -32768 0 32768} {a30 6 False -129 0 65407} {a30 7\
+False -128 0 65408} {a30 8 False -1 0 65535} {a30 9 True 0 0 0} {a30 10 True 1\
+0 1} {a30 11 True 127 0 127} {a30 12 True 128 0 128} {a30 13 True 255 0 255}\
+{a30 14 True 256 0 256} {a30 15 True 32767 0 32767} {a30 16 True 32768 0 32768}\
+{a30 17 True 65535 0 65535} {a30 18 False 65536 0 0} {a30 19 False 2147483647 0\
+65535} {a30 20 False 2147483648 0 0} {a30 21 False 4294967295 0 65535} {a30 22\
+False 4294967296 0 0} {a30 23 False 9223372036854775807 0 65535} {a30 24 False\
+9223372036854775808 0 0} {a30 25 False 18446744073709551615 0 0} {a30 26 False\
+18446744073709551616 0 0} {a31 0 False -9223372036854775809 0 0} {a31 1 False\
+-9223372036854775808 0 0} {a31 2 False -2147483649 0 2147483647} {a31 3 False\
+-2147483648 0 2147483648} {a31 4 False -32769 0 4294934527} {a31 5 False -32768\
+0 4294934528} {a31 6 False -129 0 4294967167} {a31 7 False -128 0 4294967168}\
+{a31 8 False -1 0 4294967295} {a31 9 True 0 0 0} {a31 10 True 1 0 1} {a31 11\
+True 127 0 127} {a31 12 True 128 0 128} {a31 13 True 255 0 255} {a31 14 True\
+256 0 256} {a31 15 True 32767 0 32767} {a31 16 True 32768 0 32768} {a31 17 True\
+65535 0 65535} {a31 18 True 65536 0 65536} {a31 19 True 2147483647 0\
+2147483647} {a31 20 True 2147483648 0 2147483648} {a31 21 True 4294967295 0\
+4294967295} {a31 22 False 4294967296 0 0} {a31 23 False 9223372036854775807 0\
+4294967295} {a31 24 False 9223372036854775808 0 0} {a31 25 False\
+18446744073709551615 0 0} {a31 26 False 18446744073709551616 0 0} {a32 0 False\
+-9223372036854775809 0 9223372036854775808} {a32 1 False -9223372036854775808 0\
+9223372036854775808} {a32 2 False -2147483649 0 18446744071562067967} {a32 3\
+False -2147483648 0 18446744071562067968} {a32 4 False -32769 0\
+18446744073709518847} {a32 5 False -32768 0 18446744073709518848} {a32 6 False\
+-129 0 18446744073709551487} {a32 7 False -128 0 18446744073709551488} {a32 8\
+False -1 0 18446744073709551615} {a32 9 True 0 0 0} {a32 10 True 1 0 1} {a32 11\
+True 127 0 127} {a32 12 True 128 0 128} {a32 13 True 255 0 255} {a32 14 True\
+256 0 256} {a32 15 True 32767 0 32767} {a32 16 True 32768 0 32768} {a32 17 True\
+65535 0 65535} {a32 18 True 65536 0 65536} {a32 19 True 2147483647 0\
+2147483647} {a32 20 True 2147483648 0 2147483648} {a32 21 True 4294967295 0\
+4294967295} {a32 22 True 4294967296 0 4294967296} {a32 23 True\
+9223372036854775807 0 9223372036854775807} {a32 24 True 9223372036854775808 0\
+9223372036854775808} {a32 25 False 18446744073709551615 0 9223372036854775808}\
+{a32 26 False 18446744073709551616 0 9223372036854775808}}}
+
+###############################################################################
+
+runTest {test tkt-c010fa6584-1.2 {UInt32 parameter} -setup {
+ setupDb [set fileName tkt-c010fa6584-1.2.db]
+} -body {
+ sql execute $db "CREATE TABLE t1(x UINT32);"
+
+ sql execute $db "INSERT INTO t1 (x) VALUES(?);" \
+ [list param1 UInt32 0xFFFFFFFF]
+
+ sql execute -execute scalar $db "SELECT x FROM t1;"
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
+{4294967295}}
+
+###############################################################################
+
+runTest {test tkt-c010fa6584-1.3 {UInt32 parameter (Int64)} -setup {
+ setupDb [set fileName tkt-c010fa6584-1.3.db]
+} -body {
+ sql execute $db "CREATE TABLE t1(x INTEGER);"
+
+ sql execute $db "INSERT INTO t1 (x) VALUES(?);" \
+ [list param1 UInt32 0xFFFFFFFF]
+
+ sql execute -execute scalar $db "SELECT x FROM t1;"
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
+{-1}}
+
+###############################################################################
+
+runTest {test tkt-c010fa6584-1.4 {UInt32 parameter (Int64) w/flag} -setup {
+ setupDb [set fileName tkt-c010fa6584-1.4.db] "" "" "" BindUInt32AsInt64
+} -body {
+ sql execute $db "CREATE TABLE t1(x INTEGER);"
+
+ sql execute $db "INSERT INTO t1 (x) VALUES(?);" \
+ [list param1 UInt32 0xFFFFFFFF]
+
+ sql execute -execute scalar $db "SELECT x FROM t1;"
+} -cleanup {
+ cleanupDb $fileName
+
+ unset -nocomplain db fileName
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
+{4294967295}}
+
+###############################################################################
+
+runSQLiteTestEpilogue
+runTestEpilogue
Index: Tests/version.eagle
==================================================================
--- Tests/version.eagle
+++ Tests/version.eagle
@@ -27,11 +27,11 @@
# numbers must be manually kept synchronized with the version numbers for
# the source code files, the built binaries, and the release packages.
#
set version(major) 1
set version(minor) 0
-set version(build) 83; # NOTE: Incremented with each release.
+set version(build) 85; # NOTE: Incremented with each release.
set version(revision) 0
###############################################################################
# ********************* END VOLATILE VERSION INFORMATION **********************
###############################################################################
@@ -175,10 +175,12 @@
[appendArgs [string map [list . \\.] $version(full)] \
] \
[appendArgs [string map [list . \\.] $version(full)] \
] \
[appendArgs [string map [list . \\.] $version(full)] \
+ ] \
+ [appendArgs [string map [list . \\.] $version(full)] \
] \
[appendArgs Version= [string map [list . \\.] $version(full)] ,] \
[appendArgs "\; [format %03d $version(build)] "\;] \
[appendArgs AssemblyVersion\\(\" [string map [list . \\.] \
$version(full)] \"\\)] \
@@ -241,10 +243,11 @@
$version(full)] \"\\)]]
set fileNames [list \
readme.htm \
SQLite.nuspec \
+ SQLite.Beta.nuspec \
SQLite.MSIL.nuspec \
SQLite.x64.nuspec \
SQLite.x86.nuspec \
[file join Doc Extra dbfactorysupport.html] \
[file join Doc Extra welcome.html] \
Index: exclude_bin.txt
==================================================================
--- exclude_bin.txt
+++ exclude_bin.txt
@@ -1,6 +1,7 @@
*.done
*.exp
*.lib
*.map
+*.mda.config
*EnvDTE.*
*Microsoft.*
Index: exclude_src.txt
==================================================================
--- exclude_src.txt
+++ exclude_src.txt
@@ -1,14 +1,17 @@
*.cache
*.chw
*.docstates
*.fossil
+*.mistachkin.eagle
*.ncb
*.nupkg
+*.pdb
*.suo
*.user
*.zip
+.fossil-settings/*
_FOSSIL_
bin/*
Doc/Output/*
Externals/Eagle/bin/Eagle.dll
Externals/Eagle/bin/EagleShell.exe
@@ -33,12 +36,12 @@
Membership/*
Membership/obj/*
Membership/Profile/*
Membership/SiteMap/*
obj/*
-Setup/set_user_*.bat
Setup/Output/*
+Setup/set_user_*.bat
SQLite.Designer/obj/*
SQLite.Designer/Properties/*
SQLite.Designer/VSDesign/*
System.Data.SQLite.Linq/obj/*
System.Data.SQLite/obj/*
Index: readme.htm
==================================================================
--- readme.htm
+++ readme.htm
@@ -3,12 +3,12 @@
-Version 1.0.83.0 December XX, 2012 (release scheduled)
-Using SQLite 3.7.15.1
+Version 1.0.85.0 March XX, 2013 (release scheduled)
+Using SQLite 3.7.16
Originally written by Robert Simpson
Released to the public domain, use at your own risk!
Official provider website: http://system.data.sqlite.org/
Legacy versions: http://sqlite.phxsoftware.com/
@@ -144,11 +144,11 @@ <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" - type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.83.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> + type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.85.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> </configuration>
-Version 1.0.83.0 December XX, 2012 (release scheduled)
-Using SQLite 3.7.15.1
+Version 1.0.85.0 March XX, 2013 (release scheduled)
+Using SQLite 3.7.16
Originally written by Robert Simpson
Released to the public domain, use at your own risk!
Official provider website: http://system.data.sqlite.org/
Legacy versions: http://sqlite.phxsoftware.com/
@@ -144,11 +144,11 @@ <configuration> <system.data> <DbProviderFactories> <remove invariant="System.Data.SQLite" /> <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" - type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.83.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> + type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite, Version=1.0.85.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139" /> </DbProviderFactories> </system.data> </configuration>
@@ -185,11 +185,39 @@
Version History
- 1.0.83.0 - December XX, 2012 + 1.0.85.0 - March XX, 2013 (release scheduled) +
+-
+
+ 1.0.84.0 - January 9, 2013 +
+-
+
+ 1.0.83.0 - December 29, 2012