Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More spacing cleanup. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sessions |
| Files: | files | file ages | folders |
| SHA1: |
812f16fdb88a4495fdda71a4b15c5a50 |
| User & Date: | mistachkin 2017-10-06 20:07:47.899 |
Context
|
2017-10-06
| ||
| 20:53 | Further refinements to IDisposable handling. check-in: cc900bbb35 user: mistachkin tags: sessions | |
| 20:07 | More spacing cleanup. check-in: 812f16fdb8 user: mistachkin tags: sessions | |
| 20:03 | Cleanup regions. check-in: 31aaba7c78 user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteSession.cs.
| ︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 |
{
CheckDisposed();
CheckRawData();
if (conflictCallback == null)
throw new ArgumentNullException("conflictCallback");
UnsafeNativeMethods.xSessionFilter xFilter = null;
if (tableFilterCallback != null)
{
xFilter = new UnsafeNativeMethods.xSessionFilter(
delegate(IntPtr context, byte[] tblName)
{
| > > > | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 |
{
CheckDisposed();
CheckRawData();
if (conflictCallback == null)
throw new ArgumentNullException("conflictCallback");
///////////////////////////////////////////////////////////////////
#region Native Callback Methods
UnsafeNativeMethods.xSessionFilter xFilter = null;
if (tableFilterCallback != null)
{
xFilter = new UnsafeNativeMethods.xSessionFilter(
delegate(IntPtr context, byte[] tblName)
{
|
| ︙ | ︙ | |||
1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 |
}
}
return 0;
});
}
UnsafeNativeMethods.xSessionConflict xConflict;
xConflict = new UnsafeNativeMethods.xSessionConflict(
delegate(IntPtr context,
SQLiteChangeSetConflictType type,
IntPtr iterator)
{
| > > | 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 |
}
}
return 0;
});
}
///////////////////////////////////////////////////////////////////
UnsafeNativeMethods.xSessionConflict xConflict;
xConflict = new UnsafeNativeMethods.xSessionConflict(
delegate(IntPtr context,
SQLiteChangeSetConflictType type,
IntPtr iterator)
{
|
| ︙ | ︙ | |||
1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 |
{
// do nothing.
}
}
return SQLiteChangeSetConflictResult.Abort;
});
IntPtr pData = IntPtr.Zero;
try
{
int nData = 0;
| > > > | 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 |
{
// do nothing.
}
}
return SQLiteChangeSetConflictResult.Abort;
});
#endregion
///////////////////////////////////////////////////////////////////
IntPtr pData = IntPtr.Zero;
try
{
int nData = 0;
|
| ︙ | ︙ | |||
1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 |
SessionTableFilterCallback tableFilterCallback,
object clientData
)
{
CheckDisposed();
CheckInputStream();
UnsafeNativeMethods.xSessionFilter xFilter;
xFilter = new UnsafeNativeMethods.xSessionFilter(
delegate(IntPtr context, byte[] tblName)
{
try
{
| > > > | 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 |
SessionTableFilterCallback tableFilterCallback,
object clientData
)
{
CheckDisposed();
CheckInputStream();
///////////////////////////////////////////////////////////////////
#region Native Callback Methods
UnsafeNativeMethods.xSessionFilter xFilter;
xFilter = new UnsafeNativeMethods.xSessionFilter(
delegate(IntPtr context, byte[] tblName)
{
try
{
|
| ︙ | ︙ | |||
1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 |
{
// do nothing.
}
}
return 0;
});
UnsafeNativeMethods.xSessionConflict xConflict;
xConflict = new UnsafeNativeMethods.xSessionConflict(
delegate(IntPtr context,
SQLiteChangeSetConflictType type,
IntPtr iterator)
| > > | 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 |
{
// do nothing.
}
}
return 0;
});
///////////////////////////////////////////////////////////////////
UnsafeNativeMethods.xSessionConflict xConflict;
xConflict = new UnsafeNativeMethods.xSessionConflict(
delegate(IntPtr context,
SQLiteChangeSetConflictType type,
IntPtr iterator)
|
| ︙ | ︙ | |||
1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 |
{
// do nothing.
}
}
return SQLiteChangeSetConflictResult.Abort;
});
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_apply_strm(
handle, new SQLiteStreamAdapter(inputStream, flags).xInput,
IntPtr.Zero, xFilter, xConflict, IntPtr.Zero);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_apply_strm");
| > > > | 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 |
{
// do nothing.
}
}
return SQLiteChangeSetConflictResult.Abort;
});
#endregion
///////////////////////////////////////////////////////////////////
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_apply_strm(
handle, new SQLiteStreamAdapter(inputStream, flags).xInput,
IntPtr.Zero, xFilter, xConflict, IntPtr.Zero);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_apply_strm");
|
| ︙ | ︙ |