From 864f56db459da6ad10e8e290d0291070faf3aff9 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Thu, 8 Dec 2022 14:52:39 -0800 Subject: [PATCH 1/2] Server: remove stream_results from db options --- src/server/_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/_query.py b/src/server/_query.py index 69607255f..7f9f08012 100644 --- a/src/server/_query.py +++ b/src/server/_query.py @@ -239,7 +239,7 @@ def run_query(p: APrinter, query_tuple: Tuple[str, Dict[str, Any]]): query, params = query_tuple # limit rows + 1 for detecting whether we would have more full_query = text(limit_query(query, p.remaining_rows + 1)) - return db.execution_options(stream_results=True).execute(full_query, **params) + return db.execute(full_query, **params) def _identity_transform(row: Dict[str, Any], _: Row) -> Dict[str, Any]: From b9f71db33ce664f42bc7a7a250054cad03beee77 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Thu, 8 Dec 2022 14:55:54 -0800 Subject: [PATCH 2/2] CI: update tag to build image --- .github/workflows/ci.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5070eae06..053b51b7e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -106,7 +106,7 @@ jobs: image: needs: build # only on main and dev branch - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' + if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/ds/dev-no-streaming' runs-on: ubuntu-latest steps: @@ -131,6 +131,9 @@ jobs: if [ "$imageTag" = "main" ] ; then imageTag="latest" fi + if [ "$imageTag" = "ds/dev-no-streaming" ] ; then + imageTag="dev-no-streaming" + fi echo "::set-output name=tag::$imageTag" echo "::set-output name=repo::ghcr.io/${{ github.repository }}" - name: Push Dev Tag