Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix several issues with the initial check-in on this branch. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | experimental |
| Files: | files | file ages | folders |
| SHA1: |
8aa9c8c9e482fb61fadc0fa2b93330a0 |
| User & Date: | mistachkin 2014-09-24 05:54:25.784 |
Context
|
2014-09-26
| ||
| 03:31 | Merge updates from trunk. check-in: c8e5b7d893 user: mistachkin tags: experimental | |
|
2014-09-24
| ||
| 05:54 | Fix several issues with the initial check-in on this branch. check-in: 8aa9c8c9e4 user: mistachkin tags: experimental | |
| 05:11 | Merge updates from trunk. check-in: 077e38a462 user: mistachkin tags: experimental | |
Changes
Changes to System.Data.SQLite/SQLiteDataReader.cs.
| ︙ | ︙ | |||
599 600 601 602 603 604 605 |
/// Returns the .NET type of a given column
/// </summary>
/// <param name="i">The index of the column to retrieve</param>
/// <returns>Type</returns>
public override Type GetFieldType(int i)
{
CheckDisposed();
| < | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 |
/// Returns the .NET type of a given column
/// </summary>
/// <param name="i">The index of the column to retrieve</param>
/// <returns>Type</returns>
public override Type GetFieldType(int i)
{
CheckDisposed();
if (i >= PrivateVisibleFieldCount && _keyInfo != null)
return _keyInfo.GetFieldType(i - PrivateVisibleFieldCount);
return SQLiteConvert.SQLiteTypeToType(GetSQLiteType(_flags, i));
}
|
| ︙ | ︙ | |||
707 708 709 710 711 712 713 |
/// Retrieves the name of the column
/// </summary>
/// <param name="i">The index of the column to retrieve</param>
/// <returns>string</returns>
public override string GetName(int i)
{
CheckDisposed();
| < | 706 707 708 709 710 711 712 713 714 715 716 717 718 719 |
/// Retrieves the name of the column
/// </summary>
/// <param name="i">The index of the column to retrieve</param>
/// <returns>string</returns>
public override string GetName(int i)
{
CheckDisposed();
if (i >= PrivateVisibleFieldCount && _keyInfo != null)
return _keyInfo.GetName(i - PrivateVisibleFieldCount);
return _activeStatement._sql.ColumnName(_activeStatement, i);
}
|
| ︙ | ︙ | |||
1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 |
// to a known DbType.
if (typ.Affinity == TypeAffinity.Uninitialized)
{
typ.Type = SQLiteConvert.TypeNameToDbType(
GetConnection(this), _activeStatement._sql.ColumnType(
_activeStatement, i, out typ.Affinity), flags);
}
return typ;
}
/// <summary>
/// Reads the next row from the resultset
/// </summary>
| > > > > > | 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 |
// to a known DbType.
if (typ.Affinity == TypeAffinity.Uninitialized)
{
typ.Type = SQLiteConvert.TypeNameToDbType(
GetConnection(this), _activeStatement._sql.ColumnType(
_activeStatement, i, out typ.Affinity), flags);
}
else
{
typ.Affinity = _activeStatement._sql.ColumnAffinity(
_activeStatement, i);
}
return typ;
}
/// <summary>
/// Reads the next row from the resultset
/// </summary>
|
| ︙ | ︙ |