enh: databases API nits (#2666)

Co-authored-by: Henry Fontanier <henry@dust.tt>
dust-tt · Nov 24, 2023 · 669f535 · 669f535
1 parent 8b4ef32
commit 669f535
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/core/bin/dust_api.rs b/core/bin/dust_api.rs
@@ -2150,13 +2150,13 @@ async fn databases_query_run(
                 "Failed to run query",
                 Some(e),
             ),
-            Ok((rows, schema)) => (
+            Ok((results, schema)) => (
                 StatusCode::OK,
                 Json(APIResponse {
                     error: None,
                     response: Some(json!({
                         "schema": schema,
-                        "rows": rows,
+                        "results": results,
                     })),
                 }),
             ),

diff --git a/core/src/blocks/database.rs b/core/src/blocks/database.rs
@@ -112,7 +112,7 @@ impl Block for Database {
             ))?,
         };
 
-        let (rows, schema) = match database.query(env.store.clone(), &query).await {
+        let (results, schema) = match database.query(env.store.clone(), &query).await {
             Ok(r) => r,
             Err(e) => Err(anyhow!(
                 "Error querying database `{}` in data source `{}`: {}",
@@ -124,7 +124,7 @@ impl Block for Database {
 
         Ok(BlockResult {
             value: json!({
-                "rows": rows,
+                "results": results,
                 "schema": schema,
             }),
             meta: None,

diff --git a/front/lib/core_api.ts b/front/lib/core_api.ts
@@ -138,6 +138,10 @@ export type CoreAPIDatabaseRow = {
   value: Record<string, unknown>;
 };
 
+export type CoreAPIDatabaseResult = {
+  value: Record<string, unknown>;
+};
+
 export type CoreAPIDatabaseSchema = Record<
   string,
   {
@@ -1118,7 +1122,7 @@ export const CoreAPI = {
   }): Promise<
     CoreAPIResponse<{
       schema: CoreAPIDatabaseSchema;
-      rows: CoreAPIDatabaseRow[];
+      results: CoreAPIDatabaseResult[];
     }>
   > {
     const response = await fetch(

diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts
@@ -7,7 +7,7 @@ import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
 import {
   CoreAPI,
-  CoreAPIDatabaseRow,
+  CoreAPIDatabaseResult,
   CoreAPIDatabaseSchema,
 } from "@app/lib/core_api";
 import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
@@ -20,7 +20,7 @@ const GetDatabaseSchemaReqBodySchema = t.type({
 
 type QueryDatabaseSchemaResponseBody = {
   schema: CoreAPIDatabaseSchema;
-  rows: CoreAPIDatabaseRow[];
+  results: CoreAPIDatabaseResult[];
 };
 
 async function handler(
@@ -117,9 +117,9 @@ async function handler(
         });
       }
 
-      const { schema, rows } = queryRes.value;
+      const { schema, results } = queryRes.value;
 
-      return res.status(200).json({ schema, rows });
+      return res.status(200).json({ schema, results });
 
     default:
       return apiError(req, res, {