From 460c32f06d71081ab2a5203a5ddc445e727ac922 Mon Sep 17 00:00:00 2001 From: Dallas Hoffman Date: Sat, 20 Jul 2024 15:59:10 -0400 Subject: [PATCH] Remove usage of normalizeStatement for now --- src/client.ts | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/client.ts b/src/client.ts index 5234183..597bad8 100644 --- a/src/client.ts +++ b/src/client.ts @@ -17,12 +17,10 @@ import type { ScalarUserFunction, GetInfoMessage, Statement, - ReturningStatement, DatabaseInfo, } from './types.js'; import { sqlTag } from './lib/sql-tag.js'; import { convertRowsToObjects } from './lib/convert-rows-to-objects.js'; -import { normalizeStatement } from './lib/normalize-statement.js'; export class SQLocal { protected databasePath: string; @@ -179,15 +177,6 @@ export class SQLocal { return data; }; - protected execAndConvert = async >( - statement: ReturningStatement - ): Promise => { - const { sql, params } = normalizeStatement(statement); - const { rows, columns } = await this.exec(sql, params, 'all'); - const resultRecords = convertRowsToObjects(rows, columns); - return resultRecords as T[]; - }; - sql = async >( queryTemplate: TemplateStringsArray | string, ...params: unknown[] @@ -200,8 +189,13 @@ export class SQLocal { statement = sqlTag(queryTemplate, ...params); } - const resultRecords = await this.execAndConvert(statement); - return resultRecords; + const { rows, columns } = await this.exec( + statement.sql, + statement.params, + 'all' + ); + const resultRecords = convertRowsToObjects(rows, columns); + return resultRecords as T[]; }; transaction = async (