Merge pull request #27 from PeterDRasmussen/master

Combining RowSet and chunks sometimes there are rowsets as well as chunks

Author: fixer-m

Snowflake.Client.Tests/IntegrationTests/IntegrationTestBase.cs

@@ -14,7 +14,17 @@ public IntegrationTestBase()
             var testParameters = JsonSerializer.Deserialize<TestConfiguration>(configJson, new JsonSerializerOptions() { PropertyNameCaseInsensitive = true });
             var connectionInfo = testParameters.Connection;
 
-            _snowflakeClient = new SnowflakeClient(connectionInfo.User, connectionInfo.Password, connectionInfo.Account, connectionInfo.Region);
+            _snowflakeClient = new SnowflakeClient(new Model.AuthInfo
+            {
+                User = connectionInfo.User, 
+                Password = connectionInfo.Password, 
+                Account = connectionInfo.Account, 
+                Region = connectionInfo.Region
+            },
+            new Model.SessionInfo
+            {
+                Warehouse = connectionInfo.Warehouse
+            });
         }
     }
 }

Snowflake.Client.Tests/IntegrationTests/SnowflakeChunksDownloaderTest.cs

@@ -29,6 +29,16 @@ public async Task QueryAndMap_ResponseWithChunks()
 
             Assert.AreEqual(selectCount, records.Count);
         }
+
+        [Test]
+        public async Task QueryAndMap_ResponseWithChunks_AndRowset()
+        {
+            var selectCount = 1300;
+            var result = await _snowflakeClient.QueryAsync<Supplier>($"select top {selectCount} * from SNOWFLAKE_SAMPLE_DATA.TPCH_SF1000.SUPPLIER;");
+            var records = result.ToList();
+
+            Assert.AreEqual(selectCount, records.Count);
+        }
     }
 
     internal class Supplier

Snowflake.Client/Helpers/SnowflakeUtils.cs

@@ -78,6 +78,7 @@ internal static string GetCloudTagByRegion(string region)
                 { "eu-west-1", "" },
                 { "eu-west-2", "aws" },
                 { "eu-central-1", "" },
+                { "eu-north-1", "aws" },
                 { "ap-northeast-1", "aws" },
                 { "ap-south-1", "aws" },
                 { "ap-southeast-1", "" },

Snowflake.Client/SnowflakeClient.cs

@@ -172,12 +172,12 @@ public async Task<IEnumerable<T>> QueryAsync<T>(string sql, object sqlParams = n
 
             if (response.Data.Chunks != null && response.Data.Chunks.Count > 0)
             {
-                rowSet = await ChunksDownloader.DownloadAndParseChunksAsync(new ChunksDownloadInfo()
+                rowSet.AddRange(await ChunksDownloader.DownloadAndParseChunksAsync(new ChunksDownloadInfo()
                 {
                     ChunkHeaders = response.Data.ChunkHeaders,
                     Chunks = response.Data.Chunks,
                     Qrmk = response.Data.Qrmk
-                }, ct);
+                }, ct));
             }
 
             var result = SnowflakeDataMapper.MapTo<T>(response.Data.RowType, rowSet);