Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Make sure SQLiteIndexOutputs.ConstraintUsages instances are created prior to calling ISQLiteManagedModule.BestIndex. Fix for [56f511d268]. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c927246f90ef3ce01b7f08fa3007c1af |
User & Date: | mistachkin 2015-01-22 18:35:54.087 |
Context
2015-01-22
| ||
22:39 | Correct marshalling of strings and blobs in the SQLiteValue class. Fix for [85b824b736]. check-in: c68ac18fb4 user: mistachkin tags: trunk | |
18:35 | Make sure SQLiteIndexOutputs.ConstraintUsages instances are created prior to calling ISQLiteManagedModule.BestIndex. Fix for [56f511d268]. check-in: c927246f90 user: mistachkin tags: trunk | |
2015-01-20
| ||
18:45 | Update SQLite core library to the 3.8.8.1 release. check-in: 08e48dbfa7 user: mistachkin tags: trunk | |
Changes
Changes to Doc/Extra/Provider/version.html.
︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 | <div id="mainSection"> <div id="mainBody"> <h1 class="heading">Version History</h1> <p><b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="http://www.sqlite.org/releaselog/3_8_8_1.html">SQLite 3.8.8.1</a>.</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to <a href="http://system.data.sqlite.org/index.html/info/e122d26e70">[e122d26e70]</a>.</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for <a href="http://system.data.sqlite.org/index.html/info/daeaf3150a">[daeaf3150a]</a>.</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for <a href="http://system.data.sqlite.org/index.html/info/0a32885109">[0a32885109]</a>.</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for <a href="http://system.data.sqlite.org/index.html/info/c5cc2fb334">[c5cc2fb334]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for <a href="http://system.data.sqlite.org/index.html/info/3e783eecbe">[3e783eecbe]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for <a href="http://system.data.sqlite.org/index.html/info/e796ac82c1">[e796ac82c1]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for <a href="http://system.data.sqlite.org/index.html/info/f16c93a932">[f16c93a932]</a>. <b>** Potentially Incompatible Change **</b></li> | > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | <div id="mainSection"> <div id="mainBody"> <h1 class="heading">Version History</h1> <p><b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="http://www.sqlite.org/releaselog/3_8_8_1.html">SQLite 3.8.8.1</a>.</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Make sure SQLiteIndexOutputs.ConstraintUsages instances are created prior to calling ISQLiteManagedModule.BestIndex. Fix for <a href="http://system.data.sqlite.org/index.html/info/56f511d268">[56f511d268]</a>.</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to <a href="http://system.data.sqlite.org/index.html/info/e122d26e70">[e122d26e70]</a>.</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for <a href="http://system.data.sqlite.org/index.html/info/daeaf3150a">[daeaf3150a]</a>.</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for <a href="http://system.data.sqlite.org/index.html/info/0a32885109">[0a32885109]</a>.</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for <a href="http://system.data.sqlite.org/index.html/info/c5cc2fb334">[c5cc2fb334]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for <a href="http://system.data.sqlite.org/index.html/info/3e783eecbe">[3e783eecbe]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for <a href="http://system.data.sqlite.org/index.html/info/e796ac82c1">[e796ac82c1]</a>. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for <a href="http://system.data.sqlite.org/index.html/info/f16c93a932">[f16c93a932]</a>. <b>** Potentially Incompatible Change **</b></li> |
︙ | ︙ |
Changes to Setup/data/verify.lst.
︙ | ︙ | |||
527 528 529 530 531 532 533 534 535 536 537 538 539 540 | System.Data.SQLite/SQLiteFactory.cs System.Data.SQLite/SQLiteFunction.cs System.Data.SQLite/SQLiteFunctionAttribute.cs System.Data.SQLite/SQLiteKeyReader.cs System.Data.SQLite/SQLiteLog.cs System.Data.SQLite/SQLiteMetaDataCollectionNames.cs System.Data.SQLite/SQLiteModule.cs System.Data.SQLite/SQLiteModuleEnumerable.cs System.Data.SQLite/SQLiteModuleNoop.cs System.Data.SQLite/SQLiteParameter.cs System.Data.SQLite/SQLiteParameterCollection.cs System.Data.SQLite/SQLitePatchLevel.cs System.Data.SQLite/SQLiteStatement.cs System.Data.SQLite/SQLiteTransaction.cs | > | 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 | System.Data.SQLite/SQLiteFactory.cs System.Data.SQLite/SQLiteFunction.cs System.Data.SQLite/SQLiteFunctionAttribute.cs System.Data.SQLite/SQLiteKeyReader.cs System.Data.SQLite/SQLiteLog.cs System.Data.SQLite/SQLiteMetaDataCollectionNames.cs System.Data.SQLite/SQLiteModule.cs System.Data.SQLite/SQLiteModuleCommon.cs System.Data.SQLite/SQLiteModuleEnumerable.cs System.Data.SQLite/SQLiteModuleNoop.cs System.Data.SQLite/SQLiteParameter.cs System.Data.SQLite/SQLiteParameterCollection.cs System.Data.SQLite/SQLitePatchLevel.cs System.Data.SQLite/SQLiteStatement.cs System.Data.SQLite/SQLiteTransaction.cs |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModule.cs.
︙ | ︙ | |||
824 825 826 827 828 829 830 831 832 833 834 835 836 837 | /// <summary> /// This class represents the native sqlite3_index_constraint_usage /// structure from the SQLite core library. /// </summary> public sealed class SQLiteIndexConstraintUsage { #region Internal Constructors /// <summary> /// Constructs an instance of this class using the specified native /// sqlite3_index_constraint_usage structure. /// </summary> /// <param name="constraintUsage"> /// The native sqlite3_index_constraint_usage structure to use. /// </param> | > > > > > > > > > > | 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 | /// <summary> /// This class represents the native sqlite3_index_constraint_usage /// structure from the SQLite core library. /// </summary> public sealed class SQLiteIndexConstraintUsage { #region Internal Constructors /// <summary> /// Constructs a default instance of this class. /// </summary> internal SQLiteIndexConstraintUsage() { // do nothing. } ////////////////////////////////////////////////////////////////////// /// <summary> /// Constructs an instance of this class using the specified native /// sqlite3_index_constraint_usage structure. /// </summary> /// <param name="constraintUsage"> /// The native sqlite3_index_constraint_usage structure to use. /// </param> |
︙ | ︙ | |||
957 958 959 960 961 962 963 964 965 966 967 968 969 970 | /// <param name="nConstraint"> /// The number of <see cref="SQLiteIndexConstraintUsage" /> instances /// to pre-allocate space for. /// </param> internal SQLiteIndexOutputs(int nConstraint) { constraintUsages = new SQLiteIndexConstraintUsage[nConstraint]; } #endregion /////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if the native estimatedRows field can be used, based on | > > > > > > > | 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 | /// <param name="nConstraint"> /// The number of <see cref="SQLiteIndexConstraintUsage" /> instances /// to pre-allocate space for. /// </param> internal SQLiteIndexOutputs(int nConstraint) { constraintUsages = new SQLiteIndexConstraintUsage[nConstraint]; // // BUGFIX: Create the [empty] constraint usages now so they can be // used by the xBestIndex callback. // for (int iConstraint = 0; iConstraint < nConstraint; iConstraint++) constraintUsages[iConstraint] = new SQLiteIndexConstraintUsage(); } #endregion /////////////////////////////////////////////////////////////////////// /// <summary> /// Determines if the native estimatedRows field can be used, based on |
︙ | ︙ |
Added System.Data.SQLite/SQLiteModuleCommon.cs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Joe Mistachkin (joe@mistachkin.com) * * Released to the public domain, use at your own risk! ********************************************************/ using System.Globalization; #region Non-Generic Classes namespace System.Data.SQLite { #region SQLiteModuleCommon Class /// <summary> /// This class contains some virtual methods that may be useful for other /// virtual table classes. It specifically does NOT implement any of the /// <see cref="ISQLiteManagedModule" /> interface methods. /// </summary> public class SQLiteModuleCommon : SQLiteModuleNoop /* NOT SEALED */ { #region Private Constants /// <summary> /// The CREATE TABLE statement used to declare the schema for the /// virtual table. /// </summary> private static readonly string declareSql = String.Format( CultureInfo.CurrentCulture, "CREATE TABLE {0}(x);", typeof(SQLiteModuleCommon).Name); #endregion /////////////////////////////////////////////////////////////////////// #region Private Data /// <summary> /// Non-zero if different object instances with the same value should /// generate different row identifiers, where applicable. This has no /// effect on the .NET Compact Framework. /// </summary> private bool objectIdentity; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors /// <summary> /// Constructs an instance of this class. /// </summary> /// <param name="name"> /// The name of the module. This parameter cannot be null. /// </param> public SQLiteModuleCommon( string name ) : this(name, false) { // do nothing. } /////////////////////////////////////////////////////////////////////// /// <summary> /// Constructs an instance of this class. /// </summary> /// <param name="name"> /// The name of the module. This parameter cannot be null. /// </param> /// <param name="objectIdentity"> /// Non-zero if different object instances with the same value should /// generate different row identifiers, where applicable. This /// parameter has no effect on the .NET Compact Framework. /// </param> public SQLiteModuleCommon( string name, bool objectIdentity ) : base(name) { this.objectIdentity = objectIdentity; } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Methods /// <summary> /// Determines the SQL statement used to declare the virtual table. /// This method should be overridden in derived classes if they require /// a custom virtual table schema. /// </summary> /// <returns> /// The SQL statement used to declare the virtual table -OR- null if it /// cannot be determined. /// </returns> protected virtual string GetSqlForDeclareTable() { return declareSql; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Sets the table error message to one that indicates the virtual /// table cursor is of the wrong type. /// </summary> /// <param name="cursor"> /// The <see cref="SQLiteVirtualTableCursor" /> object instance. /// </param> /// <param name="type"> /// The <see cref="Type" /> that the virtual table cursor should be. /// </param> /// <returns> /// The value of <see cref="SQLiteErrorCode.Error" />. /// </returns> protected virtual SQLiteErrorCode CursorTypeMismatchError( SQLiteVirtualTableCursor cursor, Type type ) { if (type != null) { SetCursorError(cursor, String.Format("not a \"{0}\" cursor", type)); } else { SetCursorError(cursor, "cursor type mismatch"); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Determines the string to return as the column value for the object /// instance value. /// </summary> /// <param name="cursor"> /// The <see cref="SQLiteVirtualTableCursor" /> object instance /// associated with the previously opened virtual table cursor to be /// used. /// </param> /// <param name="value"> /// The object instance to return a string representation for. /// </param> /// <returns> /// The string representation of the specified object instance or null /// upon failure. /// </returns> protected virtual string GetStringFromObject( SQLiteVirtualTableCursor cursor, object value ) { if (value == null) return null; if (value is string) return (string)value; return value.ToString(); } /////////////////////////////////////////////////////////////////////// /// <summary> /// Constructs an <see cref="Int64" /> unique row identifier from two /// <see cref="Int32" /> values. The first <see cref="Int32" /> value /// must contain the row sequence number for the current row and the /// second value must contain the hash code of the key column value /// for the current row. /// </summary> /// <param name="rowIndex"> /// The integer row sequence number for the current row. /// </param> /// <param name="hashCode"> /// The hash code of the key column value for the current row. /// </param> /// <returns> /// The unique row identifier or zero upon failure. /// </returns> protected virtual long MakeRowId( int rowIndex, int hashCode ) { long result = rowIndex; result <<= 32; /* typeof(int) bits */ result |= (long)(uint)hashCode; return result; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Determines the unique row identifier for the current row. /// </summary> /// <param name="cursor"> /// The <see cref="SQLiteVirtualTableCursor" /> object instance /// associated with the previously opened virtual table cursor to be /// used. /// </param> /// <param name="value"> /// The object instance to return a unique row identifier for. /// </param> /// <returns> /// The unique row identifier or zero upon failure. /// </returns> protected virtual long GetRowIdFromObject( SQLiteVirtualTableCursor cursor, object value ) { int rowIndex = (cursor != null) ? cursor.GetRowIndex() : 0; int hashCode = SQLiteMarshal.GetHashCode(value, objectIdentity); return MakeRowId(rowIndex, hashCode); } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; /// <summary> /// Throws an <see cref="ObjectDisposedException" /> if this object /// instance has been disposed. /// </summary> private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { throw new ObjectDisposedException( typeof(SQLiteModuleCommon).Name); } #endif } /////////////////////////////////////////////////////////////////////// /// <summary> /// Disposes of this object instance. /// </summary> /// <param name="disposing"> /// Non-zero if this method is being called from the /// <see cref="IDisposable.Dispose" /> method. Zero if this method is /// being called from the finalizer. /// </param> protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) //{ // //////////////////////////////////// // // dispose managed resources here... // //////////////////////////////////// //} ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// } } finally { base.Dispose(disposing); // // NOTE: Everything should be fully disposed at this point. // disposed = true; } } #endregion } #endregion } #endregion |
Changes to System.Data.SQLite/SQLiteModuleEnumerable.cs.
︙ | ︙ | |||
292 293 294 295 296 297 298 | /// /// connection.Close(); /// } /// } /// } /// </code> /// </summary> | | < < < < < < < < < < < < | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | /// /// connection.Close(); /// } /// } /// } /// </code> /// </summary> public class SQLiteModuleEnumerable : SQLiteModuleCommon /* NOT SEALED */ { #region Private Data /// <summary> /// The <see cref="IEnumerable" /> instance containing the backing data /// for the virtual table. /// </summary> private IEnumerable enumerable; |
︙ | ︙ | |||
380 381 382 383 384 385 386 | this.objectIdentity = objectIdentity; } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Methods | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | this.objectIdentity = objectIdentity; } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Methods /// <summary> /// Sets the table error message to one that indicates the virtual /// table cursor has no current row. /// </summary> /// <param name="cursor"> /// The <see cref="SQLiteVirtualTableCursor" /> object instance. /// </param> /// <returns> /// The value of <see cref="SQLiteErrorCode.Error" />. /// </returns> protected virtual SQLiteErrorCode CursorEndOfEnumeratorError( SQLiteVirtualTableCursor cursor ) { SetCursorError(cursor, "already hit end of enumerator"); return SQLiteErrorCode.Error; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteManagedModule Members /// <summary> /// See the <see cref="ISQLiteManagedModule.Create" /> method. |
︙ | ︙ | |||
737 738 739 740 741 742 743 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } enumeratorCursor.Close(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
776 777 778 779 780 781 782 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } enumeratorCursor.Filter(indexNumber, indexString, values); enumeratorCursor.Reset(); /* NO RESULT */ enumeratorCursor.MoveNext(); /* IGNORED */ return SQLiteErrorCode.Ok; } |
︙ | ︙ | |||
806 807 808 809 810 811 812 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } if (enumeratorCursor.EndOfEnumerator) return CursorEndOfEnumeratorError(cursor); enumeratorCursor.MoveNext(); /* IGNORED */ return SQLiteErrorCode.Ok; } |
︙ | ︙ | |||
836 837 838 839 840 841 842 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return ResultCodeToEofResult(CursorTypeMismatchError( cursor, typeof(SQLiteVirtualTableCursorEnumerator))); } return enumeratorCursor.EndOfEnumerator; } /////////////////////////////////////////////////////////////////////// /// <summary> |
︙ | ︙ | |||
870 871 872 873 874 875 876 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } if (enumeratorCursor.EndOfEnumerator) return CursorEndOfEnumeratorError(cursor); object current = enumeratorCursor.Current; if (current != null) |
︙ | ︙ | |||
910 911 912 913 914 915 916 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) | > | > > | 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } if (enumeratorCursor.EndOfEnumerator) return CursorEndOfEnumeratorError(cursor); object current = enumeratorCursor.Current; rowId = GetRowIdFromObject(cursor, current); |
︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator<T> enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator<T>; if (enumeratorCursor == null) | > | > > | 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 | { CheckDisposed(); SQLiteVirtualTableCursorEnumerator<T> enumeratorCursor = cursor as SQLiteVirtualTableCursorEnumerator<T>; if (enumeratorCursor == null) { return CursorTypeMismatchError(cursor, typeof(SQLiteVirtualTableCursorEnumerator)); } if (enumeratorCursor.EndOfEnumerator) return CursorEndOfEnumeratorError(cursor); T current = ((IEnumerator<T>)enumeratorCursor).Current; if (current != null) |
︙ | ︙ |
Changes to System.Data.SQLite/Targets/System.Data.SQLite.Files.targets.
︙ | ︙ | |||
96 97 98 99 100 101 102 103 104 105 106 | ****************************************************************************** ** Virtual Table Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropVirtualTable)' != 'false'"> <Compile Include="SQLiteModule.cs" /> <Compile Include="SQLiteModuleEnumerable.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> </ItemGroup> </Project> | > | 96 97 98 99 100 101 102 103 104 105 106 107 | ****************************************************************************** ** Virtual Table Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropVirtualTable)' != 'false'"> <Compile Include="SQLiteModule.cs" /> <Compile Include="SQLiteModuleCommon.cs" /> <Compile Include="SQLiteModuleEnumerable.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> </ItemGroup> </Project> |
Changes to Tests/vtab.eagle.
︙ | ︙ | |||
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 | ORDER BY v${id}.y DESC; \ } unset -nocomplain results errors set code [compileCSharpWith [subst { using System; using System.Data.SQLite; using Eagle._Containers.Public; namespace _Dynamic${id} { public static class Test${id} { public static StringList GetList(params string\[\] strings) { StringList result = new StringList(); using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};[getFlagsProperty]")) { connection.Open(); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 | ORDER BY v${id}.y DESC; \ } unset -nocomplain results errors set code [compileCSharpWith [subst { using System; using System.Collections; using System.Data.SQLite; using Eagle._Containers.Public; namespace _Dynamic${id} { public sealed class SQLiteModuleTest${id} : SQLiteModuleEnumerable { public string Result; /////////////////////////////////////////////////////////////////////// public SQLiteModuleTest${id}( string name, IEnumerable enumerable ) : base(name, enumerable) { // do nothing. } /////////////////////////////////////////////////////////////////////// // // BUGFIX: This method helps verify ticket [56f511d268] is fixed. // public override SQLiteErrorCode BestIndex( SQLiteVirtualTable table, SQLiteIndex index ) { if (index.Outputs.ConstraintUsages.Length > 0) { if (index.Outputs.ConstraintUsages\[0\] == null) throw new ArgumentException("ConstraintUsages\[0\] is null"); else Result = "ConstraintUsages is OK"; } return base.BestIndex(table, index); } } ///////////////////////////////////////////////////////////////////////// public static class Test${id} { public static StringList GetList(params string\[\] strings) { StringList result = new StringList(); using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};[getFlagsProperty]")) { connection.Open(); SQLiteModuleTest${id} module = new SQLiteModuleTest${id}( "mod${id}", strings); connection.CreateModule(module); using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(1)}]"; result.Add(command.ExecuteNonQuery().ToString()); } |
︙ | ︙ | |||
1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 | using (SQLiteDataReader dataReader = command.ExecuteReader()) { while (dataReader.Read()) result.Add(dataReader\[0\].ToString()); } } connection.Close(); } return result; } /////////////////////////////////////////////////////////////////////// | > | 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 | using (SQLiteDataReader dataReader = command.ExecuteReader()) { while (dataReader.Read()) result.Add(dataReader\[0\].ToString()); } } result.Add(module.Result); connection.Close(); } return result; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1325 1326 1327 1328 1329 1330 1331 | unset -nocomplain result code results errors sql dataSource id fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE compileCSharp} -match \ regexp -result [string map [list \n \r\n] {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 5 two three one 5\.0\ | | | 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 | unset -nocomplain result code results errors sql dataSource id fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE compileCSharp} -match \ regexp -result [string map [list \n \r\n] {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 5 two three one 5\.0\ 4 \{ConstraintUsages is OK\}\}$}]} ############################################################################### runTest {test vtab-1.8 {virtual table xBestIndex marshalling (2)} -setup { set fileName vtab-1.8.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 | u${id}.x DESC; \ } unset -nocomplain results errors set code [compileCSharpWith [subst { using System; using System.Data.SQLite; using Eagle._Containers.Public; namespace _Dynamic${id} { public static class Test${id} { public static StringList GetList(params string\[\] strings) { StringList result = new StringList(); using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};[getFlagsProperty]")) { connection.Open(); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 | u${id}.x DESC; \ } unset -nocomplain results errors set code [compileCSharpWith [subst { using System; using System.Collections; using System.Data.SQLite; using Eagle._Containers.Public; namespace _Dynamic${id} { public sealed class SQLiteModuleTest${id} : SQLiteModuleEnumerable { public string Result; /////////////////////////////////////////////////////////////////////// public SQLiteModuleTest${id}( string name, IEnumerable enumerable ) : base(name, enumerable) { // do nothing. } /////////////////////////////////////////////////////////////////////// // // BUGFIX: This method helps verify ticket [56f511d268] is fixed. // public override SQLiteErrorCode BestIndex( SQLiteVirtualTable table, SQLiteIndex index ) { if (index.Outputs.ConstraintUsages.Length > 0) { if (index.Outputs.ConstraintUsages\[0\] == null) throw new ArgumentException("ConstraintUsages\[0\] is null"); else Result = "ConstraintUsages is OK"; } return base.BestIndex(table, index); } } ///////////////////////////////////////////////////////////////////////// public static class Test${id} { public static StringList GetList(params string\[\] strings) { StringList result = new StringList(); using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};[getFlagsProperty]")) { connection.Open(); SQLiteModuleTest${id} module = new SQLiteModuleTest${id}( "mod${id}", strings); connection.CreateModule(module); using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(1)}]"; result.Add(command.ExecuteNonQuery().ToString()); } |
︙ | ︙ | |||
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 | using (SQLiteDataReader dataReader = command.ExecuteReader()) { while (dataReader.Read()) result.Add(dataReader\[0\].ToString()); } } connection.Close(); } return result; } /////////////////////////////////////////////////////////////////////// | > | 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 | using (SQLiteDataReader dataReader = command.ExecuteReader()) { while (dataReader.Read()) result.Add(dataReader\[0\].ToString()); } } result.Add(module.Result); connection.Close(); } return result; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1426 1427 1428 1429 1430 1431 1432 | cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE compileCSharp} -match \ regexp -result [string map [list \n \r\n] {^Ok\ | | > | 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 | cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE compileCSharp} -match \ regexp -result [string map [list \n \r\n] {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 5 one three\ \{ConstraintUsages is OK\}\}$}]} ############################################################################### runTest {test vtab-1.9 {IEnumerable virtual table w/large byte array} -setup { set fileName vtab-1.9.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ |
Changes to readme.htm.
︙ | ︙ | |||
210 211 212 213 214 215 216 217 218 219 220 221 222 223 | <p> <b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="http://www.sqlite.org/releaselog/3_8_8_1.html">SQLite 3.8.8.1</a>.</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to [e122d26e70].</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for [daeaf3150a].</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for [0a32885109].</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for [c5cc2fb334]. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for [3e783eecbe]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for [e796ac82c1]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for [f16c93a932]. <b>** Potentially Incompatible Change **</b></li> | > | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | <p> <b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="http://www.sqlite.org/releaselog/3_8_8_1.html">SQLite 3.8.8.1</a>.</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Make sure SQLiteIndexOutputs.ConstraintUsages instances are created prior to calling ISQLiteManagedModule.BestIndex. Fix for [56f511d268].</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to [e122d26e70].</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for [daeaf3150a].</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for [0a32885109].</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for [c5cc2fb334]. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for [3e783eecbe]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for [e796ac82c1]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for [f16c93a932]. <b>** Potentially Incompatible Change **</b></li> |
︙ | ︙ |
Changes to www/news.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | <title>News</title> <b>Version History</b> <p> <b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to [http://www.sqlite.org/releaselog/3_8_8_1.html|SQLite 3.8.8.1].</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to [e122d26e70].</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for [daeaf3150a].</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for [0a32885109].</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for [c5cc2fb334]. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for [3e783eecbe]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for [e796ac82c1]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for [f16c93a932]. <b>** Potentially Incompatible Change **</b></li> | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | <title>News</title> <b>Version History</b> <p> <b>1.0.95.0 - January XX, 2015 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to [http://www.sqlite.org/releaselog/3_8_8_1.html|SQLite 3.8.8.1].</li> <li>Make sure SQL statements generated for DbUpdateCommandTree objects are properly delimited.</li> <li>Make sure SQLiteIndexOutputs.ConstraintUsages instances are created prior to calling ISQLiteManagedModule.BestIndex. Fix for [56f511d268].</li> <li>Various minor performance enhancements to the SQLiteDataReader class. Pursuant to [e122d26e70].</li> <li>Defer disposing of connections created by the static SQLiteCommand.Execute method when a data reader is returned. Fix for [daeaf3150a].</li> <li>Wrap SELECT statements in parenthesis if they have an ORDER BY, LIMIT, or OFFSET clause and a compound operator is involved. Fix for [0a32885109].</li> <li>In the SQLiteDataReader.VerifyType method, remove duplicate "if" statement for the DbType.SByte value and move the remaining "if" to the Int64 affinity. Fix for [c5cc2fb334]. <b>** Potentially Incompatible Change **</b></li> <li>Handle Julian Day values that fall outside of the supported range for OLE Automation dates. Fix for [3e783eecbe]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied when publishing a project that refers to a NuGet package containing them. Fix for [e796ac82c1]. <b>** Potentially Incompatible Change **</b></li> <li>Make sure the interop files are copied before the PostBuildEvent. Fix for [f16c93a932]. <b>** Potentially Incompatible Change **</b></li> |
︙ | ︙ |