fix: specify missing numeric types as numbers

Author: eEQK

README.md

@@ -45,7 +45,7 @@ WHERE id = $1 LIMIT 1;
 const name = await Authors.get(sql, {id: 1});
 typeof name // string
 
-await Authors.get(sql, {id: 9999}); // error thrown
+await Authors.get(sql, {id: nonExistingId}); // error
 ```
 
 ### Export specific queries in a module

examples/authors/postgresql/query1.sql

@@ -14,6 +14,9 @@ ORDER BY name;
 SELECT name FROM authors
 where id = $1 limit 1;
 
+-- name: GetCount :one
+SELECT count(id) FROM authors;
+
 -- name: Read_Nested_List :many
 SELECT * FROM authors
 ORDER BY name;

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

@@ -7,10 +7,10 @@ export module Read {
 SELECT id, name, bio FROM authors
 WHERE id = $1 LIMIT 1`;
     export interface GetAuthorArgs {
-        id: string;
+        id: number;
     }
     export interface GetAuthorRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }
@@ -33,7 +33,7 @@ WHERE id = $1 LIMIT 1`;
 SELECT id, name, bio FROM authors
 ORDER BY name`;
     export interface ListAuthorsRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }
@@ -48,7 +48,7 @@ ORDER BY name`;
 SELECT name FROM authors
 where id = $1 limit 1`;
     export interface GetNameByIdArgs {
-        id: string;
+        id: number;
     }
     export async function getNameById(sql: Sql, args: GetNameByIdArgs): Promise<string> {
         const rows = await sql.unsafe(getNameByIdQuery, [args.id]).values();
@@ -61,12 +61,25 @@ where id = $1 limit 1`;
         }
         return row[0];
     }
+    const getCountQuery = `-- name: GetCount :one
+SELECT count(id) FROM authors`;
+    export async function getCount(sql: Sql): Promise<number> {
+        const rows = await sql.unsafe(getCountQuery, []).values();
+        if (rows.length !== 1) {
+            throw new Error(`expected 1 row, got ${rows.length}`);
+        }
+        const row = rows[0];
+        if (!row) {
+            throw new Error("query returned empty row");
+        }
+        return row[0];
+    }
     export module Nested {
         const listQuery = `-- name: Read_Nested_List :many
 SELECT id, name, bio FROM authors
 ORDER BY name`;
         export interface ListRow {
-            id: string;
+            id: number;
             name: string;
             bio: string | null;
         }

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

@@ -7,7 +7,7 @@ export module Update {
 DELETE FROM authors
 WHERE id = $1`;
     export interface DeleteAuthorArgs {
-        id: string;
+        id: number;
     }
     export async function deleteAuthor(sql: Sql, args: DeleteAuthorArgs): Promise<void> {
         await sql.unsafe(deleteAuthorQuery, [args.id]);
@@ -24,7 +24,7 @@ RETURNING id, name, bio`;
         bio: string | null;
     }
     export interface CreateAuthorRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }

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

@@ -7,10 +7,10 @@ export module Read {
 SELECT id, name, bio FROM authors
 WHERE id = $1 LIMIT 1`;
     export interface GetAuthorArgs {
-        id: string;
+        id: number;
     }
     export interface GetAuthorRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }
@@ -33,7 +33,7 @@ WHERE id = $1 LIMIT 1`;
 SELECT id, name, bio FROM authors
 ORDER BY name`;
     export interface ListAuthorsRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }
@@ -48,7 +48,7 @@ ORDER BY name`;
 SELECT name FROM authors
 where id = $1 limit 1`;
     export interface GetNameByIdArgs {
-        id: string;
+        id: number;
     }
     export async function getNameById(sql: Sql, args: GetNameByIdArgs): Promise<string> {
         const rows = await sql.unsafe(getNameByIdQuery, [args.id]).values();
@@ -61,12 +61,25 @@ where id = $1 limit 1`;
         }
         return row[0];
     }
+    const getCountQuery = `-- name: GetCount :one
+SELECT count(id) FROM authors`;
+    export async function getCount(sql: Sql): Promise<number> {
+        const rows = await sql.unsafe(getCountQuery, []).values();
+        if (rows.length !== 1) {
+            throw new Error(`expected 1 row, got ${rows.length}`);
+        }
+        const row = rows[0];
+        if (!row) {
+            throw new Error("query returned empty row");
+        }
+        return row[0];
+    }
     export module Nested {
         const listQuery = `-- name: Read_Nested_List :many
 SELECT id, name, bio FROM authors
 ORDER BY name`;
         export interface ListRow {
-            id: string;
+            id: number;
             name: string;
             bio: string | null;
         }

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

@@ -7,7 +7,7 @@ export module Update {
 DELETE FROM authors
 WHERE id = $1`;
     export interface DeleteAuthorArgs {
-        id: string;
+        id: number;
     }
     export async function deleteAuthor(sql: Sql, args: DeleteAuthorArgs): Promise<void> {
         await sql.unsafe(deleteAuthorQuery, [args.id]);
@@ -24,7 +24,7 @@ RETURNING id, name, bio`;
         bio: string | null;
     }
     export interface CreateAuthorRow {
-        id: string;
+        id: number;
         name: string;
         bio: string | null;
     }

src/drivers/postgres.ts

@@ -13,7 +13,6 @@ import { argName, colName } from "./utlis";
 const typeMapping = {
 	string: [
 		"aclitem",
-		"bigserial",
 		"bit",
 		"box",
 		"bpchar",
@@ -49,6 +48,14 @@ const typeMapping = {
 		"xml",
 	],
 	number: [
+		"bigint",
+		"bigserial",
+		"smallserial",
+		"double precision",
+		"real",
+		"decimal",
+		"integer",
+		"smallint",
 		"int2",
 		"int4",
 		"int8",