@sqlanvil/cli 1.25.0 → 1.25.2

package/bundle.js

@@ -49219,7 +49219,15 @@ function verifyObjectMatchesProto(protoType, object, errorBehaviour = VerifyProt
     if (Array.isArray(object)) {
         throw ReferenceError(`Expected a top-level object, but found an array`);
     }
-    protoType.verify(object);
+    const verificationError = protoType.verify(object);
+    if (verificationError && verifyErrorIsNonPrimitiveInScalarField(verificationError, object)) {
+        if (errorBehaviour === VerifyProtoErrorBehaviour.SUGGEST_REPORTING_TO_DATAFORM_TEAM) {
+            throw ReferenceError(`Invalid property value: ${verificationError}, please report this to the sqlanvil team ` +
+                `at ${REPORT_ISSUE_URL}.`);
+        }
+        throw ReferenceError(`Invalid property value: ${verificationError}.` +
+            maybeGetDocsLinkPrefix(errorBehaviour, protoType));
+    }
     const proto = protoType.create(object);
     const protoCastObject = protoType.toObject(proto);
     function checkFields(present, desired) {
@@ -49254,6 +49262,23 @@ function verifyObjectMatchesProto(protoType, object, errorBehaviour = VerifyProt
     checkFields(object, protoCastObject);
     return proto;
 }
+function verifyErrorIsNonPrimitiveInScalarField(message, root) {
+    if (/object expected|array expected|\{k:/.test(message)) {
+        return false;
+    }
+    const path = message.split(":")[0].trim().split(".");
+    let value = root;
+    for (const segment of path) {
+        if (Array.isArray(value)) {
+            value = value.find(element => element !== null && typeof element === "object" && segment in element);
+        }
+        if (value === null || typeof value !== "object" || !(segment in value)) {
+            return false;
+        }
+        value = value[segment];
+    }
+    return value !== null && typeof value === "object";
+}
 function maybeGetDocsLinkPrefix(errorBehaviour, protoType) {
     return errorBehaviour === VerifyProtoErrorBehaviour.SHOW_DOCS_LINK
         ? ` See ${CONFIGS_PROTO_DOCUMENTATION_URL}#${protoType
@@ -50621,7 +50646,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.25.0";
+const version = "1.25.2";
 const dataformVersion = "3.0.61";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -55967,6 +55992,28 @@ function dependencyBlocked(dependencyKeys, statusByKey) {
         return status !== undefined && status !== "PASS";
     });
 }
+function rewriteSelfReferences(graph, shadowSuffix, resolveTarget) {
+    var _a;
+    const suffix = `_${shadowSuffix}`;
+    for (const action of [...(graph.tables || []), ...(graph.assertions || [])]) {
+        const target = action.target;
+        if (!((_a = target === null || target === void 0 ? void 0 : target.schema) === null || _a === void 0 ? void 0 : _a.endsWith(suffix))) {
+            continue;
+        }
+        const prodTarget = sqlanvil.Target.create(Object.assign(Object.assign({}, target), { schema: target.schema.slice(0, -suffix.length) }));
+        const shadowName = resolveTarget(target);
+        const prodName = resolveTarget(prodTarget);
+        const rewrite = (sql) => sql.split(shadowName).join(prodName);
+        if (action.query) {
+            action.query = rewrite(action.query);
+        }
+        const table = action;
+        if (table.incrementalQuery) {
+            table.incrementalQuery = rewrite(table.incrementalQuery);
+        }
+    }
+    return graph;
+}
 const VALIDATE_SHADOW_PREFIX = "sqlanvil_validate_";
 function validateShadowSuffix(nowMs) {
     return `${VALIDATE_SHADOW_PREFIX}${nowMs}`;
@@ -56010,6 +56057,22 @@ function tableType(enumType) {
 function depKeys(deps) {
     return (deps || []).map(targetKey);
 }
+function stripOps(table) {
+    const bare = sqlanvil.Table.create(table);
+    bare.preOps = [];
+    bare.postOps = [];
+    bare.incrementalPreOps = [];
+    bare.incrementalPostOps = [];
+    return bare;
+}
+function collectOps(table) {
+    return [
+        ...(table.preOps || []),
+        ...(table.postOps || []),
+        ...(table.incrementalPreOps || []),
+        ...(table.incrementalPostOps || [])
+    ].filter(op => !!op && !!op.trim());
+}
 async function validate(compiledGraph, deps, options = {}) {
     const nodes = [];
     for (const table of compiledGraph.tables || []) {
@@ -56094,20 +56157,33 @@ async function validate(compiledGraph, deps, options = {}) {
                 results.push({ target: node.target, type: node.type, status: "BLOCKED", errors: [] });
                 continue;
             }
+            const evaluationAction = node.kind === "table" ? stripOps(node.table) : node.action;
             const evaluations = node.kind === "script"
                 ? await deps.checkScript(node.script)
-                : await deps.evaluate(node.action);
+                : await deps.evaluate(evaluationAction);
             const failed = evaluations.some(e => e.status === sqlanvil.QueryEvaluation.QueryEvaluationStatus.FAILURE);
-            const status = failed ? "FAILURE" : "PASS";
-            statusByKey.set(node.key, status);
-            results.push({ target: node.target, type: node.type, status, errors: evaluations });
+            let status = failed ? "FAILURE" : "PASS";
+            let stubCreated = false;
             if (status === "PASS" && node.kind === "table") {
                 try {
                     await deps.execute(deps.validationStubSql(node.table));
+                    stubCreated = true;
                 }
                 catch (e) {
                 }
             }
+            if (status === "PASS" && node.kind === "table" && stubCreated && deps.evaluateOp) {
+                for (const op of collectOps(node.table)) {
+                    const opEvaluations = await deps.evaluateOp(op);
+                    evaluations.push(...opEvaluations);
+                    if (opEvaluations.some(e => e.status === sqlanvil.QueryEvaluation.QueryEvaluationStatus.FAILURE)) {
+                        status = "FAILURE";
+                        break;
+                    }
+                }
+            }
+            statusByKey.set(node.key, status);
+            results.push({ target: node.target, type: node.type, status, errors: evaluations });
         }
     }
     finally {
@@ -57178,6 +57254,7 @@ async function runValidate(argv) {
         tags: argv[tagsOption.name]
     });
     const executionSql = new ExecutionSql(compiledGraph.projectConfig, dataformVersion);
+    rewriteSelfReferences(prunedGraph, shadowSuffix, target => executionSql.resolveTarget(target));
     const shadowSchemas = Array.from(new Set((prunedGraph.tables || []).map(table => table.target.schema)));
     process.on("SIGINT", () => {
         Promise.all(shadowSchemas.map(schema => dbadapter.execute(executionSql.dropSchemaCascadeSql(schema)).catch(() => undefined))).then(() => process.exit(1));
@@ -57186,6 +57263,7 @@ async function runValidate(argv) {
         evaluate: action => dbadapter.evaluate(action.enumType !== undefined
             ? sqlanvil.Table.create(action)
             : sqlanvil.Assertion.create(action)),
+        evaluateOp: warehouse === "bigquery" ? (sql) => dbadapter.evaluate(sql) : undefined,
         execute: sql => dbadapter.execute(sql).then(() => undefined),
         validationStubSql: table => executionSql.validationStubSql(table),
         createSchemaSql: schema => executionSql.createSchemaSql(schema),

package/package.json

@@ -71,7 +71,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.25.0",
+    "version": "1.25.2",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"