Fix for cancel query by adding synchronous readers. (#1246)

* added WIP sync execute method * added syncexecuteonce * replaced executeonce with synchronous reading * removed batch.cs change * restore space
microsoft · Jul 19, 2022 · de0fa82 · de0fa82
1 parent 1db0237
commit de0fa82
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
@@ -421,22 +421,22 @@ private async Task ExecuteOnce(DbConnection conn, CancellationToken cancellation
                     // key columns in the result set, even if they weren't part of the select statement.
                     // Extra key columns get added to the end, so just correlate via Column Ordinal.
                     columnSchemas = new List<DbColumn[]>();
-                    using (DbDataReader reader = await dbCommand.ExecuteReaderAsync(CommandBehavior.KeyInfo | CommandBehavior.SchemaOnly, cancellationToken))
+                    using (DbDataReader reader = dbCommand.ExecuteReader(CommandBehavior.KeyInfo | CommandBehavior.SchemaOnly))
                     {
                         if (reader != null && reader.CanGetColumnSchema())
                         {
                             do
                             {
                                 columnSchemas.Add(reader.GetColumnSchema().ToArray());
-                            } while (await reader.NextResultAsync(cancellationToken));
+                            } while (reader.NextResult());
                         }
                     }
                 }
 
                 ConnectionService.EnsureConnectionIsOpen(conn);
 
                 // Execute the command to get back a reader
-                using (DbDataReader reader = await dbCommand.ExecuteReaderAsync(cancellationToken))
+                using (DbDataReader reader = dbCommand.ExecuteReader())
                 {
                     do
                     {
@@ -464,7 +464,7 @@ private async Task ExecuteOnce(DbConnection conn, CancellationToken cancellation
                         // Read until we hit the end of the result set
                         await resultSet.ReadResultToEnd(reader, cancellationToken);
 
-                    } while (await reader.NextResultAsync(cancellationToken));
+                    } while (reader.NextResult());
 
                     // If there were no messages, for whatever reason (NO COUNT set, messages 
                     // were emitted, records returned), output a "successful" message