SNOW-950923 codecov fixes, review suggestions to provide more checks …

…in tests

Snowflake.Data.Tests/IntegrationTests/SFPutGetTest.cs

@@ -7,6 +7,8 @@
 using System.Data.Common;
 using System.IO.Compression;
 using System.Text;
+using Castle.Components.DictionaryAdapter;
+using Snowflake.Data.Tests.Util;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
@@ -227,6 +229,30 @@ public void TestPutFileProvidesQueryIdOnFailure()
                 // Assert
                 Assert.IsNotEmpty(queryId);
                 Assert.DoesNotThrow(()=>Guid.Parse(queryId));
+                SnowflakeDbExceptionAssert.HasErrorCode(snowflakeDbException, SFError.IO_ERROR_ON_GETPUT_COMMAND);
+            }
+        }
+
+        [Test]
+        public void TestPutFileWithSyntaxErrorProvidesQueryIdOnFailure()
+        {
+            // Arrange
+            // Set the PUT query variables but do not create a file
+            t_inputFilePath = "unexisting_file.csv SOME CODE FORCING SYNTAX ERROR";
+            t_internalStagePath = $"@{t_schemaName}.{t_stageName}";
+
+            // Act
+            using (var conn = new SnowflakeDbConnection(ConnectionString))
+            {
+                conn.Open();
+                var snowflakeDbException = Assert.Throws<SnowflakeDbException>(()=>PutFile(conn));
+                var queryId = snowflakeDbException.QueryId;
+
+                // Assert
+                Assert.IsNotEmpty(queryId);
+                Assert.DoesNotThrow(()=>Guid.Parse(queryId));
+                Assert.That(snowflakeDbException.ErrorCode, Is.EqualTo(1003));
+                Assert.That(snowflakeDbException.InnerException, Is.Null);
             }
         }
 

Snowflake.Data.Tests/UnitTests/SFFileTransferAgentTests.cs

@@ -4,6 +4,7 @@
 
 using Amazon.S3.Transfer;
 using Snowflake.Data.Client;
+using Snowflake.Data.Tests.Util;
 
 namespace Snowflake.Data.Tests.UnitTests
 {
@@ -311,7 +312,7 @@ public void TestUploadWithGZIPCompression()
         }
 
         [Test]
-        public void TestUploadWithWilcardInTheFilename()
+        public void TestUploadWithWildcardInTheFilename()
         {
             // Arrange
             UploadSetUpFile();
@@ -461,7 +462,7 @@ public void TestUploadWithWildcardInTheDirectoryPath()
         }
 
         [Test]
-        public void TestUploadThrowsArgumentExceptionForMissingRootDirectoryWithWildcard()
+        public void TestUploadThrowsExceptionForMissingRootDirectoryWithWildcard()
         {
             // Arrange
             UploadSetUpFile();
@@ -501,6 +502,7 @@ public void TestUploadThrowsArgumentExceptionForMissingRootDirectoryWithWildcard
 
             // Assert
             Assert.AreEqual(_responseData.queryId, ex.QueryId);
+            SnowflakeDbExceptionAssert.HasErrorCode(ex, SFError.IO_ERROR_ON_GETPUT_COMMAND);
             Assert.That(ex.Message, Does.Match($"No file found for: {tempUploadRootDirectory}\\*/{tempUploadSecondDirectory}\\*/{mockFileName}"));
 
             for (int i = 0; i < numberOfDirectories; i++)
@@ -595,6 +597,7 @@ public void TestDownloadThrowsErrorFileNotFound()
 
             // Assert
             Assert.AreEqual(_responseData.queryId, ex.QueryId);
+            SnowflakeDbExceptionAssert.HasErrorCode(ex, SFError.IO_ERROR_ON_GETPUT_COMMAND);
             Assert.IsInstanceOf<AggregateException>(ex.InnerException);
             var innerException = ((AggregateException)ex.InnerException)?.InnerExceptions[0];
             Assert.IsInstanceOf<FileNotFoundException>(innerException);
@@ -626,6 +629,7 @@ public void TestDownloadThrowsErrorDirectoryNotFound()
 
             // Assert
             Assert.AreEqual(_responseData.queryId, ex.QueryId);
+            SnowflakeDbExceptionAssert.HasErrorCode(ex, SFError.IO_ERROR_ON_GETPUT_COMMAND);
             Assert.IsInstanceOf<AggregateException>(ex.InnerException);
             var innerException = ((AggregateException)ex.InnerException)?.InnerExceptions[0];
             Assert.IsInstanceOf<DirectoryNotFoundException>(innerException);

Snowflake.Data.Tests/Util/SnowflakeDbExceptionAssert.cs

@@ -0,0 +1,14 @@
+using Snowflake.Data.Core;
+using Snowflake.Data.Client;
+using NUnit.Framework;
+
+namespace Snowflake.Data.Tests.Util
+{
+    public static class SnowflakeDbExceptionAssert
+    {
+        public static void HasErrorCode(SnowflakeDbException exception, SFError sfError)
+        {
+            Assert.AreEqual(exception.ErrorCode, sfError.GetAttribute<SFErrorAttr>().errorCode);
+        }
+    }
+}

Snowflake.Data/Client/SnowflakeDbException.cs

@@ -23,7 +23,7 @@ public sealed class SnowflakeDbException : DbException
         static private ResourceManager rm = new ResourceManager("Snowflake.Data.Core.ErrorMessages",
             typeof(SnowflakeDbException).Assembly);
 
-        public new string SqlState { get; private set; }
+        public string SqlState { get; private set; }
 
         private int VendorCode;
 

Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs

@@ -241,7 +241,6 @@ public void execute()
                 }
                 throw new SnowflakeDbException(SFError.IO_ERROR_ON_GETPUT_COMMAND, TransferMetadata.queryId, e);
             }
-
         }
 
         public async Task executeAsync(CancellationToken cancellationToken)

Snowflake.Data/Core/SFStatement.cs

@@ -412,9 +412,8 @@ internal SFBaseResultSet Execute(int timeout, string sql, Dictionary<string, Bin
             catch (Exception ex)
             {
                 logger.Error("Query execution failed.", ex);
-                if (ex is SnowflakeDbException)
+                if (ex is SnowflakeDbException snowflakeDbException)
                 {
-                    var snowflakeDbException = (SnowflakeDbException)ex;
                     this._lastQueryId = snowflakeDbException.QueryId;
                 }
                 throw;