added extra testing and modified code to more closely follow original drivers behaviour.

Author: sgwyn

src/AdoNetCore.AseClient/AseDataReader.cs

@@ -19,6 +19,7 @@ public sealed class AseDataReader : DbDataReader
         private readonly CommandBehavior _behavior;
         private readonly IInfoMessageEventNotifier _eventNotifier;
         private bool _hasFirst;
+        private int _totalResults;
 
 #if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
         private readonly AseCommand _command;
@@ -44,6 +45,8 @@ internal AseDataReader(CommandBehavior behavior, IInfoMessageEventNotifier event
         internal void AddResult(TableResult result)
         {
             _results.Add(result);
+            _totalResults++;
+            result.RecordsAffected = _finalRecordsAffected;
 
             // If this is the first data result back, then we should automatically point at it.
             if (!_hasFirst)
@@ -632,16 +635,20 @@ public override bool Read()
 
         public override int Depth => 0;
         public override bool IsClosed => _currentTable == null;
+        private int _finalRecordsAffected = -1;
         public override int RecordsAffected
         {
             get
             {
-                if (_currentTable == null)
-                    return 0;
-                return _currentTable.Rows.Count > 0 ? -1 : _currentTable.RecordsAffected;
+                return _currentTable != null && _currentResult < _totalResults ? _currentTable.RecordsAffected : _finalRecordsAffected;
             }
         }
 
+        public void SetRecordsAffected(int value)
+        {
+            _finalRecordsAffected = value;
+        }
+
         public IList GetList()
         {
             return null; //todo: implement -- populate a DataView with rows from the current record set and return it.

src/AdoNetCore.AseClient/Internal/Handler/DoneTokenHandler.cs

@@ -46,24 +46,24 @@ public void Handle(IToken token)
                     break;
                 case DoneProcToken t:
                     Logger.Instance?.WriteLine($"{t.Type}: {t.Status}");
-                    if (t.Status.HasFlag(DoneProcCommonToken.DoneProcStatus.TDS_DONE_INXACT))
+                    if (t.Status.HasFlag(DoneToken.DoneStatus.TDS_DONE_INXACT))
                     {
                         Logger.Instance?.WriteLine($"  {t.TransactionState}");
                         TransactionState = t.TransactionState;
                     }
-                    if (t.Status.HasFlag(DoneProcCommonToken.DoneProcStatus.TDS_DONE_COUNT))
+                    if (t.Status.HasFlag(DoneToken.DoneStatus.TDS_DONE_COUNT))
                     {
                         RowsAffected += t.Count;
                     }
                     break;
                 case DoneInProcToken t:
                     Logger.Instance?.WriteLine($"{t.Type}: {t.Status}");
-                    if (t.Status.HasFlag(DoneProcCommonToken.DoneProcStatus.TDS_DONE_INXACT))
+                    if (t.Status.HasFlag(DoneToken.DoneStatus.TDS_DONE_INXACT))
                     {
                         Logger.Instance?.WriteLine($"  {t.TransactionState}");
                         TransactionState = t.TransactionState;
                     }
-                    if (t.Status.HasFlag(DoneProcCommonToken.DoneProcStatus.TDS_DONE_COUNT))
+                    if (t.Status.HasFlag(DoneToken.DoneStatus.TDS_DONE_COUNT))
                     {
                         RowsAffected += t.Count;
                     }

src/AdoNetCore.AseClient/Internal/Handler/StreamingDataReaderTokenHandler.cs

@@ -30,6 +30,8 @@ internal class StreamingDataReaderTokenHandler : ITokenHandler
         private TableResult _current;
         private bool _hasFirstResultSet;
         private bool _hasSentCurrent;
+        private bool _hasFormatted;
+        private int _runningTotalRecordsAffected;
 
         public StreamingDataReaderTokenHandler(TaskCompletionSource<DbDataReader> readerSource, AseDataReader dataReader, IInfoMessageEventNotifier eventNotifier)
         {
@@ -49,13 +51,15 @@ public void Handle(IToken token)
             switch (token)
             {
                 case IFormatToken format:
+
                     ReturnCurrent();
                     _current = new TableResult
                     {
                         Formats = format.Formats,
                         RecordsAffected = -1
                     };
                     _hasSentCurrent = false;
+                    _hasFormatted = true;
                     break;
                 case RowToken row:
                     _current?.Rows.Add(new RowResult
@@ -64,15 +68,27 @@ public void Handle(IToken token)
                     });
                     break;
                 case DoneToken t:
-                    EnsureResultExists(t.Count);
-                    ReturnCurrent();
-                    break;
-                case DoneInProcToken t:
-                    EnsureResultExists(t.Count);
-                    ReturnCurrent();
+                    if (_hasFormatted)
+                    {
+                        ReturnCurrent();
+                        _hasFormatted = false;
+                    }
+                    else if ((t.Status & DoneToken.DoneStatus.TDS_DONE_COUNT) == DoneToken.DoneStatus.TDS_DONE_COUNT)
+                    {
+                        if (_current != null)
+                        {
+
+                        }
+                        _runningTotalRecordsAffected += t.Count;
+                        _dataReader.SetRecordsAffected(_runningTotalRecordsAffected);
+                    }
+                    if ((t.Status & DoneToken.DoneStatus.TDS_DONE_MORE) == DoneToken.DoneStatus.TDS_DONE_FINAL)
+                    {
+                        ReturnCurrent();
+                    }
                     break;
-                case DoneProcToken t:
-                    EnsureResultExists(t.Count);
+                case DoneInProcToken _:
+                case DoneProcToken _:
                     ReturnCurrent();
                     break;
                 case EedToken t:
@@ -134,17 +150,6 @@ public void Handle(IToken token)
             }
         }
 
-        private void EnsureResultExists(int affectedCount)
-        {
-            if (_current == null)
-            {
-                _current = new TableResult()
-                {
-                    RecordsAffected = affectedCount
-                };
-            }
-        }
-
         private void ReturnCurrent()
         {
             if (_current != null && !_hasSentCurrent)

src/AdoNetCore.AseClient/Internal/TableResult.cs

@@ -8,6 +8,7 @@ internal sealed class TableResult
         public List<RowResult> Rows { get; } = new List<RowResult>();
 
         public List<MessageResult> Messages { get; } = new List<MessageResult>();
+
         public int RecordsAffected { get; set; } = 0;
     }
 }

src/AdoNetCore.AseClient/Token/DoneProcCommonToken.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using AdoNetCore.AseClient.Enum;
 using AdoNetCore.AseClient.Interface;
@@ -8,37 +8,7 @@ namespace AdoNetCore.AseClient.Token
 {
     internal abstract class DoneProcCommonToken
     {
-        [Flags]
-        public enum DoneProcStatus : ushort
-        {
-            /// <summary>
-            /// This is the final result for the last command. It indicates that the command has completed successfully.
-            /// </summary>
-            // ReSharper disable once InconsistentNaming
-            TDS_DONE_FINAL = 0x0000,
-            /// <summary>
-            /// This Status indicates that there are more results to follow for the current command.
-            /// </summary>
-            // ReSharper disable once InconsistentNaming
-            TDS_DONE_MORE = 0x0001,
-            /// <summary>
-            /// This indicates that an error occurred on the current command.
-            /// </summary>
-            // ReSharper disable once InconsistentNaming
-            TDS_DONE_ERROR = 0x0002,
-            /// <summary>
-            /// There is a transaction in progress for the current request.
-            /// </summary>
-            // ReSharper disable once InconsistentNaming
-            TDS_DONE_INXACT = 0x0004,
-            /// <summary>
-            /// This Status indicates that the count argument is valid. This bit is used to distinguish between an empty count field and a count field with a value of 0.
-            /// </summary>
-            // ReSharper disable once InconsistentNaming
-            TDS_DONE_COUNT = 0x0010,
-        }
-
-        public DoneProcStatus Status { get; set; }
+        public DoneToken.DoneStatus Status { get; set; }
         public TranState TransactionState { get; set; }
         public int Count { get; set; }
 
@@ -49,10 +19,10 @@ public void Write(Stream stream, DbEnvironment env)
 
         public void Read(Stream stream, DbEnvironment env, IFormatToken previous)
         {
-            Status = (DoneProcStatus)stream.ReadUShort();
+            Status = (DoneToken.DoneStatus)stream.ReadUShort();
             TransactionState = (TranState)stream.ReadUShort();
             Count = stream.ReadInt();
             Logger.Instance?.WriteLine($"<- {Status}, {TransactionState}, {Count}");
         }
     }
-}
+}