@sqlanvil/cli 1.1.1 → 1.2.0

package/bundle.js

@@ -38608,7 +38608,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.1.1";
+const version = "1.2.0";
 const dataformVersion = "3.0.59";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -38844,6 +38844,17 @@ class CompileChildProcess extends BaseWorker {
     }
 }
 
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 const CREDENTIALS_FILENAME = ".df-credentials.json";
 function read(credentialsPath, warehouse = "bigquery") {
     var _a;
@@ -38857,22 +38868,36 @@ function read(credentialsPath, warehouse = "bigquery") {
     catch (e) {
         throw new Error(`Error reading credentials file: ${e.message}`);
     }
+    const warehouseCredentials = __rest(credentialsAsJson, ["connections"]);
     const isPostgres = warehouse.toLowerCase() === "postgres" || warehouse.toLowerCase() === "supabase";
     if (isPostgres) {
-        const credentials = verifyObjectMatchesProto(sqlanvil.PostgresConnection, credentialsAsJson);
+        const credentials = verifyObjectMatchesProto(sqlanvil.PostgresConnection, warehouseCredentials);
         if (!credentials.host) {
             throw new Error(`Error reading credentials file: the host field is required`);
         }
         return credentials;
     }
     else {
-        const credentials = verifyObjectMatchesProto(sqlanvil.BigQuery, credentialsAsJson);
+        const credentials = verifyObjectMatchesProto(sqlanvil.BigQuery, warehouseCredentials);
         if (!((_a = Object.keys(credentials).find(key => key === "projectId")) === null || _a === void 0 ? void 0 : _a.length)) {
             throw new Error(`Error reading credentials file: the projectId field is required`);
         }
         return credentials;
     }
 }
+function readConnections(credentialsPath) {
+    if (!fs__namespace$1.existsSync(credentialsPath)) {
+        return {};
+    }
+    let credentialsAsJson;
+    try {
+        credentialsAsJson = JSON.parse(fs__namespace$1.readFileSync(credentialsPath, "utf8"));
+    }
+    catch (e) {
+        throw new Error(`Error reading credentials file: ${e.message}`);
+    }
+    return credentialsAsJson.connections || {};
+}
 var TestResultStatus;
 (function (TestResultStatus) {
     TestResultStatus[TestResultStatus["SUCCESSFUL"] = 0] = "SUCCESSFUL";
@@ -39082,10 +39107,10 @@ function resolveConnection(projectDir, connectionName) {
         throw new Error(`Missing .df-credentials.json in ${projectDir}.`);
     }
     const allCreds = JSON.parse(fs__namespace.readFileSync(credsPath, "utf8"));
-    const credentials = allCreds[connectionName];
+    const credentials = allCreds.connections && allCreds.connections[connectionName];
     if (!credentials) {
         throw new Error(`No credentials for connection "${connectionName}" in .df-credentials.json ` +
-            `(expected a top-level "${connectionName}" key).`);
+            `(expected a "connections.${connectionName}" entry).`);
     }
     return { name: connectionName, definition, credentials };
 }
@@ -39183,6 +39208,31 @@ function introspectToSqlx(projectDir, connectionName, tableRef, options) {
     });
 }
 
+const CONNECTION_TOKEN = /\$\{SA_CONN:([^:}]+):([^}]+)\}/g;
+function substituteConnectionCredentials(statement, connections) {
+    return statement.replace(CONNECTION_TOKEN, (_match, connectionName, field) => {
+        const entry = connections[connectionName];
+        if (!entry) {
+            throw new Error(`Connection "${connectionName}" is referenced by an FDW bridge but has no entry under ` +
+                `"connections" in .df-credentials.json. Add connections.${connectionName} with the ` +
+                `source user/password.`);
+        }
+        const value = entry[field];
+        if (value === undefined || value === null || value === "") {
+            throw new Error(`Connection "${connectionName}" is missing "${field}" under "connections.${connectionName}" ` +
+                `in .df-credentials.json.`);
+        }
+        return String(value).replace(/'/g, "''");
+    });
+}
+function assertConnectionCredentialsAvailable(graph, connections) {
+    (graph.actions || []).forEach(action => (action.tasks || []).forEach(task => {
+        if (task.statement) {
+            substituteConnectionCredentials(task.statement, connections);
+        }
+    }));
+}
+
 function parseArgvFlags(argv) {
     const parsedArgv = {};
     const splitArgv = [];
@@ -39583,7 +39633,10 @@ class Runner {
         }
         else {
             try {
-                const { rows, metadata } = await retry(() => client.execute(task.statement, {
+                const statement = this.executionOptions.connectionCredentials
+                    ? substituteConnectionCredentials(task.statement, this.executionOptions.connectionCredentials)
+                    : task.statement;
+                const { rows, metadata } = await retry(() => client.execute(statement, {
                     onCancel: handleCancel => this.eEmitter.on(CANCEL_EVENT, handleCancel),
                     rowLimit: 1,
                     bigquery: options.bigquery
@@ -42444,13 +42497,18 @@ function runCli() {
                         print("No actions to run.\n");
                         return 0;
                     }
+                    const connectionCredentials = readConnections(getCredentialsPath(argv[projectDirOption.name], argv[credentialsOption.name]));
+                    assertConnectionCredentialsAvailable(executionGraph, connectionCredentials);
                     if (argv[dryRunOptionName]) {
                         print("Dry running (no changes to the warehouse will be applied)...");
                     }
                     else {
                         print("Running...\n");
                     }
-                    const runner = run(dbadapter, executionGraph, { bigquery: bigqueryOptions });
+                    const runner = run(dbadapter, executionGraph, {
+                        bigquery: bigqueryOptions,
+                        connectionCredentials
+                    });
                     process.on("SIGINT", () => {
                         runner.cancel();
                     });

package/package.json

@@ -61,7 +61,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.1.1",
+    "version": "1.2.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"