@sqlanvil/cli 1.8.2 → 1.8.3

package/bundle.js

@@ -43209,18 +43209,19 @@ class MysqlExecutionSql {
     publishTasks(table, runConfig, tableMetadata) {
         const tasks = new Tasks();
         const target = this.resolveTarget(table.target);
+        this.preOps(table, runConfig, tableMetadata).forEach(task => tasks.add(task));
         if (table.enumType === sqlanvil.TableType.VIEW) {
             if (table.materialized) {
                 tasks.add(Task.statement(this.dropIfExists(table.target, sqlanvil.TableMetadata.Type.VIEW)));
                 tasks.add(Task.statement(this.dropIfExists(table.target, sqlanvil.TableMetadata.Type.TABLE)));
                 tasks.add(Task.statement(`create table ${target}${this.tableOptions(table)} as ${table.query}`));
                 this.createIndexes(table).forEach(stmt => tasks.add(Task.statement(stmt)));
-                return tasks;
             }
-            tasks.add(Task.statement(`create or replace view ${target} as ${table.query}`));
-            return tasks;
+            else {
+                tasks.add(Task.statement(`create or replace view ${target} as ${table.query}`));
+            }
         }
-        if (table.enumType === sqlanvil.TableType.INCREMENTAL) {
+        else if (table.enumType === sqlanvil.TableType.INCREMENTAL) {
             const fresh = !this.shouldWriteIncrementally(table, runConfig, tableMetadata);
             if (fresh) {
                 tasks.add(Task.statement(this.dropIfExists(table.target, sqlanvil.TableMetadata.Type.TABLE)));
@@ -43235,13 +43236,33 @@ class MysqlExecutionSql {
             else {
                 tasks.add(Task.statement(this.upsertInto(table, tableMetadata)));
             }
-            return tasks;
         }
-        tasks.add(Task.statement(this.dropIfExists(table.target, sqlanvil.TableMetadata.Type.TABLE)));
-        tasks.add(Task.statement(`create table ${target}${this.tableOptions(table)} as ${table.query}`));
-        this.createIndexes(table).forEach(stmt => tasks.add(Task.statement(stmt)));
+        else {
+            tasks.add(Task.statement(this.dropIfExists(table.target, sqlanvil.TableMetadata.Type.TABLE)));
+            tasks.add(Task.statement(`create table ${target}${this.tableOptions(table)} as ${table.query}`));
+            this.createIndexes(table).forEach(stmt => tasks.add(Task.statement(stmt)));
+        }
+        this.postOps(table, runConfig, tableMetadata).forEach(task => tasks.add(task));
         return tasks;
     }
+    preOps(table, runConfig, tableMetadata) {
+        let preOps = table.preOps;
+        if (semver__namespace.gt(this.sqlanvilCoreVersion, "1.4.8") &&
+            table.enumType === sqlanvil.TableType.INCREMENTAL &&
+            this.shouldWriteIncrementally(table, runConfig, tableMetadata)) {
+            preOps = table.incrementalPreOps;
+        }
+        return (preOps || []).map(pre => Task.statement(pre));
+    }
+    postOps(table, runConfig, tableMetadata) {
+        let postOps = table.postOps;
+        if (semver__namespace.gt(this.sqlanvilCoreVersion, "1.4.8") &&
+            table.enumType === sqlanvil.TableType.INCREMENTAL &&
+            this.shouldWriteIncrementally(table, runConfig, tableMetadata)) {
+            postOps = table.incrementalPostOps;
+        }
+        return (postOps || []).map(post => Task.statement(post));
+    }
     assertTasks(assertion, projectConfig) {
         const tasks = new Tasks();
         const target = this.resolveTarget(assertion.target);
@@ -43718,7 +43739,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.8.2";
+const version = "1.8.3";
 const dataformVersion = "3.0.60";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -44450,47 +44471,45 @@ function buildCopySql(selectSql, uri, format, options = {}) {
 }
 function loadDuckdb() {
     try {
-        return nativeRequire("duckdb");
+        return nativeRequire("@duckdb/node-api");
     }
     catch (e) {
-        throw new Error(`Exporting on Postgres/Supabase requires the optional "duckdb" dependency, which failed to ` +
-            `load: ${e.message}`);
+        throw new Error(`Exporting on Postgres/Supabase requires the optional "@duckdb/node-api" dependency, which ` +
+            `failed to load: ${e.message}`);
     }
 }
-function allAsync(conn, sql) {
-    return new Promise((resolve, reject) => {
-        conn.all(sql, (err, rows) => (err ? reject(err) : resolve(rows || [])));
-    });
+async function runAsync(conn, sql) {
+    await conn.run(sql);
 }
-function withConnection(fn) {
-    const duckdb = loadDuckdb();
-    const db = new duckdb.Database(":memory:");
-    const conn = db.connect();
+async function withConnection(fn) {
+    const { DuckDBInstance } = loadDuckdb();
+    const instance = await DuckDBInstance.create(":memory:");
+    const conn = await instance.connect();
     const done = () => {
         var _a, _b;
         try {
-            (_a = conn.close) === null || _a === void 0 ? void 0 : _a.call(conn);
+            (_a = conn.closeSync) === null || _a === void 0 ? void 0 : _a.call(conn);
         }
         catch (e) {
         }
         try {
-            (_b = db.close) === null || _b === void 0 ? void 0 : _b.call(db);
+            (_b = instance.closeSync) === null || _b === void 0 ? void 0 : _b.call(instance);
         }
         catch (e) {
         }
     };
-    const setup = !process.env.HOME
-        ? allAsync(conn, `SET home_directory='${os__namespace.tmpdir()}'`)
-        : Promise.resolve([]);
-    return setup
-        .then(() => fn(conn))
-        .then(result => {
+    try {
+        if (!process.env.HOME) {
+            await runAsync(conn, `SET home_directory='${os__namespace.tmpdir()}'`);
+        }
+        const result = await fn(conn);
         done();
         return result;
-    }, err => {
+    }
+    catch (e) {
         done();
-        throw err;
-    });
+        throw e;
+    }
 }
 async function runDuckdbExport(args) {
     const { spec, selectSql, pg, storage, actionName } = args;
@@ -44501,15 +44520,15 @@ async function runDuckdbExport(args) {
             `export to ${uri}.`);
     }
     return withConnection(async (conn) => {
-        await allAsync(conn, "INSTALL postgres; LOAD postgres; INSTALL httpfs; LOAD httpfs;");
-        await allAsync(conn, buildAttachSql(pg));
+        await runAsync(conn, "INSTALL postgres; LOAD postgres; INSTALL httpfs; LOAD httpfs;");
+        await runAsync(conn, buildAttachSql(pg));
         if (scheme !== "local") {
             const secret = buildSecretSql(scheme, storage[scheme]);
             if (secret) {
-                await allAsync(conn, secret);
+                await runAsync(conn, secret);
             }
         }
-        await allAsync(conn, buildCopySql(selectSql, uri, spec.format, spec.options || {}));
+        await runAsync(conn, buildCopySql(selectSql, uri, spec.format, spec.options || {}));
         return { destination: toCopyTarget(uri) };
     });
 }

package/package.json

@@ -1,9 +1,9 @@
 {
     "dependencies": {
+        "@duckdb/node-api": "^1.5.4-r.1",
         "@google-cloud/bigquery": "~8.3.0",
         "chokidar": "^3.5.3",
         "deepmerge": "^4.2.2",
-        "duckdb": "^1.4.0",
         "fs-extra": "^9.0.0",
         "glob": "13.0.6",
         "google-sql-syntax-ts": "^1.0.3",
@@ -63,7 +63,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.8.2",
+    "version": "1.8.3",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"