Merge #70

70: Fix JavaScript client r=penberg a=penberg



Co-authored-by: Pekka Enberg <[email protected]>

Author: bors[bot]

packages/libsql-client/package-lock.json

@@ -28,13 +28,14 @@
         "lib/**/*"
     ],
     "devDependencies": {
+        "@types/better-sqlite3": "^7.6.3",
         "@types/jest": "^29.2.5",
         "jest": "^29.3.1",
         "ts-jest": "^29.0.3",
         "typescript": "^4.9.4"
     },
     "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "sqlite3": "^5.1.2"
+        "better-sqlite3": "^8.0.1",
+        "cross-fetch": "^3.1.5"
     }
 }

packages/libsql-client/package.json

@@ -1,9 +1,14 @@
 import { connect } from "../";
 
 test("execute", async () => {
-  const config = { url: "file::memory:" };
+  const url = process.env.DB_URL ?? "file::memory:";
+  const config = { url };
   const db = connect(config);
-  await db.execute("CREATE TABLE users (email TEXT)");
-  const stmt = db.execute("SELECT * FROM users");
-  // TODO: check results
+  await db.execute("CREATE TABLE IF NOT EXISTS users (email TEXT)");
+  await db.execute("DELETE FROM users");
+  await db.execute("INSERT INTO users (email) VALUES ('[email protected]')");
+  await db.execute("INSERT INTO users (email) VALUES ('[email protected]')");
+  const rs = await db.execute("SELECT * FROM users");
+  expect(rs.columns).toEqual(['email']);
+  expect(rs.rows).toEqual([['[email protected]'], ['[email protected]']]);
 });

packages/libsql-client/src/__tests__/libsql-js.test.ts

@@ -17,16 +17,9 @@ export class HttpDriver implements Driver {
             method: 'POST',
             body: JSON.stringify(query),
         });
-        const results = await response.json() as Row[][];
+        const results = await response.json() as any[];
         return results.map(rs => {
-            return {
-                results: rs,
-                success: true,
-                meta: {
-                    duration: 0,
-                },
-            };
+            return rs.results as ResultSet;
         });
     }
-
 }

packages/libsql-client/src/lib/driver/HttpDriver.ts

@@ -1,11 +1,11 @@
-import * as sqlite3 from "sqlite3";
+import DatabaseConstructor, {Database} from "better-sqlite3";
 import { ResultSet } from "../libsql-js";
 import { Driver } from "./Driver";
 
 export class SqliteDriver implements Driver {
-    db: sqlite3.Database;
+    db: Database;
     constructor(url: string) {
-        this.db = new sqlite3.Database(url, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE | sqlite3.OPEN_FULLMUTEX | sqlite3.OPEN_URI);
+        this.db = new DatabaseConstructor(url.substring(5))
     }
     async transaction(sqls: string[]): Promise<ResultSet[]> {
         const result = [];
@@ -17,17 +17,29 @@ export class SqliteDriver implements Driver {
     }
     async execute(sql: string): Promise<ResultSet> {
         return await new Promise(resolve => {
-            this.db.all(sql, (err, rows) => {
-                // FIXME: error handling
-                const rs = {
-                    results: rows,
-                    success: true,
-                    meta: {
-                        duration: 0,
-                    },
-                };
-                resolve(rs);
-            })
+            const stmt = this.db.prepare(sql);
+            var columns: string[];
+            var rows: any[];
+            if (stmt.reader) {
+                columns = stmt.columns().map(c => c.name);
+                rows = stmt.all().map(row => {
+                    return columns.map(column => row[column]);
+                });
+            } else {
+                columns = [];
+                rows = [];
+                stmt.run();
+            }
+            // FIXME: error handling
+            const rs = {
+                columns,
+                rows,
+                success: true,
+                meta: {
+                    duration: 0,
+                },
+            };
+            resolve(rs);
         });
     }
 }

packages/libsql-client/src/lib/driver/SqliteDriver.ts

@@ -15,10 +15,14 @@ export type Row = Record<string, string | number | boolean | null>;
  * A SQL query result set.
  */
 export type ResultSet = {
+  /**
+   * Query result columns.
+   */
+  columns: string[] | null;
   /**
    * Query results.
    */
-  results: Row[] | null;
+  rows: Row[] | null;
   /**
    * Was the query successful?
    */

packages/libsql-client/src/lib/libsql-js.ts

@@ -3,6 +3,7 @@
     "target": "es5",
     "module": "commonjs",
     "moduleResolution": "node",
+    "esModuleInterop": true,
     "declaration": true,
     "outDir": "./lib",
     "strict": true