ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Notebooks: Fix query results not displaying table rows (#13488)

Browse Source 
* fix PQSQL queries not displaying rows

* comment

* change comment and fix unit test
This commit is contained in:
Lucy Zhang
2020-11-20 15:31:01 -08:00
committed by GitHub
parent 6edcbbb738
commit aa30b52d03
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/contrib/notebook/test/browser/sqlFuture.test.ts
View File

@@ -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)); queryRunner.setup(x => x.getQueryRows(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(subset));
sqlFuture.handleResultSet(resultSet); sqlFuture.handleResultSet(resultSet);
await sqlFuture.queryAndConvertData(resultSet, 0); await sqlFuture.handleDone();
sinon.assert.calledWith(handleSpy, expectedMsg); sinon.assert.calledWith(handleSpy, expectedMsg);
}); });
}); });

4
src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts
View File

@@ -527,6 +527,10 @@ export class SQLFuture extends Disposable implements FutureInternal {
this._dataToSaveMap.set(key, data); this._dataToSaveMap.set(key, data);
this._rowsMap.set(key, []); this._rowsMap.set(key, []);
this.sendIOPubMessage(data, set); 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);
}
} }
} }