Don't include columns in query JSON, refs #2136

datasette/renderer.py

@@ -27,7 +27,7 @@ def convert_specific_columns_to_json(rows, columns, json_cols):
     return new_rows
 
 
-def json_renderer(args, data, error, truncated=None):
+def json_renderer(request, args, data, error, truncated=None):
     """Render a response as JSON"""
     status_code = 200
 
@@ -106,6 +106,12 @@ def json_renderer(args, data, error, truncated=None):
             "status": 400,
             "title": None,
         }
+
+    # Don't include "columns" in output
+    # https://github.com/simonw/datasette/issues/2136
+    if isinstance(data, dict) and "columns" not in request.args.getlist("_extra"):
+        data.pop("columns", None)
+
     # Handle _nl option for _shape=array
     nl = args.get("_nl", "")
     if nl and shape == "array":

datasette/views/database.py

@@ -548,7 +548,7 @@ class QueryView(View):
                 error=query_error,
                 # These will be deprecated in Datasette 1.0:
                 args=request.args,
-                data={"rows": rows, "columns": columns},
+                data={"ok": True, "rows": rows, "columns": columns},
             )
             if asyncio.iscoroutine(result):
                 result = await result

tests/test_api.py

@@ -649,7 +649,6 @@ async def test_custom_sql(ds_client):
             {"content": "RENDER_CELL_DEMO"},
             {"content": "RENDER_CELL_ASYNC"},
         ],
-        "columns": ["content"],
         "ok": True,
         "truncated": False,
     }

tests/test_cli_serve_get.py

@@ -34,11 +34,12 @@ def test_serve_with_get(tmp_path_factory):
             "/_memory.json?sql=select+sqlite_version()",
         ],
     )
-    assert 0 == result.exit_code, result.output
+    assert result.exit_code == 0, result.output
-    assert {
+    data = json.loads(result.output)
-        "truncated": False,
+    # Should have a single row with a single column
-        "columns": ["sqlite_version()"],
+    assert len(data["rows"]) == 1
-    }.items() <= json.loads(result.output).items()
+    assert list(data["rows"][0].keys()) == ["sqlite_version()"]
+    assert set(data.keys()) == {"rows", "ok", "truncated"}
 
     # The plugin should have created hello.txt
     assert (plugins_dir / "hello.txt").read_text() == "hello"