Merge pull request #184 from ngvtien/master

Address issues 182,183, 185, 186, 187

Author: formicas

AdoNetCore.AseClient.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdoNetCore.AseClient", "src\AdoNetCore.AseClient\AdoNetCore.AseClient.csproj", "{A994B1E4-2B7F-40B8-B045-57E4F324FF67}"
 EndProject

src/AdoNetCore.AseClient/AdoNetCore.AseClient.csproj

@@ -3,4 +3,7 @@
   <PropertyGroup>
     <Description>.NET Core data provider for Sybase ASE</Description>
   </PropertyGroup>
+<PropertyGroup>
+   <LangVersion>7</LangVersion>
+</PropertyGroup>
 </Project>

src/AdoNetCore.AseClient/AseCommand.cs

@@ -27,6 +27,7 @@ public sealed class AseCommand : DbCommand
         private string _commandText;
         private UpdateRowSource _updatedRowSource;
         private bool? _namedParameters;
+        internal FormatItem FormatItem { get; set; }
 
         /// <summary>
         /// Constructor function for an <see cref="AseCommand"/> instance.
@@ -42,10 +43,8 @@ public AseCommand()
         /// Note: the instance will not be initialised with an AseConnection; before use this must be supplied.
         /// </summary>
         /// <param name="commandText">The command text to execute</param>
-        public AseCommand(string commandText)
+        public AseCommand(string commandText) : this()
         {
-            AseParameters = new AseParameterCollection();
-
             CommandText = commandText;
         }
 
@@ -54,14 +53,10 @@ public AseCommand(string commandText)
         /// </summary>
         /// <param name="commandText">The command text to execute</param>
         /// <param name="connection">The connection upon which to execute</param>
-        public AseCommand(string commandText, AseConnection connection)
+        public AseCommand(string commandText, AseConnection connection) : this(commandText)
         {
             _connection = connection;
             _transaction = connection.Transaction;
-
-            AseParameters = new AseParameterCollection();
-
-            CommandText = commandText;
         }
 
         /// <summary>
@@ -70,23 +65,13 @@ public AseCommand(string commandText, AseConnection connection)
         /// <param name="commandText">The command text to execute</param>
         /// <param name="connection">The connection upon which to execute</param>
         /// <param name="transaction">The transaction within which to execute</param>
-        public AseCommand(string commandText, AseConnection connection, AseTransaction transaction)
+        public AseCommand(string commandText, AseConnection connection, AseTransaction transaction) : this (commandText, connection)
         {
-            _connection = connection;
             _transaction = transaction;
-
-            AseParameters = new AseParameterCollection();
-
-            CommandText = commandText;
         }
 
-        internal AseCommand(AseConnection connection)
-        {
-            _connection = connection;
-            _transaction = connection.Transaction;
-
-            AseParameters = new AseParameterCollection();
-        }
+        internal AseCommand(AseConnection connection) : this (string.Empty, connection, connection.Transaction)
+        { }
 
         /// <summary>
         /// Tries to cancel the execution of a <see cref="AseCommand" />.
@@ -131,6 +116,7 @@ protected override DbParameter CreateDbParameter()
             return CreateParameter();
         }
 
+
         /// <summary>
         /// Executes a Transact-SQL statement against the connection and returns the number of rows affected.
         /// </summary>

src/AdoNetCore.AseClient/AseCommandBuilder.cs

@@ -1,4 +1,4 @@
-#if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
+#if ENABLE_SYSTEM_DATA_COMMON_EXTENSIONS
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -484,4 +484,4 @@ private void RowUpdating(object sender, AseRowUpdatingEventArgs args)
         }
     }
 }
-#endif
+#endif

src/AdoNetCore.AseClient/AseDataReader.cs

@@ -10,6 +10,9 @@
 
 namespace AdoNetCore.AseClient
 {
+    /// <summary>
+    /// ASE implementation of <see cref="IDataReader"/>
+    /// </summary>
     public sealed class AseDataReader : DbDataReader
     {
         private TableResult _currentTable;
@@ -634,15 +637,11 @@ public override bool Read()
         }
 
         public override int Depth => 0;
+
         public override bool IsClosed => _currentTable == null;
         private int _finalRecordsAffected = -1;
-        public override int RecordsAffected
-        {
-            get
-            {
-                return _currentTable != null && _currentResult < _totalResults ? _currentTable.RecordsAffected : _finalRecordsAffected;
-            }
-        }
+
+        public override int RecordsAffected => _currentTable != null && _currentResult < _totalResults ? _currentTable.RecordsAffected : _finalRecordsAffected;
 
         public void SetRecordsAffected(int value)
         {

src/AdoNetCore.AseClient/AseErrorCollection.cs

@@ -64,8 +64,8 @@ private static int GetIndexOfMostSevereError(AseError[] errors)
             var result = 0;
             for (var i = 1; i < errors.Length; i++)
             {
-                // The '=' in '<=' means that for equal severity, we take the last error in the list. 
-                if (errors[result].Severity <= errors[i].Severity)
+                // We will respect the order if they're the same and already sorted and only care for the different ones
+                if (errors[result].Severity < errors[i].Severity)
                 {
                     result = i;
                 }

src/AdoNetCore.AseClient/AseParameter.cs

@@ -276,7 +276,6 @@ public AseParameter(int parameterIndex, AseDbType dbType, int size, ParameterDir
             SourceVersion = sourceVersion;
             Value = value;
         }
-
         public override void ResetDbType()
         {
             DbType = default(DbType);

src/AdoNetCore.AseClient/Internal/FormatItem.cs

@@ -63,20 +63,22 @@ public string ParameterName
         /// </summary>
         public SerializationType SerializationType { get; set; }
 
-        public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironment env)
+        public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironment env, CommandType commandType)
         {
             parameter.AseDbType = TypeMap.InferType(parameter);
 
             var dbType = parameter.DbType;
+
             var length = TypeMap.GetFormatLength(dbType, parameter, env.Encoding);
+
             var format = new FormatItem
             {
                 ParameterName = parameter.ParameterName,
                 IsOutput = parameter.IsOutput,
                 IsNullable = parameter.IsNullable,
                 Length = length,
                 DataType = TypeMap.GetTdsDataType(dbType, parameter.SendableValue, length, parameter.ParameterName),
-                UserType = TypeMap.GetTdsUserType(dbType)
+                UserType = TypeMap.GetUserType(dbType, parameter.SendableValue, length)
             };
 
             //fixup the FormatItem's BlobType for strings and byte arrays
@@ -89,6 +91,15 @@ public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironmen
                         break;
                     case DbType.String:
                         format.BlobType = BlobType.BLOB_UNICHAR;
+                        // This is far less than ideal but at the time of addressing this issue whereby if the
+                        // BlobType is a BLOB_UNICHAR then the UserType would need to be 36 when it
+                        // is a stored proc otherwise it would need to be zero (0).
+                        //
+                        // In the future, we'd need to overhaul how TDS_BLOB is structured especially
+                        // around BLOB_UNICHAR and the UserType that it should return in a more consistent way
+                        if (commandType != CommandType.StoredProcedure)
+                            format.UserType = 0;
+
                         break;
                     case DbType.Binary:
                         format.BlobType = BlobType.BLOB_LONGBINARY;
@@ -156,6 +167,7 @@ public static FormatItem ReadForRow(Stream stream, Encoding enc, TokenType srcTo
                 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/Handler/ResponseParameterTokenHandler.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data;
 using AdoNetCore.AseClient.Enum;
 using AdoNetCore.AseClient.Interface;
@@ -33,11 +33,10 @@ public void Handle(IToken token)
                     foreach (AseParameter parameter in _parameters)
                     {
                         if (parameter.Direction == ParameterDirection.ReturnValue)
-                        {
                             parameter.Value = t.Status;
-                        }
                     }
                     break;
+
                 case ParametersToken t:
                     var dict = new Dictionary<string, ParametersToken.Parameter>();
 
@@ -49,9 +48,7 @@ public void Handle(IToken token)
                     foreach (AseParameter parameter in _parameters)
                     {
                         if (parameter.IsOutput && dict.ContainsKey(parameter.ParameterName))
-                        {
                             parameter.Value = dict[parameter.ParameterName].Value;
-                        }
                     }
                     break;
                 default:

src/AdoNetCore.AseClient/Internal/InternalConnection.cs

@@ -297,13 +297,11 @@ public void ChangeDatabase(string databaseName)
                 HasParameters = false,
                 CommandText = $"USE {databaseName}"
             }));
-
+            
             var messageHandler = new MessageTokenHandler(EventNotifier);
             var envChangeTokenHandler = new EnvChangeTokenHandler(_environment, _parameters.Charset);
 
-            ReceiveTokens(
-                envChangeTokenHandler,
-                messageHandler);
+            ReceiveTokens(envChangeTokenHandler, messageHandler);
 
             AssertExecutionCompletion();
 
@@ -393,7 +391,8 @@ private void InternalExecuteQueryAsync(AseCommand command, AseTransaction transa
             }
             catch (Exception ex)
             {
-                readerSource.TrySetException(ex); // If we have already begun returning data, then this will get lost.
+                // If we have already begun returning data, then this will get lost.
+                if (!readerSource.TrySetException(ex)) throw;
             }
         }
 
@@ -436,7 +435,7 @@ private void InternalExecuteNonQueryAsync(AseCommand command, AseTransaction tra
             }
             catch (Exception ex)
             {
-                rowsAffectedSource.TrySetException(ex);
+                if (!rowsAffectedSource.TrySetException(ex)) throw;
             }
         }
 
@@ -611,10 +610,11 @@ private IEnumerable<IToken> BuildCommandTokens(AseCommand command, CommandBehavi
                 ? BuildRpcToken(command, behavior)
                 : BuildLanguageToken(command, behavior);
 
-            foreach (var token in BuildParameterTokens(command.AseParameters))
+            foreach (var token in BuildParameterTokens(command))
             {
                 yield return token;
             }
+
         }
 
         private IToken BuildLanguageToken(AseCommand command, CommandBehavior behavior)
@@ -662,18 +662,23 @@ private string MakeCommand(string commandText, CommandBehavior behavior, bool na
             return result;
         }
 
-        private IToken[] BuildParameterTokens(AseParameterCollection parameters)
+        private IToken[] BuildParameterTokens(AseCommand command)
         {
             var formatItems = new List<FormatItem>();
             var parameterItems = new List<ParametersToken.Parameter>();
 
-            foreach (var parameter in parameters.SendableParameters)
+            foreach (var parameter in command.Parameters.SendableParameters)
             {
-                var formatItem = FormatItem.CreateForParameter(parameter, _environment);
-                formatItems.Add(formatItem);
+                var parameterName = parameter.ParameterName ?? command.Parameters.IndexOf(parameter).ToString();
+                if (command.FormatItem == null || command.FormatItem.ParameterName != parameterName)
+                {
+                    command.FormatItem = FormatItem.CreateForParameter(parameter, _environment, command.CommandType);
+                }
+
+                formatItems.Add(command.FormatItem);
                 parameterItems.Add(new ParametersToken.Parameter
                 {
-                    Format = formatItem,
+                    Format = command.FormatItem,
                     Value = parameter.SendableValue
                 });
             }