Fix generation for scalar queries

Author: AdamVig

examples/authors/postgresql/query.sql

@@ -17,3 +17,7 @@ RETURNING *;
 -- name: DeleteAuthor :exec
 DELETE FROM authors
 WHERE id = $1;
+
+-- name: CountAuthors :one
+SELECT COUNT(*)::bigint
+FROM authors;

examples/bun-pg/src/db/query_sql.ts

@@ -115,3 +115,26 @@ export async function deleteAuthor(client: Client, args: DeleteAuthorArgs): Prom
     });
 }
 
+export const countAuthorsQuery = `-- name: CountAuthors :one
+SELECT COUNT(*)::bigint
+FROM authors`;
+
+export interface CountAuthorsRow {
+    col_0: string;
+}
+
+export async function countAuthors(client: Client): Promise<CountAuthorsRow | null> {
+    const result = await client.query({
+        text: countAuthorsQuery,
+        values: [],
+        rowMode: "array"
+    });
+    if (result.rows.length !== 1) {
+        return null;
+    }
+    const row = result.rows[0];
+    return {
+        col_0: row[0]
+    };
+}
+

examples/bun-postgres/src/db/query_sql.ts

@@ -98,3 +98,25 @@ export async function deleteAuthor(sql: Sql, args: DeleteAuthorArgs): Promise<vo
     await sql.unsafe(deleteAuthorQuery, [args.id]);
 }
 
+export const countAuthorsQuery = `-- name: CountAuthors :one
+SELECT COUNT(*)::bigint
+FROM authors`;
+
+export interface CountAuthorsRow {
+    col_0: string;
+}
+
+export async function countAuthors(sql: Sql): Promise<CountAuthorsRow | null> {
+    const rows = await sql.unsafe(countAuthorsQuery, []).values();
+    if (rows.length !== 1) {
+        return null;
+    }
+    const row = rows[0];
+    if (!row) {
+        return null;
+    }
+    return {
+        col_0: row[0]
+    };
+}
+

examples/node-pg/src/db/query_sql.ts

@@ -115,3 +115,26 @@ export async function deleteAuthor(client: Client, args: DeleteAuthorArgs): Prom
     });
 }
 
+export const countAuthorsQuery = `-- name: CountAuthors :one
+SELECT COUNT(*)::bigint
+FROM authors`;
+
+export interface CountAuthorsRow {
+    col_0: string;
+}
+
+export async function countAuthors(client: Client): Promise<CountAuthorsRow | null> {
+    const result = await client.query({
+        text: countAuthorsQuery,
+        values: [],
+        rowMode: "array"
+    });
+    if (result.rows.length !== 1) {
+        return null;
+    }
+    const row = result.rows[0];
+    return {
+        col_0: row[0]
+    };
+}
+

examples/node-postgres/src/db/query_sql.ts

@@ -98,3 +98,25 @@ export async function deleteAuthor(sql: Sql, args: DeleteAuthorArgs): Promise<vo
     await sql.unsafe(deleteAuthorQuery, [args.id]);
 }
 
+export const countAuthorsQuery = `-- name: CountAuthors :one
+SELECT COUNT(*)::bigint
+FROM authors`;
+
+export interface CountAuthorsRow {
+    col_0: string;
+}
+
+export async function countAuthors(sql: Sql): Promise<CountAuthorsRow | null> {
+    const rows = await sql.unsafe(countAuthorsQuery, []).values();
+    if (rows.length !== 1) {
+        return null;
+    }
+    const row = rows[0];
+    if (!row) {
+        return null;
+    }
+    return {
+        col_0: row[0]
+    };
+}
+

src/drivers/utlis.ts

@@ -7,7 +7,7 @@ export function fieldName(
   column?: Column
 ): string {
   let name = `${prefix}_${index}`;
-  if (column) {
+  if (column?.name) {
     name = column.name;
   }
   return name