@uwdata/mosaic-duckdb 0.10.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-duckdb",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "A Promise-based DuckDB API and Node.js data server.",
   "keywords": [
     "duckdb",
@@ -26,12 +26,13 @@
   "scripts": {
     "lint": "eslint src test",
     "server": "node bin/run-server.js",
-    "test": "mocha 'test/**/*-test.js'",
+    "test": "vitest run",
     "prepublishOnly": "npm run test && npm run lint"
   },
   "dependencies": {
-    "duckdb": "^1.0.0",
-    "ws": "^8.17.1"
+    "@uwdata/mosaic-sql": "^0.12.0",
+    "duckdb": "^1.1.3",
+    "ws": "^8.18.0"
   },
-  "gitHead": "94fc4f0d4efc622001f6afd6714d1e9dda745be2"
+  "gitHead": "523b1afe2a0880291c92f81e4a7b91829362d285"
 }

package/src/DuckDB.js

@@ -114,7 +114,7 @@ export class DuckDBStatement {
 
   arrowBuffer(params) {
     return new Promise((resolve, reject) => {
-      this.con.arrowIPCAll(...params, (err, result) => {
+      this.statement.arrowIPCAll(...params, (err, result) => {
         if (err) {
           reject(err);
         } else {

package/src/data-server.js

@@ -19,10 +19,11 @@ export function dataServer(db, {
   const app = createHTTPServer(handleQuery, rest);
   if (socket) createSocketServer(app, handleQuery);
 
-  app.listen(port);
+  const server = app.listen(port);
   console.log(`Data server running on port ${port}`);
   if (rest) console.log(`  http://localhost:${port}/`);
   if (socket) console.log(`  ws://localhost:${port}/`);
+  return server;
 }
 
 function createHTTPServer(handleQuery, rest) {
@@ -103,7 +104,7 @@ export function queryHandler(db, queryCache) {
 
     try {
       const { sql, type = 'json' } = query;
-      console.log(`> ${type.toUpperCase()}${sql ? ' ' + sql : ''}`);
+      console.log(`> ${type.toUpperCase()}${sql ? ` ${sql}` : ''}`);
 
       // process query and return result
       switch (type) {

package/src/load/bundle.js

@@ -67,9 +67,9 @@ export async function loadBundle(db, cache, dir) {
     cache.set(key, json ? JSON.parse(data) : data);
   }
 
-  // load precomputed temp tables into the database
+  // load precomputed tables into the database
   for (const table of manifest.tables) {
     const file = path.resolve(dir, `${table}.parquet`);
-    await db.exec(`CREATE TEMP TABLE IF NOT EXISTS ${table} AS SELECT * FROM '${file}'`);
+    await db.exec(`CREATE TABLE IF NOT EXISTS ${table} AS SELECT * FROM '${file}'`);
   }
 }

package/src/load/csv.js

@@ -1,9 +1,5 @@
-import { createTable } from './create-table.js';
-import { parameters } from './parameters.js';
+import { loadCSV as loadCSVSQL } from '@uwdata/mosaic-sql';
 
 export function loadCSV(db, tableName, fileName, options = {}) {
-  const { select = ['*'], temp, replace, ...csvOptions } = options;
-  const params = parameters({ auto_detect: true, sample_size: -1, ...csvOptions });
-  const query = `SELECT ${select.join(', ')} FROM read_csv('${fileName}', ${params})`;
-  return createTable(db, tableName, query, { temp, replace });
+  return db.exec(loadCSVSQL(tableName, fileName, options));
 }

package/src/load/json.js

@@ -1,9 +1,5 @@
-import { createTable } from './create-table.js';
-import { parameters } from './parameters.js';
+import { loadJSON as loadJSONSQL } from '@uwdata/mosaic-sql';
 
 export function loadJSON(db, tableName, fileName, options = {}) {
-  const { select = ['*'], temp, replace, ...jsonOptions } = options;
-  const params = parameters({ auto_detect: true, json_format: 'auto', ...jsonOptions });
-  const query = `SELECT ${select.join(', ')} FROM read_json('${fileName}', ${params})`;
-  return createTable(db, tableName, query, { temp, replace });
+  return db.exec(loadJSONSQL(tableName, fileName, options));
 }

package/src/load/parquet.js

@@ -1,7 +1,5 @@
-import { createTable } from './create-table.js';
+import { loadParquet as loadParquetSQL } from '@uwdata/mosaic-sql';
 
 export function loadParquet(db, tableName, fileName, options = {}) {
-  const { select = ['*'], ...tableOptions } = options;
-  const query = `SELECT ${select.join(', ')} FROM read_parquet('${fileName}')`;
-  return createTable(db, tableName, query, tableOptions);
+  return db.exec(loadParquetSQL(tableName, fileName, options));
 }

package/src/load/create-table.js

@@ -1,6 +0,0 @@
-export function createTable(db, name, as, options = {}) {
-  const { temp, replace } = options;
-  const create = `CREATE${replace ? ' OR REPLACE' : ''}`;
-  const type = `${temp ? 'TEMP ' : ''}TABLE${replace ? '' : ' IF NOT EXISTS'}`;
-  return db.exec(`${create} ${type} ${name} AS ${as}`);
-}

package/src/load/parameters.js

@@ -1,11 +0,0 @@
-export function parameters(options) {
-  return Object.entries(options)
-    .map(([key, value]) => {
-      const t = typeof value;
-      const v = t === 'boolean' ? String(value)
-        : t === 'string' ? `'${value}'`
-        : value;
-      return `${key}=${v}`;
-    })
-    .join(', ');
-}