Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Major cleanup and refactoring of the ISQLiteManagedModule interface. Fix a small memory leak in DeclareVirtualTable. Add the ability to persist SQLiteValue values beyond the duration of the method call in progress. Add SQLiteVirtualTable base class. Update SQLiteVirtualTableCursor base class to be IDisposable and to support storing the filtering parameters. Make parameter naming in the ISQLiteManagedModule interface consistent with other managed code. Add SQLiteVirtualTable parameter to the ISQLiteManagedModule interface methods where necessary. Remove incorrect SQLiteIndex object creation from the IndexToIntPtr method. Keep track of all managed table and cursor object instances associated with their native pointers. Zero out the native sqlite3_vtab object right after allocation. Correct declarations for the sqlite3_vtab and sqlite3_vtab_cursor structures. Add SQLiteModuleEnumerable and SQLiteVirtualTableCursorEnumerable classes to allow an IEnumerable to provide the data for a virtual table. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | virtualTables |
Files: | files | file ages | folders |
SHA1: |
d3ac8fc2c3d3b2b373e179ffe66e8eee |
User & Date: | mistachkin 2013-06-21 03:11:57.009 |
Context
2013-06-21
| ||
05:14 | Fix memory leak in the SQLiteModuleBase class. Add support for optionally tracking memory usage of the SQLiteMarshal class. Make sure sqlite3_*_interop() functions are only used when SQLITE_STANDARD is not defined. check-in: 4aab5f9721 user: mistachkin tags: virtualTables | |
03:11 | Major cleanup and refactoring of the ISQLiteManagedModule interface. Fix a small memory leak in DeclareVirtualTable. Add the ability to persist SQLiteValue values beyond the duration of the method call in progress. Add SQLiteVirtualTable base class. Update SQLiteVirtualTableCursor base class to be IDisposable and to support storing the filtering parameters. Make parameter naming in the ISQLiteManagedModule interface consistent with other managed code. Add SQLiteVirtualTable parameter to the ISQLiteManagedModule interface methods where necessary. Remove incorrect SQLiteIndex object creation from the IndexToIntPtr method. Keep track of all managed table and cursor object instances associated with their native pointers. Zero out the native sqlite3_vtab object right after allocation. Correct declarations for the sqlite3_vtab and sqlite3_vtab_cursor structures. Add SQLiteModuleEnumerable and SQLiteVirtualTableCursorEnumerable classes to allow an IEnumerable to provide the data for a virtual table. check-in: d3ac8fc2c3 user: mistachkin tags: virtualTables | |
2013-06-20
| ||
03:08 | Fix handling of copied connection handles when calling Create and Connect virtual methods. Get initial test passing. check-in: e1bef414b7 user: mistachkin tags: virtualTables | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
1636 1637 1638 1639 1640 1641 1642 | { if (_sql == null) { error = "connection has an invalid handle"; return SQLiteErrorCode.Error; } | > > > > > > | | | | | | > > > > > > > > > | 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 | { if (_sql == null) { error = "connection has an invalid handle"; return SQLiteErrorCode.Error; } IntPtr pSql = IntPtr.Zero; try { pSql = SQLiteMarshal.Utf8IntPtrFromString(strSql); SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_declare_vtab( _sql, pSql); if ((n == SQLiteErrorCode.Ok) && (module != null)) module.Declared = true; if (n != SQLiteErrorCode.Ok) error = GetLastError(); return n; } finally { if (pSql != IntPtr.Zero) { SQLiteMarshal.Free(pSql); pSql = IntPtr.Zero; } } } /// <summary> /// Enables or disabled extension loading by SQLite. /// </summary> /// <param name="bOnOff"> /// True to enable loading of extensions, false to disable. |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConvert.cs.
︙ | ︙ | |||
1195 1196 1197 1198 1199 1200 1201 | /// </summary> Null = 5, /// <summary> /// Used internally by this provider /// </summary> DateTime = 10, /// <summary> | | | 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 | /// </summary> Null = 5, /// <summary> /// Used internally by this provider /// </summary> DateTime = 10, /// <summary> /// Used internally by this provider /// </summary> None = 11, } /// <summary> /// These are the event types associated with the /// <see cref="SQLiteConnectionEventHandler" /> |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModuleBase.cs.
1 2 3 4 5 6 7 8 9 | /******************************************************** * 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; using System.Runtime.InteropServices; | > < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /******************************************************** * 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.Collections.Generic; using System.Globalization; using System.Runtime.InteropServices; using System.Text; namespace System.Data.SQLite { #region SQLite Context Helper Class public sealed class SQLiteContext { |
︙ | ︙ | |||
197 198 199 200 201 202 203 204 205 206 207 208 209 210 | { this.pValue = pValue; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Methods public TypeAffinity GetTypeAffinity() { if (pValue == IntPtr.Zero) return TypeAffinity.None; return UnsafeNativeMethods.sqlite3_value_type(pValue); } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | { this.pValue = pValue; } #endregion /////////////////////////////////////////////////////////////////////// #region Private Methods private void PreventNativeAccess() { pValue = IntPtr.Zero; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Properties private bool persisted; public bool Persisted { get { return persisted; } } /////////////////////////////////////////////////////////////////////// private object value; public object Value { get { if (!persisted) { throw new InvalidOperationException( "value was not persisted"); } return value; } } #endregion /////////////////////////////////////////////////////////////////////// #region Public Methods public TypeAffinity GetTypeAffinity() { if (pValue == IntPtr.Zero) return TypeAffinity.None; return UnsafeNativeMethods.sqlite3_value_type(pValue); } |
︙ | ︙ | |||
265 266 267 268 269 270 271 272 273 274 275 276 277 278 | /////////////////////////////////////////////////////////////////////// public byte[] GetBlob() { if (pValue == IntPtr.Zero) return null; return SQLiteMarshal.BytesFromIntPtr(pValue, GetBytes()); } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexConstraintOp Enumeration | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | /////////////////////////////////////////////////////////////////////// public byte[] GetBlob() { if (pValue == IntPtr.Zero) return null; return SQLiteMarshal.BytesFromIntPtr(pValue, GetBytes()); } /////////////////////////////////////////////////////////////////////// public bool Persist() { switch (GetTypeAffinity()) { case TypeAffinity.Uninitialized: { value = null; PreventNativeAccess(); return (persisted = true); } case TypeAffinity.Int64: { value = GetInt64(); PreventNativeAccess(); return (persisted = true); } case TypeAffinity.Double: { value = GetDouble(); PreventNativeAccess(); return (persisted = true); } case TypeAffinity.Text: { value = GetString(); PreventNativeAccess(); return (persisted = true); } case TypeAffinity.Blob: { value = GetBytes(); PreventNativeAccess(); return (persisted = true); } case TypeAffinity.Null: { value = DBNull.Value; PreventNativeAccess(); return (persisted = true); } default: { return false; } } } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexConstraintOp Enumeration |
︙ | ︙ | |||
473 474 475 476 477 478 479 | public SQLiteIndexConstraintUsage[] ConstraintUsages { get { return constraintUsages; } } /////////////////////////////////////////////////////////////////////// | | | | | | | | | | | | | | 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 | public SQLiteIndexConstraintUsage[] ConstraintUsages { get { return constraintUsages; } } /////////////////////////////////////////////////////////////////////// private int indexNumber; public int IndexNumber { get { return indexNumber; } set { indexNumber = value; } } /////////////////////////////////////////////////////////////////////// private string indexString; public string IndexString { get { return indexString; } set { indexString = value; } } /////////////////////////////////////////////////////////////////////// private int needToFreeIndexString; public int NeedToFreeIndexString { get { return needToFreeIndexString; } set { needToFreeIndexString = value; } } /////////////////////////////////////////////////////////////////////// private int orderByConsumed; public int OrderByConsumed { |
︙ | ︙ | |||
525 526 527 528 529 530 531 | /////////////////////////////////////////////////////////////////////////// #region SQLiteIndex Class public sealed class SQLiteIndex { #region Internal Constructors | | > > > | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 | /////////////////////////////////////////////////////////////////////////// #region SQLiteIndex Class public sealed class SQLiteIndex { #region Internal Constructors internal SQLiteIndex( int nConstraint, int nOrderBy ) { inputs = new SQLiteIndexInputs(nConstraint, nOrderBy); outputs = new SQLiteIndexOutputs(nConstraint); } #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
554 555 556 557 558 559 560 561 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteVirtualTableCursor Class | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > | > | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteVirtualTable Class /* NOT SEALED */ public class SQLiteVirtualTable : ISQLiteNativeHandle, IDisposable { #region Private Constants private const int ModuleNameIndex = 0; private const int DatabaseNameIndex = 1; private const int TableNameIndex = 2; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteVirtualTable( string[] arguments ) { this.arguments = arguments; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Properties private string[] arguments; public virtual string[] Arguments { get { CheckDisposed(); return arguments; } } /////////////////////////////////////////////////////////////////////// public virtual string ModuleName { get { CheckDisposed(); string[] arguments = Arguments; if ((arguments != null) && (arguments.Length > ModuleNameIndex)) { return arguments[ModuleNameIndex]; } else { return null; } } } /////////////////////////////////////////////////////////////////////// public virtual string DatabaseName { get { CheckDisposed(); string[] arguments = Arguments; if ((arguments != null) && (arguments.Length > DatabaseNameIndex)) { return arguments[DatabaseNameIndex]; } else { return null; } } } /////////////////////////////////////////////////////////////////////// public virtual string TableName { get { CheckDisposed(); string[] arguments = Arguments; if ((arguments != null) && (arguments.Length > TableNameIndex)) { return arguments[TableNameIndex]; } else { return null; } } } #endregion /////////////////////////////////////////////////////////////////////// #region Public Methods public virtual bool Rename( string name ) { CheckDisposed(); if ((arguments != null) && (arguments.Length > TableNameIndex)) { arguments[TableNameIndex] = name; return true; } return false; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteNativeHandle Members private IntPtr nativeHandle; public virtual IntPtr NativeHandle { get { CheckDisposed(); return nativeHandle; } internal set { nativeHandle = value; } } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable Members public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { throw new ObjectDisposedException( typeof(SQLiteVirtualTable).Name); } #endif } /////////////////////////////////////////////////////////////////////// protected virtual void Dispose(bool disposing) { if (!disposed) { //if (disposing) //{ // //////////////////////////////////// // // dispose managed resources here... // //////////////////////////////////// //} ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// disposed = true; } } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteVirtualTableCursor Class /* NOT SEALED */ public class SQLiteVirtualTableCursor : ISQLiteNativeHandle, IDisposable { #region Public Constructors public SQLiteVirtualTableCursor( SQLiteVirtualTable table ) { this.table = table; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Properties private SQLiteVirtualTable table; public virtual SQLiteVirtualTable Table { get { CheckDisposed(); return table; } } /////////////////////////////////////////////////////////////////////// private int indexNumber; public virtual int IndexNumber { get { CheckDisposed(); return indexNumber; } } /////////////////////////////////////////////////////////////////////// private string indexString; public virtual string IndexString { get { CheckDisposed(); return indexString; } } /////////////////////////////////////////////////////////////////////// private SQLiteValue[] values; public virtual SQLiteValue[] Values { get { CheckDisposed(); return values; } } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Methods protected virtual int TryPersistValues( SQLiteValue[] values ) { int result = 0; if (values != null) { foreach (SQLiteValue value in values) { if (value == null) continue; if (value.Persist()) result++; } } return result; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Methods public virtual void Filter( int indexNumber, string indexString, SQLiteValue[] values ) { CheckDisposed(); if ((values != null) && (TryPersistValues(values) != values.Length)) { throw new SQLiteException(SQLiteErrorCode.Error, "failed to persist one or more values"); } this.indexNumber = indexNumber; this.indexString = indexString; this.values = values; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteNativeHandle Members private IntPtr nativeHandle; public virtual IntPtr NativeHandle { get { CheckDisposed(); return nativeHandle; } internal set { nativeHandle = value; } } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable Members public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { throw new ObjectDisposedException( typeof(SQLiteVirtualTableCursor).Name); } #endif } /////////////////////////////////////////////////////////////////////// protected virtual void Dispose(bool disposing) { if (!disposed) { //if (disposing) //{ // //////////////////////////////////// // // dispose managed resources here... // //////////////////////////////////// //} ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// disposed = true; } } #endregion /////////////////////////////////////////////////////////////////////// #region Destructor ~SQLiteVirtualTableCursor() { Dispose(false); } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
765 766 767 768 769 770 771 | { bool Declared { get; } string Name { get; } /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Create( | | | | > | | | | > | > | > > > > > > | | < | < > | | | | 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 | { bool Declared { get; } string Name { get; } /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Create( SQLiteConnection connection, /* in */ IntPtr pClientData, /* in */ string[] arguments, /* in */ ref SQLiteVirtualTable table, /* out */ ref string error /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Connect( SQLiteConnection connection, /* in */ IntPtr pClientData, /* in */ string[] arguments, /* in */ ref SQLiteVirtualTable table, /* out */ ref string error /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode BestIndex( SQLiteVirtualTable table, /* in */ SQLiteIndex index /* in, out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Disconnect( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Destroy( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Open( SQLiteVirtualTable table, /* in */ ref SQLiteVirtualTableCursor cursor /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Close( SQLiteVirtualTableCursor cursor /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Filter( SQLiteVirtualTableCursor cursor, /* in */ int indexNumber, /* in */ string indexString, /* in */ SQLiteValue[] values /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Next( SQLiteVirtualTableCursor cursor /* in */ ); |
︙ | ︙ | |||
845 846 847 848 849 850 851 | SQLiteVirtualTableCursor cursor, /* in */ ref long rowId /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Update( | > | | | > > | > > | > > | > > > | | | > > | > | > | | 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 1327 1328 1329 1330 1331 1332 1333 1334 | SQLiteVirtualTableCursor cursor, /* in */ ref long rowId /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Update( SQLiteVirtualTable table, /* in */ SQLiteValue[] values, /* in */ ref long rowId /* in, out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Begin( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Sync( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Commit( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Rollback( SQLiteVirtualTable table /* in */ ); /////////////////////////////////////////////////////////////////////// bool FindFunction( SQLiteVirtualTable table, /* in */ int argumentCount, /* in */ string name, /* in */ ref SQLiteFunction function, /* out */ ref IntPtr pClientData /* out */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Rename( SQLiteVirtualTable table, /* in */ string newName /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Savepoint( SQLiteVirtualTable table, /* in */ int savepoint /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode Release( SQLiteVirtualTable table, /* in */ int savepoint /* in */ ); /////////////////////////////////////////////////////////////////////// SQLiteErrorCode RollbackTo( SQLiteVirtualTable table, /* in */ int savepoint /* in */ ); } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteMarshal Class |
︙ | ︙ | |||
1315 1316 1317 1318 1319 1320 1321 | offset += IntPtr.Size; IntPtr pConstraintUsage = ReadIntPtr(pIndex, offset); offset += IntPtr.Size; | | | | | 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 | offset += IntPtr.Size; IntPtr pConstraintUsage = ReadIntPtr(pIndex, offset); offset += IntPtr.Size; index.Outputs.IndexNumber = ReadInt32(pIndex, offset); offset += sizeof(int); index.Outputs.IndexString = StringFromUtf8IntPtr(IntPtrForOffset( pIndex, offset)); offset += IntPtr.Size; index.Outputs.NeedToFreeIndexString = ReadInt32(pIndex, offset); offset += sizeof(int); index.Outputs.OrderByConsumed = ReadInt32(pIndex, offset); offset += sizeof(int); |
︙ | ︙ | |||
1416 1417 1418 1419 1420 1421 1422 | IntPtr pConstraint = ReadIntPtr(pIndex, offset); offset += IntPtr.Size; int nOrderBy = ReadInt32(pIndex, offset); | < < | 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 | IntPtr pConstraint = ReadIntPtr(pIndex, offset); offset += IntPtr.Size; int nOrderBy = ReadInt32(pIndex, offset); offset += sizeof(int); IntPtr pOrderBy = ReadIntPtr(pIndex, offset); offset += IntPtr.Size; IntPtr pConstraintUsage = ReadIntPtr(pIndex, offset); |
︙ | ︙ | |||
1484 1485 1486 1487 1488 1489 1490 1491 | #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteModuleBase Class public abstract class SQLiteModuleBase : | > | > > > > > > > > | 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 | #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteModuleBase Class /* NOT SEALED */ public abstract class SQLiteModuleBase : ISQLiteManagedModule, ISQLiteNativeModule, IDisposable { #region Private Constants private const double DefaultCost = double.MaxValue; #endregion /////////////////////////////////////////////////////////////////////// #region Private Data private UnsafeNativeMethods.sqlite3_module nativeModule; private Dictionary<IntPtr, SQLiteVirtualTable> tables; private Dictionary<IntPtr, SQLiteVirtualTableCursor> cursors; #endregion /////////////////////////////////////////////////////////////////////// #region Internal Methods internal UnsafeNativeMethods.sqlite3_module GetNativeModule() { |
︙ | ︙ | |||
1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 | #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteModuleBase(string name) { this.name = name; } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Members protected virtual IntPtr AllocateTable() { int size = Marshal.SizeOf(typeof( UnsafeNativeMethods.sqlite3_vtab)); return SQLiteMarshal.Allocate(size); } /////////////////////////////////////////////////////////////////////// protected virtual void FreeTable(IntPtr pVtab) { SQLiteMarshal.Free(pVtab); } /////////////////////////////////////////////////////////////////////// protected virtual IntPtr AllocateCursor() { int size = Marshal.SizeOf(typeof( UnsafeNativeMethods.sqlite3_vtab_cursor)); return SQLiteMarshal.Allocate(size); } /////////////////////////////////////////////////////////////////////// | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | > | | > > | > > > > > > | | | | | | > > > > | | | | > < < < < | < < | 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 | #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteModuleBase(string name) { if (name == null) throw new ArgumentNullException("name"); this.name = name; this.tables = new Dictionary<IntPtr, SQLiteVirtualTable>(); this.cursors = new Dictionary<IntPtr, SQLiteVirtualTableCursor>(); } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Members #region Native Table Helper Methods protected virtual IntPtr AllocateTable() { int size = Marshal.SizeOf(typeof( UnsafeNativeMethods.sqlite3_vtab)); return SQLiteMarshal.Allocate(size); } /////////////////////////////////////////////////////////////////////// protected virtual void ZeroTable(IntPtr pVtab) { if (pVtab == IntPtr.Zero) return; int offset = 0; SQLiteMarshal.WriteIntPtr(pVtab, offset, IntPtr.Zero); offset += IntPtr.Size; SQLiteMarshal.WriteInt32(pVtab, offset, 0); offset += sizeof(int); SQLiteMarshal.WriteIntPtr(pVtab, offset, IntPtr.Zero); } /////////////////////////////////////////////////////////////////////// protected virtual void FreeTable(IntPtr pVtab) { SQLiteMarshal.Free(pVtab); } #endregion /////////////////////////////////////////////////////////////////////// #region Native Cursor Helper Methods protected virtual IntPtr AllocateCursor() { int size = Marshal.SizeOf(typeof( UnsafeNativeMethods.sqlite3_vtab_cursor)); return SQLiteMarshal.Allocate(size); } /////////////////////////////////////////////////////////////////////// protected virtual void FreeCursor(IntPtr pCursor) { SQLiteMarshal.Free(pCursor); } #endregion /////////////////////////////////////////////////////////////////////// #region Table Lookup Methods protected virtual IntPtr TableFromCursor( IntPtr pCursor ) { if (pCursor == IntPtr.Zero) return IntPtr.Zero; return Marshal.ReadIntPtr(pCursor); } /////////////////////////////////////////////////////////////////////// protected virtual SQLiteVirtualTable TableFromIntPtr( IntPtr pVtab ) { if (pVtab == IntPtr.Zero) { SetTableError(pVtab, "invalid native table"); return null; } SQLiteVirtualTable table; if ((tables != null) && tables.TryGetValue(pVtab, out table)) { return table; } SetTableError(pVtab, String.Format( "managed table for {0} not found", pVtab)); return null; } /////////////////////////////////////////////////////////////////////// protected virtual IntPtr TableToIntPtr( SQLiteVirtualTable table ) { if ((table == null) || (tables == null)) return IntPtr.Zero; IntPtr pVtab = IntPtr.Zero; bool success = false; try { pVtab = AllocateTable(); if (pVtab != IntPtr.Zero) { ZeroTable(pVtab); table.NativeHandle = pVtab; tables.Add(pVtab, table); success = true; } } finally { if (!success && (pVtab != IntPtr.Zero)) { FreeTable(pVtab); pVtab = IntPtr.Zero; } } return pVtab; } #endregion /////////////////////////////////////////////////////////////////////// #region Cursor Lookup Methods protected virtual SQLiteVirtualTableCursor CursorFromIntPtr( IntPtr pVtab, IntPtr pCursor ) { if (pCursor == IntPtr.Zero) { SetTableError(pVtab, "invalid native cursor"); return null; } SQLiteVirtualTableCursor cursor; if ((cursors != null) && cursors.TryGetValue(pCursor, out cursor)) { return cursor; } SetTableError(pVtab, String.Format( "managed cursor for {0} not found", pCursor)); return null; } /////////////////////////////////////////////////////////////////////// protected virtual IntPtr CursorToIntPtr( SQLiteVirtualTableCursor cursor ) { if ((cursor == null) || (cursors == null)) return IntPtr.Zero; IntPtr pCursor = IntPtr.Zero; bool success = false; try { pCursor = AllocateCursor(); if (pCursor != IntPtr.Zero) { cursor.NativeHandle = pCursor; cursors.Add(pCursor, cursor); success = true; } } finally { if (!success && (pCursor != IntPtr.Zero)) { FreeCursor(pCursor); pCursor = IntPtr.Zero; } } return pCursor; } #endregion /////////////////////////////////////////////////////////////////////// #region Table Declaration Helper Methods protected virtual SQLiteErrorCode DeclareTable( SQLiteConnection connection, string sql, ref string error ) { if (connection == null) |
︙ | ︙ | |||
1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 | { error = "connection has invalid handle"; return SQLiteErrorCode.Error; } return sqliteBase.DeclareVirtualTable(this, sql, ref error); } /////////////////////////////////////////////////////////////////////// protected virtual bool SetTableError( IntPtr pVtab, string error ) { if (pVtab == IntPtr.Zero) return false; | > > | < < > > > > > | > > > > > > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 | { error = "connection has invalid handle"; return SQLiteErrorCode.Error; } return sqliteBase.DeclareVirtualTable(this, sql, ref error); } #endregion /////////////////////////////////////////////////////////////////////// #region Error Handling Helper Methods protected virtual bool SetTableError( IntPtr pVtab, string error ) { if (pVtab == IntPtr.Zero) return false; int offset = IntPtr.Size + sizeof(int); IntPtr pError = SQLiteMarshal.ReadIntPtr(pVtab, offset); if (pError != IntPtr.Zero) { SQLiteMarshal.Free(pError); pError = IntPtr.Zero; SQLiteMarshal.WriteIntPtr(pVtab, offset, pError); } bool success = false; try { pError = SQLiteMarshal.Utf8IntPtrFromString(error); SQLiteMarshal.WriteIntPtr(pVtab, offset, pError); success = true; } finally { if (!success && (pError != IntPtr.Zero)) { SQLiteMarshal.Free(pError); pError = IntPtr.Zero; } } return success; } /////////////////////////////////////////////////////////////////////// protected virtual bool SetCursorError( SQLiteVirtualTableCursor cursor, string error ) { if (cursor == null) return false; IntPtr pCursor = cursor.NativeHandle; if (pCursor == IntPtr.Zero) return false; IntPtr pVtab = TableFromCursor(pCursor); if (pVtab == IntPtr.Zero) return false; return SetTableError(pVtab, error); } #endregion /////////////////////////////////////////////////////////////////////// #region Index Handling Helper Methods protected virtual bool SetDefaultEstimatedCost( SQLiteIndex index ) { if ((index == null) || (index.Outputs == null)) return false; index.Outputs.EstimatedCost = DefaultCost; return true; } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteNativeModule Members public SQLiteErrorCode xCreate( IntPtr pDb, |
︙ | ︙ | |||
1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 | { string fileName = SQLiteMarshal.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { string error = null; if (Create(connection, pAux, SQLiteMarshal.StringArrayFromUtf8IntPtrArray(argv), | > | > > | | > > > > > > | 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 | { string fileName = SQLiteMarshal.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { SQLiteVirtualTable table = null; string error = null; if (Create(connection, pAux, SQLiteMarshal.StringArrayFromUtf8IntPtrArray(argv), ref table, ref error) == SQLiteErrorCode.Ok) { if (table != null) { pVtab = TableToIntPtr(table); return SQLiteErrorCode.Ok; } else { pError = SQLiteMarshal.Utf8IntPtrFromString( "no table was created"); } } else { pError = SQLiteMarshal.Utf8IntPtrFromString(error); } } } |
︙ | ︙ | |||
1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 | { string fileName = SQLiteMarshal.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { string error = null; if (Connect(connection, pAux, SQLiteMarshal.StringArrayFromUtf8IntPtrArray(argv), | > | > > | | > > > > > > | 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 | { string fileName = SQLiteMarshal.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { SQLiteVirtualTable table = null; string error = null; if (Connect(connection, pAux, SQLiteMarshal.StringArrayFromUtf8IntPtrArray(argv), ref table, ref error) == SQLiteErrorCode.Ok) { if (table != null) { pVtab = TableToIntPtr(table); return SQLiteErrorCode.Ok; } else { pError = SQLiteMarshal.Utf8IntPtrFromString( "no table was created"); } } else { pError = SQLiteMarshal.Utf8IntPtrFromString(error); } } } |
︙ | ︙ | |||
1784 1785 1786 1787 1788 1789 1790 | public SQLiteErrorCode xBestIndex( IntPtr pVtab, IntPtr pIndex ) { try { | > > > > | | | | | | > > > > > | > > > > | > > | 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 | public SQLiteErrorCode xBestIndex( IntPtr pVtab, IntPtr pIndex ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { SQLiteIndex index = null; SQLiteMarshal.IndexFromIntPtr(pIndex, ref index); if (BestIndex(table, index) == SQLiteErrorCode.Ok) { SQLiteMarshal.IndexToIntPtr(index, pIndex); return SQLiteErrorCode.Ok; } } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xDisconnect( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { if (Disconnect(table) == SQLiteErrorCode.Ok) { if (tables != null) tables.Remove(pVtab); return SQLiteErrorCode.Ok; } } } catch (Exception e) /* NOTE: Must catch ALL. */ { // // NOTE: At this point, there is no way to report the error // condition back to the caller; therefore, use the // logging facility instead. |
︙ | ︙ | |||
1848 1849 1850 1851 1852 1853 1854 | public SQLiteErrorCode xDestroy( IntPtr pVtab ) { try { | > > > > | > > > > | > > | 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 | public SQLiteErrorCode xDestroy( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { if (Destroy(table) == SQLiteErrorCode.Ok) { if (tables != null) tables.Remove(pVtab); return SQLiteErrorCode.Ok; } } } catch (Exception e) /* NOTE: Must catch ALL. */ { // // NOTE: At this point, there is no way to report the error // condition back to the caller; therefore, use the // logging facility instead. |
︙ | ︙ | |||
1887 1888 1889 1890 1891 1892 1893 | public SQLiteErrorCode xOpen( IntPtr pVtab, ref IntPtr pCursor ) { try { | > > > > | | | | | | > > > | | | | | > > > > > > > > < < < < | | | > > | > > > > | > > | 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 | public SQLiteErrorCode xOpen( IntPtr pVtab, ref IntPtr pCursor ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { SQLiteVirtualTableCursor cursor = null; if (Open(table, ref cursor) == SQLiteErrorCode.Ok) { if (cursor != null) { pCursor = CursorToIntPtr(cursor); if (pCursor != IntPtr.Zero) { return SQLiteErrorCode.Ok; } else { SetTableError(pVtab, "no native cursor was created"); } } else { SetTableError(pVtab, "no managed cursor was created"); } } } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xClose( IntPtr pCursor ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { if (Close(cursor) == SQLiteErrorCode.Ok) { if (cursors != null) cursors.Remove(pCursor); return SQLiteErrorCode.Ok; } } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } finally { |
︙ | ︙ | |||
1958 1959 1960 1961 1962 1963 1964 | IntPtr[] argv ) { IntPtr pVtab = IntPtr.Zero; try { | | | | > > | | | > | | > | | | > > | | > | | | > | | 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 | IntPtr[] argv ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { if (Filter(cursor, idxNum, SQLiteMarshal.StringFromUtf8IntPtr(idxStr), SQLiteMarshal.ValueArrayFromIntPtrArray( argv)) == SQLiteErrorCode.Ok) { return SQLiteErrorCode.Ok; } } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xNext( IntPtr pCursor ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { if (Next(cursor) == SQLiteErrorCode.Ok) return SQLiteErrorCode.Ok; } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public int xEof( IntPtr pCursor ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) return Eof(cursor) ? 1 : 0; } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return 1; |
︙ | ︙ | |||
2041 2042 2043 2044 2045 2046 2047 | int index ) { IntPtr pVtab = IntPtr.Zero; try { | | | | > > | | > | | | > | > > > > > | | | > > > > | > > > | > > > | > > > | | 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 | int index ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { SQLiteContext context = new SQLiteContext(pContext); return Column(cursor, context, index); } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xRowId( IntPtr pCursor, ref long rowId ) { IntPtr pVtab = IntPtr.Zero; try { pVtab = TableFromCursor(pCursor); SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) return RowId(cursor, ref rowId); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xUpdate( IntPtr pVtab, int nData, IntPtr apData, ref long rowId ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { SQLiteValue[] values = SQLiteMarshal.ValueArrayFromSizeAndIntPtr( nData, apData); return Update(table, values, ref rowId); } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xBegin( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Begin(table); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xSync( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Sync(table); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xCommit( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Commit(table); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xRollback( IntPtr pVtab ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Rollback(table); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; |
︙ | ︙ | |||
2192 2193 2194 2195 2196 2197 2198 | IntPtr zName, ref SQLiteCallback callback, ref IntPtr pClientData ) { try { | > > > > | | > | | | | | | | | | | | > > > > > > | > > > > | > > > | > > > | | 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 | IntPtr zName, ref SQLiteCallback callback, ref IntPtr pClientData ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { SQLiteFunction function = null; if (FindFunction( table, nArg, SQLiteMarshal.StringFromUtf8IntPtr(zName), ref function, ref pClientData)) { if (function != null) { callback = function.ScalarCallback; return 1; } else { SetTableError(pVtab, "no function was created"); } } } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return 0; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xRename( IntPtr pVtab, IntPtr zNew ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { return Rename(table, SQLiteMarshal.StringFromUtf8IntPtr(zNew)); } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xSavepoint( IntPtr pVtab, int iSavepoint ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Savepoint(table, iSavepoint); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xRelease( IntPtr pVtab, int iSavepoint ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return Release(table, iSavepoint); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xRollbackTo( IntPtr pVtab, int iSavepoint ) { try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) return RollbackTo(table, iSavepoint); } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } return SQLiteErrorCode.Error; |
︙ | ︙ | |||
2317 2318 2319 2320 2321 2322 2323 | } /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, | | > | > > | > > | > > > | | | 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 | } /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Connect( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode BestIndex( SQLiteVirtualTable table, SQLiteIndex index ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Disconnect( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Destroy( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Open( SQLiteVirtualTable table, ref SQLiteVirtualTableCursor cursor ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Close( SQLiteVirtualTableCursor cursor ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Filter( SQLiteVirtualTableCursor cursor, int indexNumber, string indexString, SQLiteValue[] values ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Next( SQLiteVirtualTableCursor cursor |
︙ | ︙ | |||
2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 | SQLiteVirtualTableCursor cursor, ref long rowId ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Update( SQLiteValue[] values, ref long rowId ); /////////////////////////////////////////////////////////////////////// | > | > > > > > > > > | > > | | < | < > | | > | > | > | > | | 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 | SQLiteVirtualTableCursor cursor, ref long rowId ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Update( SQLiteVirtualTable table, SQLiteValue[] values, ref long rowId ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Begin( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Sync( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Commit( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Rollback( SQLiteVirtualTable table ); /////////////////////////////////////////////////////////////////////// public abstract bool FindFunction( SQLiteVirtualTable table, int argumentCount, string name, ref SQLiteFunction function, ref IntPtr pClientData ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Rename( SQLiteVirtualTable table, string newName ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Savepoint( SQLiteVirtualTable table, int savepoint ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode Release( SQLiteVirtualTable table, int savepoint ); /////////////////////////////////////////////////////////////////////// public abstract SQLiteErrorCode RollbackTo( SQLiteVirtualTable table, int savepoint ); #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable Members public void Dispose() |
︙ | ︙ |
Added System.Data.SQLite/SQLiteModuleEnumerable.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 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | /******************************************************** * 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.Collections; namespace System.Data.SQLite { #region SQLiteVirtualTableCursorEnumerable Class /* NOT SEALED */ public class SQLiteVirtualTableCursorEnumerable : SQLiteVirtualTableCursor { #region Private Data private IEnumerator enumerator; private bool endOfEnumerator; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteVirtualTableCursorEnumerable( SQLiteVirtualTable table, IEnumerator enumerator ) : base(table) { this.enumerator = enumerator; this.endOfEnumerator = true; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Members public virtual bool MoveNext() { if (enumerator == null) return false; endOfEnumerator = !enumerator.MoveNext(); return !endOfEnumerator; } /////////////////////////////////////////////////////////////////////// public virtual object Current { get { if (enumerator == null) return null; return enumerator.Current; } } /////////////////////////////////////////////////////////////////////// public virtual void Reset() { if (enumerator == null) return; enumerator.Reset(); } /////////////////////////////////////////////////////////////////////// public virtual bool EndOfEnumerator { get { return endOfEnumerator; } } /////////////////////////////////////////////////////////////////////// public virtual void Close() { if (enumerator != null) enumerator = null; } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteModuleEnumerable Class /* NOT SEALED */ public class SQLiteModuleEnumerable : SQLiteModuleNoop { #region Private Constants private static readonly string declareSql = String.Format( "CREATE TABLE {0}(x);", typeof(SQLiteModuleEnumerable).Name); #endregion /////////////////////////////////////////////////////////////////////// #region Private Data /// <summary> /// The <see cref="IEnumerable" /> instance containing the backing data /// for the virtual table. /// </summary> private IEnumerable collection; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteModuleEnumerable( string name, IEnumerable collection ) : base(name) { if (collection == null) throw new ArgumentNullException("collection"); this.collection = collection; } #endregion /////////////////////////////////////////////////////////////////////// #region Protected Methods protected virtual SQLiteErrorCode CursorTypeMismatchError( SQLiteVirtualTableCursor cursor ) { SetCursorError(cursor, "not an \"enumerable\" cursor"); return SQLiteErrorCode.Error; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteManagedModule Members public override SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ) { CheckDisposed(); if (DeclareTable( connection, declareSql, ref error) == SQLiteErrorCode.Ok) { table = new SQLiteVirtualTable(arguments); return SQLiteErrorCode.Ok; } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Connect( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ) { CheckDisposed(); if (DeclareTable( connection, declareSql, ref error) == SQLiteErrorCode.Ok) { table = new SQLiteVirtualTable(arguments); return SQLiteErrorCode.Ok; } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode BestIndex( SQLiteVirtualTable table, SQLiteIndex index ) { CheckDisposed(); if (!SetDefaultEstimatedCost(index)) { SetTableError(table.NativeHandle, "failed to set default estimated cost"); return SQLiteErrorCode.Error; } return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Disconnect( SQLiteVirtualTable table ) { CheckDisposed(); table.Dispose(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Destroy( SQLiteVirtualTable table ) { CheckDisposed(); table.Dispose(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Open( SQLiteVirtualTable table, ref SQLiteVirtualTableCursor cursor ) { CheckDisposed(); cursor = new SQLiteVirtualTableCursorEnumerable( table, collection.GetEnumerator()); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Close( SQLiteVirtualTableCursor cursor ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) return CursorTypeMismatchError(cursor); enumerableCursor.Close(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Filter( SQLiteVirtualTableCursor cursor, int indexNumber, string indexString, SQLiteValue[] values ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) return CursorTypeMismatchError(cursor); enumerableCursor.Filter(indexNumber, indexString, values); enumerableCursor.Reset(); /* NO RESULT */ enumerableCursor.MoveNext(); /* IGNORED */ return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Next( SQLiteVirtualTableCursor cursor ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) return CursorTypeMismatchError(cursor); enumerableCursor.MoveNext(); /* IGNORED */ return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override bool Eof( SQLiteVirtualTableCursor cursor ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) { CursorTypeMismatchError(cursor); return true; } return enumerableCursor.EndOfEnumerator; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Column( SQLiteVirtualTableCursor cursor, SQLiteContext context, int index ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) return CursorTypeMismatchError(cursor); if (enumerableCursor.EndOfEnumerator) { context.SetNull(); return SQLiteErrorCode.Ok; } object current = enumerableCursor.Current; context.SetString((current != null) ? current.ToString() : null); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode RowId( SQLiteVirtualTableCursor cursor, ref long rowId ) { CheckDisposed(); SQLiteVirtualTableCursorEnumerable enumerableCursor = cursor as SQLiteVirtualTableCursorEnumerable; if (enumerableCursor == null) return CursorTypeMismatchError(cursor); if (enumerableCursor.EndOfEnumerator) { SetCursorError(cursor, "already hit end of enumerable cursor"); return SQLiteErrorCode.Error; } object current = enumerableCursor.Current; rowId = (current != null) ? current.GetHashCode() : 0; return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Update( SQLiteVirtualTable table, SQLiteValue[] values, ref long rowId ) { CheckDisposed(); SetTableError(table.NativeHandle, String.Format( "virtual table \"{0}\" is read-only", table.TableName)); return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Rename( SQLiteVirtualTable table, string newName ) { CheckDisposed(); if (!table.Rename(newName)) { SetTableError(table.NativeHandle, String.Format( "failed to rename virtual table \"{0}\" to \"{1}\"", table.TableName, newName)); return SQLiteErrorCode.Error; } return SQLiteErrorCode.Ok; } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) throw new ObjectDisposedException(typeof(SQLiteModuleNoop).Name); #endif } /////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) //{ // //////////////////////////////////// // // dispose managed resources here... // //////////////////////////////////// //} ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// disposed = true; } } finally { base.Dispose(disposing); } } #endregion } #endregion } |
Changes to System.Data.SQLite/SQLiteModuleNoop.cs.
︙ | ︙ | |||
21 22 23 24 25 26 27 | /////////////////////////////////////////////////////////////////////// #region ISQLiteManagedModule Members public override SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, | | > | > > | > > | > > > | 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 | /////////////////////////////////////////////////////////////////////// #region ISQLiteManagedModule Members public override SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Connect( SQLiteConnection connection, IntPtr pClientData, string[] arguments, ref SQLiteVirtualTable table, ref string error ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode BestIndex( SQLiteVirtualTable table, SQLiteIndex index ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Disconnect( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Destroy( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Open( SQLiteVirtualTable table, ref SQLiteVirtualTableCursor cursor ) { CheckDisposed(); return SQLiteErrorCode.Ok; } |
︙ | ︙ | |||
99 100 101 102 103 104 105 | return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Filter( SQLiteVirtualTableCursor cursor, | | | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Filter( SQLiteVirtualTableCursor cursor, int indexNumber, string indexString, SQLiteValue[] values ) { CheckDisposed(); return SQLiteErrorCode.Ok; } |
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Update( SQLiteValue[] values, ref long rowId ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// | > | > > > > > > > > > > > > > | > > | < < | < < | < < < > | | > | > | > | > | > | > > | 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 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Update( SQLiteVirtualTable table, SQLiteValue[] values, ref long rowId ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Begin( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Sync( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Commit( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Rollback( SQLiteVirtualTable table ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override bool FindFunction( SQLiteVirtualTable table, int argumentCount, string name, ref SQLiteFunction function, ref IntPtr pClientData ) { CheckDisposed(); return false; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Rename( SQLiteVirtualTable table, string newName ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Savepoint( SQLiteVirtualTable table, int savepoint ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Release( SQLiteVirtualTable table, int savepoint ) { CheckDisposed(); return SQLiteErrorCode.Ok; } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode RollbackTo( SQLiteVirtualTable table, int savepoint ) { CheckDisposed(); return SQLiteErrorCode.Ok; } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { throw new ObjectDisposedException(typeof( SQLiteModuleNoop).Name); } #endif } /////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { |
︙ | ︙ |
Changes to System.Data.SQLite/System.Data.SQLite.Files.targets.
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 | <Compile Include="SQLiteFactory.cs" /> <Compile Include="SQLiteFunction.cs" /> <Compile Include="SQLiteFunctionAttribute.cs" /> <Compile Include="SQLiteKeyReader.cs" /> <Compile Include="SQLiteLog.cs" /> <Compile Include="SQLiteMetaDataCollectionNames.cs" /> <Compile Include="SQLiteModuleBase.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> <Compile Include="SQLiteParameter.cs" /> <Compile Include="SQLiteParameterCollection.cs" /> <Compile Include="SQLiteStatement.cs" /> <Compile Include="SQLiteTransaction.cs" /> <Compile Include="SR.Designer.cs"> <DependentUpon>SR.resx</DependentUpon> | > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | <Compile Include="SQLiteFactory.cs" /> <Compile Include="SQLiteFunction.cs" /> <Compile Include="SQLiteFunctionAttribute.cs" /> <Compile Include="SQLiteKeyReader.cs" /> <Compile Include="SQLiteLog.cs" /> <Compile Include="SQLiteMetaDataCollectionNames.cs" /> <Compile Include="SQLiteModuleBase.cs" /> <Compile Include="SQLiteModuleEnumerable.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> <Compile Include="SQLiteParameter.cs" /> <Compile Include="SQLiteParameterCollection.cs" /> <Compile Include="SQLiteStatement.cs" /> <Compile Include="SQLiteTransaction.cs" /> <Compile Include="SR.Designer.cs"> <DependentUpon>SR.resx</DependentUpon> |
︙ | ︙ |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
︙ | ︙ | |||
1920 1921 1922 1923 1924 1925 1926 | } /////////////////////////////////////////////////////////////////////////// [StructLayout(LayoutKind.Sequential)] internal struct sqlite3_vtab { | | | | 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 | } /////////////////////////////////////////////////////////////////////////// [StructLayout(LayoutKind.Sequential)] internal struct sqlite3_vtab { public IntPtr pModule; public int nRef; /* NO LONGER USED */ public IntPtr zErrMsg; } /////////////////////////////////////////////////////////////////////////// [StructLayout(LayoutKind.Sequential)] internal struct sqlite3_vtab_cursor { public IntPtr pVTab; } /////////////////////////////////////////////////////////////////////////// [StructLayout(LayoutKind.Sequential)] internal struct sqlite3_index_constraint { |
︙ | ︙ |
Changes to Tests/vtab.eagle.
︙ | ︙ | |||
23 24 25 26 27 28 29 | runTest {test vtab-1.1 {virtual table support} -setup { setupDb [set fileName vtab-1.1.db] } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName] set sql { \ | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | runTest {test vtab-1.1 {virtual table support} -setup { setupDb [set fileName vtab-1.1.db] } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName] set sql { \ CREATE VIRTUAL TABLE t${id} USING mod${id}; \ } unset -nocomplain results errors set code [compileCSharpWith [subst { using System; using System.Data.SQLite; |
︙ | ︙ | |||
47 48 49 50 51 52 53 | } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, | | > > | | | 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 | } /////////////////////////////////////////////////////////////////////// public override SQLiteErrorCode Create( SQLiteConnection connection, IntPtr pClientData, string\[\] arguments, ref SQLiteVirtualTable table, ref string error ) { SQLiteErrorCode rc = DeclareTable( connection, "CREATE TABLE ignored(x);", ref error); if (rc != SQLiteErrorCode.Ok) return rc; table = new SQLiteVirtualTable(arguments); return SQLiteErrorCode.Ok; } } ///////////////////////////////////////////////////////////////////////// public static class Test${id} { public static void Main() { using (SQLiteConnection connection = new SQLiteConnection( "Data Source=${dataSource};")) { connection.Open(); connection.CreateModule(new SQLiteModuleTest${id}("mod${id}")); using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql}]"; command.ExecuteNonQuery(); } |
︙ | ︙ | |||
95 96 97 98 99 100 101 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id db fileName | > | > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | 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 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } 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 \{\}$}} ############################################################################### runTest {test vtab-1.2 {IEnumerable virtual table} -setup { setupDb [set fileName vtab-1.2.db] } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName] set sql(1) { \ CREATE VIRTUAL TABLE t${id} USING mod${id}; \ } set sql(2) { \ SELECT * FROM t${id}; \ } set sql(3) { \ UPDATE t${id} SET x = 1; \ } 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};")) { connection.Open(); connection.CreateModule(new SQLiteModuleEnumerable( "mod${id}", strings)); using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(1)}]"; command.ExecuteNonQuery(); } using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(2)}]"; using (SQLiteDataReader dataReader = command.ExecuteReader()) { while (dataReader.Read()) result.Add(dataReader\[0\].ToString()); } } using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(3)}]"; try { command.ExecuteNonQuery(); } catch (SQLiteException e) { result.Add(e.ReturnCode.ToString()); result.Add(e.Message); } } connection.Close(); } return result; } /////////////////////////////////////////////////////////////////////// public static void Main() { // do nothing. } } } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } 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 [string map [list \n \r\n] {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{one two three 4 5.0 Error\ \{SQL logic error or missing database SQL logic error or missing database\}\}$}]} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |