Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Removed some redundant calls and tweaked NextResult() |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sourceforge |
| Files: | files | file ages | folders |
| SHA1: |
b2ece50abc0e2bf538f789b8f468d14f |
| User & Date: | rmsimpson 2005-03-02 15:58:26.000 |
Context
|
2005-03-02
| ||
| 15:59 | no message check-in: 609bd2582d user: rmsimpson tags: sourceforge | |
| 15:58 | Removed some redundant calls and tweaked NextResult() check-in: b2ece50abc user: rmsimpson tags: sourceforge | |
| 15:57 | Changed Cancel() -- should not throw an error even if not implemented check-in: f35dd3aa68 user: rmsimpson tags: sourceforge | |
Changes
Changes to System.Data.SQLite/SQLiteDataReader.cs.
| ︙ | ︙ | |||
202 203 204 205 206 207 208 |
/// <summary>
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override bool GetBoolean(int ordinal)
{
| < < < < < | 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 |
/// <summary>
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override bool GetBoolean(int ordinal)
{
VerifyType(ordinal, DbType.Boolean);
return Convert.ToBoolean(GetValue(ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override byte GetByte(int ordinal)
{
VerifyType(ordinal, DbType.Byte);
return Convert.ToByte(_activeStatement._sql.GetInt32(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <param name="dataOffset"></param>
/// <param name="buffer"></param>
/// <param name="bufferOffset"></param>
/// <param name="length"></param>
/// <returns></returns>
public override long GetBytes(int ordinal, long dataOffset, byte[] buffer, int bufferOffset, int length)
{
VerifyType(ordinal, DbType.Binary);
return _activeStatement._sql.GetBytes(_activeStatement, ordinal, (int)dataOffset, buffer, bufferOffset, length);
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override char GetChar(int ordinal)
{
VerifyType(ordinal, DbType.SByte);
return Convert.ToChar(_activeStatement._sql.GetInt32(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <param name="dataOffset"></param>
/// <param name="buffer"></param>
/// <param name="bufferOffset"></param>
/// <param name="length"></param>
/// <returns></returns>
public override long GetChars(int ordinal, long dataOffset, char[] buffer, int bufferOffset, int length)
{
VerifyType(ordinal, DbType.String);
return _activeStatement._sql.GetChars(_activeStatement, ordinal, (int)dataOffset, buffer, bufferOffset, length);
}
/// <summary>
///
/// </summary>
|
| ︙ | ︙ | |||
281 282 283 284 285 286 287 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override DateTime GetDateTime(int ordinal)
{
| < < < < | 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 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override DateTime GetDateTime(int ordinal)
{
VerifyType(ordinal, DbType.DateTime);
return _activeStatement._sql.GetDateTime(_activeStatement, ordinal);
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override decimal GetDecimal(int ordinal)
{
VerifyType(ordinal, DbType.Decimal);
return Convert.ToDecimal(_activeStatement._sql.GetDouble(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override double GetDouble(int ordinal)
{
VerifyType(ordinal, DbType.Double);
return _activeStatement._sql.GetDouble(_activeStatement, ordinal);
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override Type GetFieldType(int ordinal)
{
SQLiteType t = GetSQLiteType(ordinal);
if (t.Type != DbType.Object)
return SQLiteConvert.DbTypeToType(t.Type);
switch (t.Affinity)
{
|
| ︙ | ︙ | |||
345 346 347 348 349 350 351 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override float GetFloat(int ordinal)
{
| < < < < < | 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 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override float GetFloat(int ordinal)
{
VerifyType(ordinal, DbType.Single);
return Convert.ToSingle(_activeStatement._sql.GetDouble(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override Guid GetGuid(int ordinal)
{
VerifyType(ordinal, DbType.Guid);
return new Guid(_activeStatement._sql.GetText(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override Int16 GetInt16(int ordinal)
{
VerifyType(ordinal, DbType.Int16);
return Convert.ToInt16(_activeStatement._sql.GetInt32(_activeStatement, ordinal));
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override Int32 GetInt32(int ordinal)
{
VerifyType(ordinal, DbType.Int32);
return _activeStatement._sql.GetInt32(_activeStatement, ordinal);
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override Int64 GetInt64(int ordinal)
{
VerifyType(ordinal, DbType.Int64);
return _activeStatement._sql.GetInt64(_activeStatement, ordinal);
}
/// <summary>
///
/// </summary>
|
| ︙ | ︙ | |||
584 585 586 587 588 589 590 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override string GetString(int ordinal)
{
| < < | 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 |
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override string GetString(int ordinal)
{
VerifyType(ordinal, DbType.String);
return _activeStatement._sql.GetText(_activeStatement, ordinal);
}
/// <summary>
///
/// </summary>
/// <param name="ordinal"></param>
/// <returns></returns>
public override object GetValue(int ordinal)
{
if (IsDBNull(ordinal)) return DBNull.Value;
if (GetFieldType(ordinal) == typeof(byte[]))
{
int n = (int)GetBytes(ordinal, 0, null, 0, 0);
byte[] b = new byte[n];
GetBytes(ordinal, 0, b, 0, n);
|
| ︙ | ︙ | |||
619 620 621 622 623 624 625 |
///
/// </summary>
/// <param name="values"></param>
/// <returns></returns>
public override int GetValues(object[] values)
{
CheckClosed();
| | | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 |
///
/// </summary>
/// <param name="values"></param>
/// <returns></returns>
public override int GetValues(object[] values)
{
CheckClosed();
int nMax = _fieldCount;
if (values.Length < nMax) nMax = values.Length;
for (int n = 0; n < nMax; n++)
{
values.SetValue(GetValue(n), n);
}
|
| ︙ | ︙ | |||
674 675 676 677 678 679 680 |
CheckClosed();
SQLiteStatement stmt;
int fieldCount;
while (true)
{
| < < < < < > > > > > > > > > > | 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 |
CheckClosed();
SQLiteStatement stmt;
int fieldCount;
while (true)
{
if (_activeStatement != null)
{
// If we're only supposed to return a single rowset, step through all remaining statements once until
// they are all done and return false to indicate no more resultsets exist.
if ((_commandBehavior & CommandBehavior.SingleResult) != 0)
{
// Reset the previously-executed command
_activeStatement._sql.Reset(_activeStatement);
while (_activeStatementIndex + 1 != _command._statementList.Length)
{
_activeStatementIndex++;
stmt = _command._statementList[_activeStatementIndex];
stmt._sql.Step(stmt);
stmt._sql.Reset(stmt); // Gotta reset after every step to release any locks and such!
}
return false;
}
// Reset the previously-executed command
_activeStatement._sql.Reset(_activeStatement);
}
// If we've reached the end of the statements, return false, no more resultsets
if (_activeStatementIndex + 1 == _command._statementList.Length)
return false;
// If we were on a resultset, set the state to "done reading" for it
if (_readingState < 1)
_readingState = 1;
_activeStatementIndex++;
stmt = _command._statementList[_activeStatementIndex];
fieldCount = stmt._sql.ColumnCount(stmt);
// If we're told to get schema information only, then don't perform an initial step() through the resultset
|
| ︙ | ︙ | |||
734 735 736 737 738 739 740 741 742 743 744 745 746 747 |
return true;
}
}
private SQLiteType GetSQLiteType(int ordinal)
{
if (_fieldTypeArray == null) _fieldTypeArray = new SQLiteType[_fieldCount];
if (_fieldTypeArray[ordinal].Affinity == 0)
_fieldTypeArray[ordinal].Type = SQLiteConvert.TypeNameToDbType(_activeStatement._sql.ColumnType(_activeStatement, ordinal, out _fieldTypeArray[ordinal].Affinity));
return _fieldTypeArray[ordinal];
}
| > | 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 |
return true;
}
}
private SQLiteType GetSQLiteType(int ordinal)
{
CheckClosed();
if (_fieldTypeArray == null) _fieldTypeArray = new SQLiteType[_fieldCount];
if (_fieldTypeArray[ordinal].Affinity == 0)
_fieldTypeArray[ordinal].Type = SQLiteConvert.TypeNameToDbType(_activeStatement._sql.ColumnType(_activeStatement, ordinal, out _fieldTypeArray[ordinal].Affinity));
return _fieldTypeArray[ordinal];
}
|
| ︙ | ︙ |