fix(sqlite): defer prepare errors (#162)

farnabaz · web-flow · commit dc21e0329993 · 2025-04-18T12:24:24.000+02:00
diff --git a/src/connectors/better-sqlite3.ts b/src/connectors/better-sqlite3.ts
@@ -35,21 +35,21 @@ export default function sqliteConnector(opts: ConnectorOptions): Connector<Datab
     dialect: "sqlite",
     getInstance: () => getDB(),
     exec: sql => getDB().exec(sql),
-    prepare: sql => new StatementWrapper(getDB().prepare(sql))
+    prepare: sql => new StatementWrapper(() => getDB().prepare(sql))
   };
 }
 
-class StatementWrapper extends BoundableStatement<RawStatement> {
-  all(...params) {
-    return Promise.resolve(this._statement.all(...params));
+class StatementWrapper extends BoundableStatement<() => RawStatement> {
+  async all(...params) {
+    return this._statement().all(...params)
   }
 
-  run(...params) {
-    const res = this._statement.run(...params);
-    return Promise.resolve({ success: res.changes > 0, ...res });
+  async run(...params) {
+    const res = this._statement().run(...params)
+    return { success: res.changes > 0, ...res }
   }
 
-  get(...params) {
-    return Promise.resolve(this._statement.get(...params));
+  async get(...params) {
+    return this._statement().get(...params)
   }
 }
diff --git a/src/connectors/node-sqlite.ts b/src/connectors/node-sqlite.ts
@@ -42,21 +42,21 @@ export default function nodeSqlite3Connector(opts: ConnectorOptions): Connector<
       getDB().exec(sql)
       return { success: true }
     },
-    prepare: sql => new StatementWrapper(getDB().prepare(sql)),
+    prepare: sql => new StatementWrapper(() => getDB().prepare(sql)),
   }
 }
 
-class StatementWrapper extends BoundableStatement<StatementSync> {
+class StatementWrapper extends BoundableStatement<() => StatementSync> {
   async all(...params) {
-    const raws = this._statement.all(...params)
+    const raws = this._statement().all(...params)
     return raws
   }
   async run(...params) {
-    const res = this._statement.run(...params)
+    const res = this._statement().run(...params)
     return { success: true, ...res }
   }
   async get(...params) {
-    const raw = this._statement.get(...params)
+    const raw = this._statement().get(...params)
     return raw
   }
 }
diff --git a/src/connectors/sqlite3.ts b/src/connectors/sqlite3.ts
@@ -44,25 +44,37 @@ export default function nodeSqlite3Connector(opts: ConnectorOptions): Connector<
     dialect: 'sqlite',
     getInstance: () => getDB(),
     exec: (sql: string) => query(sql),
-    prepare: sql => new StatementWrapper(getDB().prepare(sql)),
+    prepare: (sql) => new StatementWrapper(sql, getDB())
   }
 }
 
 class StatementWrapper extends BoundableStatement<sqlite3.Statement> {
+  #onError?: (err: Error | null) => void  // #162
+
+  constructor(sql: string, db: sqlite3.Database) {
+    super(db.prepare(sql, (err) => {
+      if (err && this.#onError) {
+        return this.#onError(err);
+      }
+    }))
+  }
   async all(...params) {
     const rows = await new Promise<unknown[]>((resolve, reject) => {
+      this.#onError = reject
       this._statement.all(...params, (err, rows) => err ? reject(err) : resolve(rows))
     })
     return rows
   }
   async run(...params) {
     await new Promise<void>((resolve, reject) => {
+      this.#onError = reject
       this._statement.run(...params, (err) => err ? reject(err) : resolve())
     })
     return { success: true }
   }
   async get(...params) {
     const row = await new Promise((resolve, reject) => {
+      this.#onError = reject
       this._statement.get(...params, (err, row) => err ? reject(err) : resolve(row))
     })
     return row
diff --git a/test/connectors/_tests.ts b/test/connectors/_tests.ts
@@ -61,4 +61,8 @@ export function testConnector<TConnector extends Connector = Connector>(opts: {
     const { rows } = await db.sql`SELECT * FROM users WHERE id = ${userId}`;
     expect(rows).toMatchInlineSnapshot(userSnapshot);
   });
+
+  it("deferred prepare errors", async () => {
+    await expect(db.prepare("SELECT * FROM non_existing_table").all()).rejects.toThrowError("non_existing_table")
+  });
 }

Original file line number	Diff line number	Diff line change
`@@ -35,21 +35,21 @@ export default function sqliteConnector(opts: ConnectorOptions): Connector<Datab`
`35`	`35`	`dialect: "sqlite",`
`36`	`36`	`getInstance: () => getDB(),`
`37`	`37`	`exec: sql => getDB().exec(sql),`
`38`		`- prepare: sql => new StatementWrapper(getDB().prepare(sql))`
	`38`	`+ prepare: sql => new StatementWrapper(() => getDB().prepare(sql))`
`39`	`39`	`};`
`40`	`40`	`}`
`41`	`41`
`42`		`-class StatementWrapper extends BoundableStatement<RawStatement> {`
`43`		`- all(...params) {`
`44`		`- return Promise.resolve(this._statement.all(...params));`
	`42`	`+class StatementWrapper extends BoundableStatement<() => RawStatement> {`
	`43`	`+ async all(...params) {`
	`44`	`+ return this._statement().all(...params)`
`45`	`45`	`}`
`46`	`46`
`47`		`- run(...params) {`
`48`		`- const res = this._statement.run(...params);`
`49`		`- return Promise.resolve({ success: res.changes > 0, ...res });`
	`47`	`+ async run(...params) {`
	`48`	`+ const res = this._statement().run(...params)`
	`49`	`+ return { success: res.changes > 0, ...res }`
`50`	`50`	`}`
`51`	`51`
`52`		`- get(...params) {`
`53`		`- return Promise.resolve(this._statement.get(...params));`
	`52`	`+ async get(...params) {`
	`53`	`+ return this._statement().get(...params)`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,21 +42,21 @@ export default function nodeSqlite3Connector(opts: ConnectorOptions): Connector<`
`42`	`42`	`getDB().exec(sql)`
`43`	`43`	`return { success: true }`
`44`	`44`	`},`
`45`		`- prepare: sql => new StatementWrapper(getDB().prepare(sql)),`
	`45`	`+ prepare: sql => new StatementWrapper(() => getDB().prepare(sql)),`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-class StatementWrapper extends BoundableStatement<StatementSync> {`
	`49`	`+class StatementWrapper extends BoundableStatement<() => StatementSync> {`
`50`	`50`	`async all(...params) {`
`51`		`- const raws = this._statement.all(...params)`
	`51`	`+ const raws = this._statement().all(...params)`
`52`	`52`	`return raws`
`53`	`53`	`}`
`54`	`54`	`async run(...params) {`
`55`		`- const res = this._statement.run(...params)`
	`55`	`+ const res = this._statement().run(...params)`
`56`	`56`	`return { success: true, ...res }`
`57`	`57`	`}`
`58`	`58`	`async get(...params) {`
`59`		`- const raw = this._statement.get(...params)`
	`59`	`+ const raw = this._statement().get(...params)`
`60`	`60`	`return raw`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,8 @@ export function testConnector<TConnector extends Connector = Connector>(opts: {`
`61`	`61`	const { rows } = await db.sql`SELECT * FROM users WHERE id = ${userId}`;
`62`	`62`	`expect(rows).toMatchInlineSnapshot(userSnapshot);`
`63`	`63`	`});`
	`64`	`+`
	`65`	`+ it("deferred prepare errors", async () => {`
	`66`	`+ await expect(db.prepare("SELECT * FROM non_existing_table").all()).rejects.toThrowError("non_existing_table")`
	`67`	`+ });`
`64`	`68`	`}`