fix(dialect): fix and support returning and raw

Author: subframe7536

packages/dialect-bun-worker/src/worker.ts

@@ -8,7 +8,7 @@ function run({ isSelect, sql, parameters }: RunMsg): QueryResult<any> {
   const stmt = db[cache ? 'query' : 'prepare'](sql)
   const rows = stmt.all(parameters as any)
 
-  if (isSelect) {
+  if (isSelect || rows.length) {
     return { rows }
   }
   return {

packages/dialect-tauri/README.md

@@ -31,9 +31,4 @@ export interface TauriSqlDialectConfig<T extends 'sqlite' | 'mysql' | 'postgres'
   type: T
   onCreateConnection?: (connection: DatabaseConnection) => Promisable<void>
 }
-```
-
-### known issue
-
-- no RETURNING support
-- only return rows when executing raw sql
+```

packages/dialect-tauri/src/driver.ts

@@ -83,18 +83,15 @@ class TauriSqlConnection implements DatabaseConnection {
   }
 
   async executeQuery<R>({ parameters, query, sql }: CompiledQuery<unknown>): Promise<QueryResult<R>> {
-    switch (query.kind) {
-      case 'SelectQueryNode':
-      case 'RawNode':
-        return { rows: await this.db.select<any>(sql, parameters) }
-      default: {
-        const { lastInsertId, rowsAffected } = await this.db.execute(sql, parameters)
-        return {
-          rows: [],
-          insertId: BigInt(lastInsertId),
-          numAffectedRows: BigInt(rowsAffected),
-        }
-      }
+    const rows = await this.db.select<any[]>(sql, parameters)
+    if (query.kind === 'SelectQueryNode' || rows.length) {
+      return { rows }
+    }
+    const { lastInsertId, rowsAffected } = await this.db.execute('select 1')
+    return {
+      rows,
+      insertId: BigInt(lastInsertId),
+      numAffectedRows: BigInt(rowsAffected),
     }
   }
 }

packages/dialect-tauri/src/index.ts

@@ -41,9 +41,6 @@ export class TauriSqlDialect<T extends 'sqlite' | 'mysql' | 'postgres'> {
    * dialect for Tauri,
    * using [official sql plugin](https://github.com/tauri-apps/plugins-workspace/tree/dev/plugins/sql),
    * support MySQL, PostgreSQL and SQLite
-   *
-   * - no `RETURNING` support
-   * - only return rows when executing raw sql
    */
   constructor(config: TauriSqlDialectConfig<T>) {
     this.#config = {

packages/dialect-wasm/README.md

@@ -31,7 +31,7 @@ you can **get total buffer** on every sql execution except `select` and **no bac
 
 #### `OfficialWasmDialect`: performance
 
-you can choose to use [OPFS](https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API#origin_private_file_system) as backend storage(your server must response [COOP and COEP](https://sqlite.org/wasm/doc/trunk/persistence.md#coop-coep) in header), which is recommended officially (see [this](https://sqlite.org/forum/forumpost/59097f57cbe647a2d1950fab93e7ab82dd24c1e384d38b90ec1e2f03a2a4e580) and [this](https://sqlite.org/forum/forumpost/8f50dc99149a6cedade784595238f45aa912144fae81821d5f9db31965f754dd)) and **only work in WebWorker**.
+you can choose to use [OPFS](https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API#origin_private_file_system) as backend storage(for some vfs, your server must response COOP and COEP in header, see [doc](https://sqlite.org/wasm/doc/trunk/persistence.md#coop-coep)), which is recommended officially (see [this](https://sqlite.org/forum/forumpost/59097f57cbe647a2d1950fab93e7ab82dd24c1e384d38b90ec1e2f03a2a4e580) and [this](https://sqlite.org/forum/forumpost/8f50dc99149a6cedade784595238f45aa912144fae81821d5f9db31965f754dd)) and **only work in WebWorker**.
 
 #### `WaSqliteDialect`: polyfill
 
@@ -43,9 +43,6 @@ you can choose not only `OPFS` but also `IndexedDB` as backend storage for bette
 
 you can choose to use `native file system` as backend storage, which is no need to recompile for different platform
 
-- no `RETURNING` support
-- only return rows when executing raw sql
-
 #### `CrsqliteDialect`: CRDT
 
 you can choose to use `IndexedDB` as backend storage

packages/dialect-wasm/src/baseDriver.ts

@@ -60,23 +60,23 @@ class ConnectionMutex {
   }
 }
 
-export type ExecuteReturn = Promise<
-  Pick<QueryResult<any>, 'insertId' | 'rows' | 'numAffectedRows'>
->
-export type QueryReturn = Promise<
-  Pick<QueryResult<any>, 'rows'>
->
+export type InfoReturn = Promise<Pick<QueryResult<any>, 'insertId' | 'numAffectedRows'>>
+export type QueryReturn = Promise<Pick<QueryResult<any>, 'rows'>['rows']>
 
 export abstract class BaseSqliteConnection implements DatabaseConnection {
-  abstract query(sql: string, param?: any[]): QueryReturn
-  abstract execute(sql: string, param?: any[]): ExecuteReturn
+  abstract query(sql: string, params?: any[]): QueryReturn
+  abstract info(): InfoReturn
   streamQuery<R>(): AsyncIterableIterator<QueryResult<R>> {
     throw new Error('SQLite driver doesn\'t support streaming')
   }
 
   async executeQuery<R>({ parameters, query, sql }: CompiledQuery<unknown>): Promise<QueryResult<R>> {
-    return query.kind === 'SelectQueryNode'
-      ? await this.query(sql, parameters as any[])
-      : await this.execute(sql, parameters as any[])
+    const rows = await this.query(sql, parameters as any[])
+    return query.kind === 'SelectQueryNode' || rows.length
+      ? { rows }
+      : {
+          rows,
+          ...await this.info(),
+        }
   }
 }

packages/dialect-wasm/src/crsqlite-dialect/driver.ts

@@ -1,4 +1,4 @@
-import type { ExecuteReturn, QueryReturn } from '../baseDriver'
+import type { InfoReturn, QueryReturn } from '../baseDriver'
 import { BaseDriver, BaseSqliteConnection } from '../baseDriver'
 import type { CrSqliteDB } from './type'
 import type { CrSqliteDialectConfig } from '.'
@@ -31,16 +31,14 @@ class CrSqliteConnection extends BaseSqliteConnection {
     this.db = db
   }
 
-  async query(sql: string, param?: any[]): QueryReturn {
-    return { rows: await this.db.execO(sql, param) }
+  async query(sql: string, params?: any[]): QueryReturn {
+    return await this.db.execO(sql, params as any[])
   }
 
-  async execute(sql: string, param?: any[]): ExecuteReturn {
-    const rows = await this.db.execO(sql, param)
+  async info(): InfoReturn {
     return {
-      rows,
       numAffectedRows: BigInt(this.db.api.changes(this.db.db)),
-      insertId: BigInt((await this.db.execA('SELECT last_insert_rowid() as id'))[0]),
+      insertId: BigInt((await this.db.execA('SELECT last_insert_rowid()'))[0]),
     }
   }
 }

packages/dialect-wasm/src/node-wasm-dialect/driver.ts

@@ -1,5 +1,5 @@
-import type { CompiledQuery, DatabaseConnection, QueryResult } from 'kysely'
-import { BaseDriver } from '../baseDriver'
+import type { InfoReturn, QueryReturn } from '../baseDriver'
+import { BaseDriver, BaseSqliteConnection } from '../baseDriver'
 import type { NodeWasmDataBase } from './type'
 import type { NodeWasmDialectConfig } from '.'
 
@@ -25,29 +25,22 @@ export class NodeWasmDriver extends BaseDriver {
   }
 }
 
-class NodeWasmConnection implements DatabaseConnection {
+class NodeWasmConnection extends BaseSqliteConnection {
   private db: NodeWasmDataBase
   constructor(db: any) {
+    super()
     this.db = db
   }
 
-  async executeQuery<R>({ parameters, query, sql }: CompiledQuery<unknown>): Promise<QueryResult<R>> {
-    switch (query.kind) {
-      case 'SelectQueryNode':
-      case 'RawNode':
-        return { rows: this.db.all(sql, parameters) }
-      default: {
-        const { changes, lastInsertRowid } = this.db.run(sql, parameters)
-        return {
-          rows: [],
-          insertId: BigInt(lastInsertRowid),
-          numAffectedRows: BigInt(changes),
-        }
-      }
-    }
+  async query(sql: string, params?: any[] | undefined): QueryReturn {
+    return this.db.all(sql, params)
   }
 
-  streamQuery<R>(): AsyncIterableIterator<QueryResult<R>> {
-    throw new Error('SQLite driver doesn\'t support streaming')
+  async info(): InfoReturn {
+    const { changes, lastInsertRowid } = this.db.run('select 1')
+    return {
+      numAffectedRows: BigInt(changes),
+      insertId: BigInt(lastInsertRowid),
+    }
   }
 }

packages/dialect-wasm/src/node-wasm-dialect/index.ts

@@ -13,9 +13,6 @@ export class NodeWasmDialect extends BaseDialect {
   config: NodeWasmDialectConfig
   /**
    * dialect for [node sqlite3 wasm](https://github.com/tndrle/node-sqlite3-wasm)
-   *
-   * - no `RETURNING` support
-   * - only return rows when executing raw sql
    */
   constructor(config: NodeWasmDialectConfig) {
     super()

packages/dialect-wasm/src/node-wasm-dialect/type.ts

@@ -8,6 +8,7 @@ export interface NodeWasmDBOptions {
 }
 
 export interface NodeWasmDataBase extends BaseDB {
+  get: (sql: string, param?: readonly unknown[]) => any
   all: (sql: string, param?: readonly unknown[]) => any[]
   run: (sql: string, param?: readonly unknown[]) => NodeWasmRunReturn
 }