From aa30b52d036b70792dee6f1ad968f9d86e59b235 Mon Sep 17 00:00:00 2001 From: Lucy Zhang Date: Fri, 20 Nov 2020 15:31:01 -0800 Subject: [PATCH] Notebooks: Fix query results not displaying table rows (#13488) * fix PQSQL queries not displaying rows * comment * change comment and fix unit test --- .../workbench/contrib/notebook/test/browser/sqlFuture.test.ts | 2 +- .../services/notebook/browser/sql/sqlSessionManager.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sql/workbench/contrib/notebook/test/browser/sqlFuture.test.ts b/src/sql/workbench/contrib/notebook/test/browser/sqlFuture.test.ts index abb3f57434..7645804029 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/sqlFuture.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/sqlFuture.test.ts @@ -69,7 +69,7 @@ suite('SQL Future', function () { queryRunner.setup(x => x.getQueryRows(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(subset)); sqlFuture.handleResultSet(resultSet); - await sqlFuture.queryAndConvertData(resultSet, 0); + await sqlFuture.handleDone(); sinon.assert.calledWith(handleSpy, expectedMsg); }); }); diff --git a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts index 34a07759bf..e2a2fe9afd 100644 --- a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts @@ -527,6 +527,10 @@ export class SQLFuture extends Disposable implements FutureInternal { this._dataToSaveMap.set(key, data); this._rowsMap.set(key, []); this.sendIOPubMessage(data, set); + // If rows are returned in the initial result set, make sure to convert and send to notebook + if (set.rowCount > 0) { + this.handleResultSetUpdate(set); + } } }