fix: do not make fields for non-embeds singular

Author: eEQK

src/drivers/postgres.ts

@@ -477,7 +477,11 @@ export class Driver {
 		return factory.createObjectLiteralExpression(
 			columns.map((col, i) =>
 				factory.createPropertyAssignment(
-					factory.createIdentifier(singularize(colName(i, col))),
+					factory.createIdentifier(
+						embeds.has(col.name)
+							? singularize(colName(i, col))
+							: colName(i, col),
+					),
 					!embeds.has(col.name)
 						? this.buildColumnAccessExpression(col, "row", i)
 						: factory.createObjectLiteralExpression(

test/cases/embed.test.ts

@@ -6,6 +6,9 @@ await prepare(sql`
     SELECT e.*, sqlc.embed(a) FROM emails e
         join authors a on a.name = 'John Doe'
         limit 1;
+
+    -- name: AuthorExists :one
+    SELECT 1::int as noPrimitiveReturn, exists(select 1 from authors where name = 'John Doe') as exists;
 `);
 
 describe("sqlc.embed", () => {
@@ -21,4 +24,10 @@ describe("sqlc.embed", () => {
 			born: new Date("1990-02-09"),
 		});
 	});
+
+	it("only singularizes fields for embeds", async () => {
+		const result = await gen().authorExists(db);
+		console.log(result);
+		expect(result.exists).toBe(true);
+	});
 });