normalizeStatement fixes

src/lib/normalize-statement.ts

@@ -1,12 +1,22 @@
-import { isSQLWrapper, type Query as DrizzleQuery } from 'drizzle-orm';
+import { isSQLWrapper } from 'drizzle-orm';
 import type { RunnableQuery } from 'drizzle-orm/runnable-query';
 import type { ReturningStatement, Statement } from '../types.js';
 import { sqlTag } from './sql-tag.js';
 
 function isDrizzleStatement<Result = unknown>(
 	statement: ReturningStatement<Result>
 ): statement is RunnableQuery<Result[], 'sqlite'> {
-	return '_' in statement && isSQLWrapper(statement);
+	return isSQLWrapper(statement);
+}
+
+function isStatement(statement: unknown): statement is Statement {
+	return (
+		typeof statement === 'object' &&
+		statement !== null &&
+		'sql' in statement === true &&
+		typeof statement.sql === 'string' &&
+		'params' in statement === true
+	);
 }
 
 export function normalizeStatement(
@@ -18,9 +28,15 @@ export function normalizeStatement(
 
 	if (isDrizzleStatement(statement)) {
 		if ('toSQL' in statement && typeof statement.toSQL === 'function') {
-			return statement.toSQL() as DrizzleQuery;
+			const drizzleStatement = statement.toSQL();
+
+			if (isStatement(drizzleStatement)) {
+				return drizzleStatement;
+			} else {
+				throw new Error('The passed Drizzle statement could not be parsed.');
+			}
 		} else {
-			throw new Error('The passed Drizzle statement could not be parsed.');
+			throw new Error('The passed statement could not be parsed.');
 		}
 	}