Merge pull request #161 from anat0li/master

Add support for TDS_ROWFMT

Author: senseibaka

src/AdoNetCore.AseClient/Internal/FormatItem.cs

@@ -123,18 +123,30 @@ public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironmen
 
         public static FormatItem ReadForRow(Stream stream, Encoding enc, TokenType srcTokenType)
         {
-            var format = new FormatItem
+            FormatItem format;
+            switch (srcTokenType)
             {
-                ColumnLabel = stream.ReadByteLengthPrefixedString(enc),
-                CatalogName = stream.ReadByteLengthPrefixedString(enc),
-                SchemaName = stream.ReadByteLengthPrefixedString(enc),
-                TableName = stream.ReadByteLengthPrefixedString(enc),
-                ColumnName = stream.ReadByteLengthPrefixedString(enc),
-                RowStatus = (RowFormatItemStatus)(srcTokenType == TokenType.TDS_ROWFMT
-                    ? (uint)stream.ReadByte()
-                    : stream.ReadUInt())
-            };
-
+                case TokenType.TDS_ROWFMT:
+                    format = new FormatItem
+                    {
+                        ColumnName = stream.ReadByteLengthPrefixedString(enc),
+                        RowStatus = (RowFormatItemStatus)stream.ReadByte()
+                    };
+                    break;
+                case TokenType.TDS_ROWFMT2:
+                    format = new FormatItem
+                    {
+                        ColumnLabel = stream.ReadByteLengthPrefixedString(enc),
+                        CatalogName = stream.ReadByteLengthPrefixedString(enc),
+                        SchemaName = stream.ReadByteLengthPrefixedString(enc),
+                        TableName = stream.ReadByteLengthPrefixedString(enc),
+                        ColumnName = stream.ReadByteLengthPrefixedString(enc),
+                        RowStatus = (RowFormatItemStatus)stream.ReadUInt()
+                    };
+                    break;
+                default:
+                    throw new ArgumentException($"Unexpected token type: {srcTokenType}.", nameof(srcTokenType));
+            }
             ReadTypeInfo(format, stream, enc);
 
             Logger.Instance?.WriteLine($"  <- {format.ColumnName}: {format.DataType} (len: {format.Length}) (ut:{format.UserType}) (status:{format.RowStatus}) (loc:{format.LocaleInfo}) format names available: ColumnLabel [{format.ColumnLabel}], ColumnName [{format.ColumnName}], CatalogName [{format.CatalogName}], ParameterName [{format.ParameterName}], SchemaName [{format.SchemaName}], TableName [{format.TableName}]");

src/AdoNetCore.AseClient/Internal/TokenReader.cs

@@ -62,6 +62,7 @@ public IEnumerable<IToken> Read(TokenReceiveStream stream, DbEnvironment env)
             {TokenType.TDS_RETURNSTATUS, ReturnStatusToken.Create },
             {TokenType.TDS_DONEINPROC, DoneInProcToken.Create },
             {TokenType.TDS_DONEPROC, DoneProcToken.Create },
+            {TokenType.TDS_ROWFMT, RowFormatToken.Create },
             {TokenType.TDS_ROWFMT2, RowFormat2Token.Create },
             {TokenType.TDS_CONTROL, ControlToken.Create },
             {TokenType.TDS_ROW, RowToken.Create },

src/AdoNetCore.AseClient/Token/RowFormatToken.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using AdoNetCore.AseClient.Enum;
+using AdoNetCore.AseClient.Interface;
+using AdoNetCore.AseClient.Internal;
+
+namespace AdoNetCore.AseClient.Token
+{
+    internal class RowFormatToken : IFormatToken
+    {
+        public TokenType Type => TokenType.TDS_ROWFMT;
+
+        public void Write(Stream stream, DbEnvironment env)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Read(Stream stream, DbEnvironment env, IFormatToken previousFormatToken)
+        {
+            Logger.Instance?.WriteLine($"<- {Type}");
+            var remainingLength = stream.ReadUShort();
+            using (var ts = new ReadablePartialStream(stream, remainingLength))
+            {
+                var formats = new List<FormatItem>();
+                var columnCount = ts.ReadUShort();
+
+                for (var i = 0; i < columnCount; i++)
+                {
+                    formats.Add(FormatItem.ReadForRow(ts, env.Encoding, Type));
+                }
+
+                Formats = formats.ToArray();
+            }
+        }
+
+        public static RowFormatToken Create(Stream stream, DbEnvironment env, IFormatToken previous)
+        {
+            var t = new RowFormatToken();
+            t.Read(stream, env, previous);
+            return t;
+        }
+
+        public FormatItem[] Formats { get; set; }
+    }
+}