Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Make the SQLiteModuleEnumerable.GetRowIdFromObject method return unique values within the context of the current cursor. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a3c636157eb08fbb77e96f3772be5810 |
User & Date: | mistachkin 2013-07-17 20:43:16.893 |
Context
2013-07-17
| ||
20:48 | Fix typo in comment. check-in: 670ca52ab6 user: mistachkin tags: trunk | |
20:43 | Make the SQLiteModuleEnumerable.GetRowIdFromObject method return unique values within the context of the current cursor. check-in: a3c636157e user: mistachkin tags: trunk | |
18:28 | Add cursor parameter to the protected GetStringFromObject and GetRowIdFromObject methods of the SQLiteModuleEnumerable class. check-in: d7a3a148c5 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteModule.cs.
︙ | ︙ | |||
1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 | /// This class represents a managed virtual table cursor implementation. /// It is not sealed and should be used as the base class for any /// user-defined virtual table cursor classes implemented in managed code. /// </summary> public class SQLiteVirtualTableCursor : ISQLiteNativeHandle, IDisposable /* NOT SEALED */ { #region Public Constructors /// <summary> /// Constructs an instance of this class. /// </summary> /// <param name="table"> /// The <see cref="SQLiteVirtualTable" /> object instance associated /// with this object instance. /// </param> public SQLiteVirtualTableCursor( SQLiteVirtualTable table ) { this.table = table; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Properties private SQLiteVirtualTable table; /// <summary> /// The <see cref="SQLiteVirtualTable" /> object instance associated | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 | /// This class represents a managed virtual table cursor implementation. /// It is not sealed and should be used as the base class for any /// user-defined virtual table cursor classes implemented in managed code. /// </summary> public class SQLiteVirtualTableCursor : ISQLiteNativeHandle, IDisposable /* NOT SEALED */ { #region Protected Constants /// <summary> /// This value represents an invalid integer row sequence number. /// </summary> protected static readonly int InvalidRowIndex = 0; #endregion /////////////////////////////////////////////////////////////////////// #region Private Data /// <summary> /// The field holds the integer row sequence number for the current row /// pointed to by this cursor object instance. /// </summary> private int rowIndex; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors /// <summary> /// Constructs an instance of this class. /// </summary> /// <param name="table"> /// The <see cref="SQLiteVirtualTable" /> object instance associated /// with this object instance. /// </param> public SQLiteVirtualTableCursor( SQLiteVirtualTable table ) : this() { this.table = table; } #endregion /////////////////////////////////////////////////////////////////////// #region Private Constructors /// <summary> /// Constructs an instance of this class. /// </summary> private SQLiteVirtualTableCursor() { rowIndex = InvalidRowIndex; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Properties private SQLiteVirtualTable table; /// <summary> /// The <see cref="SQLiteVirtualTable" /> object instance associated |
︙ | ︙ | |||
1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 | "failed to persist one or more values"); } this.indexNumber = indexNumber; this.indexString = indexString; this.values = values; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteNativeHandle Members private IntPtr nativeHandle; /// <summary> | > > > > > > > > > > > > > > > > > > > > > > > > > | 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 | "failed to persist one or more values"); } this.indexNumber = indexNumber; this.indexString = indexString; this.values = values; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Determines the integer row sequence number for the current row. /// </summary> /// <returns> /// The integer row sequence number for the current row -OR- zero if /// it cannot be determined. /// </returns> public virtual int GetRowIndex() { return rowIndex; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Arranges for the integer row sequence number to be adjusted so that /// it refers to the next row. /// </summary> public virtual void NextRowIndex() { rowIndex++; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteNativeHandle Members private IntPtr nativeHandle; /// <summary> |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModuleEnumerable.cs.
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 | CheckDisposed(); CheckClosed(); if (enumerator == null) return false; endOfEnumerator = !enumerator.MoveNext(); return !endOfEnumerator; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Returns the value for the current row of the virtual table cursor | > > > > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | CheckDisposed(); CheckClosed(); if (enumerator == null) return false; endOfEnumerator = !enumerator.MoveNext(); if (!endOfEnumerator) NextRowIndex(); return !endOfEnumerator; } /////////////////////////////////////////////////////////////////////// /// <summary> /// Returns the value for the current row of the virtual table cursor |
︙ | ︙ | |||
428 429 430 431 432 433 434 | return value.ToString(); } /////////////////////////////////////////////////////////////////////// /// <summary> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | | | | > > | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | 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 for the enumerator 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 enumerator 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 ) { if ((cursor != null) && (value != null)) return MakeRowId(cursor.GetRowIndex(), value.GetHashCode()); else if (cursor != null) return cursor.GetRowIndex(); else if (value != null) return value.GetHashCode(); else return 0; } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteManagedModule Members /// <summary> |
︙ | ︙ |
Changes to Tests/vtab.eagle.
︙ | ︙ | |||
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 | unset -nocomplain result code results errors sql dataSource id fileName } -time true -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -match regexp -result \ [string map [list \n \r\n] {^Ok System#CodeDom#Compiler#CompilerResults#\d+\ \{\} 0 (?:-)?\d+$}]} ############################################################################### runSQLiteTestEpilogue runTestEpilogue | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 | unset -nocomplain result code results errors sql dataSource id fileName } -time true -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -match regexp -result \ [string map [list \n \r\n] {^Ok System#CodeDom#Compiler#CompilerResults#\d+\ \{\} 0 (?:-)?\d+$}]} ############################################################################### runTest {test vtab-1.10 {virtual table xRowId uniqueness} -setup { set fileName vtab-1.10.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 CASE WHEN 0 THEN rowId ELSE rowId END, \ CASE WHEN 1 THEN rowId ELSE rowId END FROM t${id}; \ } 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)}]"; result.Add(command.ExecuteNonQuery().ToString()); } using (SQLiteCommand command = connection.CreateCommand()) { command.CommandText = "[subst ${sql(2)}]"; using (SQLiteDataReader dataReader = command.ExecuteReader()) { // // NOTE: Mask off the hash code portion because it differs // between framework versions. // long mask = unchecked((long)0xFFFFFFFF00000000); while (dataReader.Read()) { result.Add((dataReader.GetInt64(0) & mask).ToString()); result.Add((dataReader.GetInt64(1) & mask).ToString()); } } } 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 one two one two two } result] : [set result ""]}] $result } -cleanup { 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} -match regexp -result \ [string map [list \n \r\n] {^Ok System#CodeDom#Compiler#CompilerResults#\d+\ \{\} 0 \{0 4294967296 4294967296 8589934592 8589934592 12884901888 12884901888\ 17179869184 17179869184 21474836480 21474836480 25769803776 25769803776\}$}]} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |