@sqlanvil/cli 1.3.0 → 1.4.1

package/bundle.js

@@ -38424,9 +38424,16 @@ class PostgresExecutionSql {
                 ? ` include (${index.include.map(c => `"${c}"`).join(", ")})`
                 : "";
             const where = index.where ? ` where (${index.where})` : "";
-            return `create ${unique}index "${index.name}" on ${target} using ${method} (${columns})${include}${where}`;
+            const indexName = index.name || this.defaultIndexName(table.target.name, index.columns, !!index.unique);
+            return `create ${unique}index "${indexName}" on ${target} using ${method} (${columns})${include}${where}`;
         });
     }
+    defaultIndexName(tableName, columns, unique) {
+        const parts = [tableName, ...(columns || [])].filter(Boolean);
+        const base = parts.join("_");
+        const suffix = unique ? "_key" : "_idx";
+        return `${base}${suffix}`.slice(0, 63);
+    }
     indexMethodAsSql(method) {
         switch (method) {
             case sqlanvil.PostgresOptions.Index.Method.HASH:
@@ -38653,7 +38660,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.3.0";
+const version = "1.4.1";
 const dataformVersion = "3.0.59";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -40347,15 +40354,23 @@ class PgPoolExecutor {
     }
     async withClientLock(callback) {
         const client = await this.pool.connect();
+        let released = false;
+        const releaseOnce = (err) => {
+            if (released) {
+                return;
+            }
+            released = true;
+            try {
+                client.release(err);
+            }
+            catch (e) {
+                console.error("Error thrown when releasing pg.Client", e.message, e.stack);
+            }
+        };
         try {
             client.on("error", err => {
                 console.error("pg.Client client error", err.message, err.stack);
-                try {
-                    client.release(err);
-                }
-                catch (e) {
-                    console.error("Error thrown when releasing errored pg.Client", e.message, e.stack);
-                }
+                releaseOnce(err);
             });
             return await callback({
                 execute: async (statement, options = { rowLimit: 1000, byteLimit: 1024 * 1024 }) => {
@@ -40380,12 +40395,7 @@ class PgPoolExecutor {
                             }
                         });
                         query.on("error", err => {
-                            try {
-                                client.release(err);
-                            }
-                            catch (e) {
-                                console.error("Error thrown when releasing errored pg.Query", e.message, e.stack);
-                            }
+                            releaseOnce(err);
                             reject(err);
                         });
                         query.on("end", () => {
@@ -40396,12 +40406,7 @@ class PgPoolExecutor {
             });
         }
         finally {
-            try {
-                client.release();
-            }
-            catch (e) {
-                console.error("Error thrown when releasing ended pg.Client", e.message, e.stack);
-            }
+            releaseOnce();
         }
     }
     async close() {
@@ -41279,6 +41284,12 @@ function getBigQueryCredentials() {
     };
 }
 
+function option(name, opt, check) {
+    return { name, option: opt, check };
+}
+function positionalOption(name, opt, check) {
+    return { name, option: opt, check };
+}
 function createYargsCli(cli) {
     let yargsChain = yargs__default["default"](fixArgvForHelp());
     for (const command of cli.commands) {
@@ -41984,16 +41995,14 @@ function postProcessFormattedSqlx(formattedSql) {
 
 const RECOMPILE_DELAY = 500;
 process.on("unhandledRejection", async (reason) => {
-    printError(`Unhandled promise rejection: ${(reason === null || reason === void 0 ? void 0 : reason.stack) || reason}`);
+    var _a;
+    printError(`Unhandled promise rejection: ${((_a = reason) === null || _a === void 0 ? void 0 : _a.stack) || reason}`);
+});
+const projectDirOption = positionalOption("project-dir", {
+    describe: "The sqlanvil project directory.",
+    default: ".",
+    coerce: actuallyResolve
 });
-const projectDirOption = {
-    name: "project-dir",
-    option: {
-        describe: "The sqlanvil project directory.",
-        default: ".",
-        coerce: actuallyResolve
-    }
-};
 const projectDirMustExistOption = Object.assign(Object.assign({}, projectDirOption), { check: (argv) => {
         assertPathExists(argv[projectDirOption.name]);
         const workflowSettingsYamlPath = path__namespace.resolve(argv[projectDirOption.name], "workflow_settings.yaml");
@@ -42001,144 +42010,104 @@ const projectDirMustExistOption = Object.assign(Object.assign({}, projectDirOpti
             throw new Error(`${argv[projectDirOption.name]} does not appear to be a sqlanvil directory (missing workflow_settings.yaml file).`);
         }
     } });
-const fullRefreshOption = {
-    name: "full-refresh",
-    option: {
-        describe: "Forces incremental tables to be rebuilt from scratch.",
-        type: "boolean",
-        default: false
-    }
-};
-const actionsOption = {
-    name: "actions",
-    option: {
-        describe: "A list of action names or patterns to run. Can include '*' wildcards.",
-        type: "array",
-        coerce: (rawActions) => rawActions.map(actions => actions.split(",")).flat()
-    }
-};
-const tagsOption = {
-    name: "tags",
-    option: {
-        describe: "A list of tags to filter the actions to run.",
-        type: "array",
-        coerce: (rawTags) => rawTags.map(tags => tags.split(",")).flat()
-    }
-};
-const includeDepsOption = {
-    name: "include-deps",
-    option: {
-        describe: "If set, dependencies for selected actions will also be run.",
-        type: "boolean"
-    },
-    check: (argv) => {
-        if (argv[includeDepsOption.name] && !(argv[actionsOption.name] || argv[tagsOption.name])) {
-            throw new Error(`The --${includeDepsOption.name} flag should only be supplied along with --${actionsOption.name} or --${tagsOption.name}.`);
-        }
-    }
-};
-const includeDependentsOption = {
-    name: "include-dependents",
-    option: {
-        describe: "If set, dependents (downstream) for selected actions will also be run.",
-        type: "boolean"
-    },
-    check: (argv) => {
-        if (argv[includeDependentsOption.name] &&
-            !(argv[actionsOption.name] || argv[tagsOption.name])) {
-            throw new Error(`The --${includeDependentsOption.name} flag should only be supplied along with --${actionsOption.name} or --${tagsOption.name}.`);
-        }
-    }
-};
-const credentialsOption = {
-    name: "credentials",
-    option: {
-        describe: "The location of the credentials JSON file to use.",
-        default: CREDENTIALS_FILENAME
-    },
-    check: (argv) => getCredentialsPath(argv[projectDirOption.name], argv[credentialsOption.name])
-};
-const jsonOutputOption = {
-    name: "json",
-    option: {
-        describe: "Outputs a JSON representation of the compiled project or test results.",
-        type: "boolean",
-        default: false
-    }
-};
-const dotOutputOption = {
-    name: "dot",
-    option: {
-        describe: "Outputs a dot representation of the compiled project.",
-        type: "boolean",
-        default: false,
-    },
-    check: (argv) => {
-        if (argv.json && argv.dot) {
-            throw new Error("Arguments --json and --dot are mutually exclusive.");
-        }
-    }
-};
-const timeoutOption = {
-    name: "timeout",
-    option: {
-        describe: "Duration to allow project compilation to complete. Examples: '1s', '10m', etc.",
-        type: "string",
-        default: null,
-        coerce: (rawTimeoutString) => rawTimeoutString ? parseDuration__default["default"](rawTimeoutString) : null
-    }
-};
-const jobPrefixOption = {
-    name: "job-prefix",
-    option: {
-        describe: "Adds an additional prefix in the form of `sqlanvil-${jobPrefix}-`.",
-        type: "string",
-        default: null
+const fullRefreshOption = option("full-refresh", {
+    describe: "Forces incremental tables to be rebuilt from scratch.",
+    type: "boolean",
+    default: false
+});
+const actionsOption = option("actions", {
+    describe: "A list of action names or patterns to run. Can include '*' wildcards.",
+    type: "array",
+    coerce: (rawActions) => rawActions.map(actions => actions.split(",")).flat()
+});
+const tagsOption = option("tags", {
+    describe: "A list of tags to filter the actions to run.",
+    type: "array",
+    coerce: (rawTags) => rawTags.map(tags => tags.split(",")).flat()
+});
+const includeDepsOption = option("include-deps", {
+    describe: "If set, dependencies for selected actions will also be run.",
+    type: "boolean"
+}, (argv) => {
+    if (argv[includeDepsOption.name] && !(argv[actionsOption.name] || argv[tagsOption.name])) {
+        throw new Error(`The --${includeDepsOption.name} flag should only be supplied along with --${actionsOption.name} or --${tagsOption.name}.`);
     }
-};
-const bigqueryJobLabelsOption = {
-    name: "job-labels",
-    option: {
-        describe: "Comma-separated list of labels to add to BigQuery jobs, e.g. 'key1=val1,key2=val2'.",
-        type: "string",
-        coerce: (raw) => {
-            const labels = {};
-            raw === null || raw === void 0 ? void 0 : raw.split(",").forEach(kv => {
-                if (!kv) {
-                    return;
-                }
-                const [key, ...rest] = kv.split("=");
-                labels[key] = rest.join("=") || "";
-            });
-            return labels;
-        }
+});
+const includeDependentsOption = option("include-dependents", {
+    describe: "If set, dependents (downstream) for selected actions will also be run.",
+    type: "boolean"
+}, (argv) => {
+    if (argv[includeDependentsOption.name] &&
+        !(argv[actionsOption.name] || argv[tagsOption.name])) {
+        throw new Error(`The --${includeDependentsOption.name} flag should only be supplied along with --${actionsOption.name} or --${tagsOption.name}.`);
     }
-};
-const quietCompileOption = {
-    name: "quiet",
-    option: {
-        describe: "Less verbose compilation output. Example usage: 'sqlanvil compile --quiet'",
-        type: "boolean",
-        default: false
+});
+const compileActionsOption = Object.assign(Object.assign({}, actionsOption), { option: Object.assign(Object.assign({}, actionsOption.option), { describe: "A list of action names or patterns to include in the output. Can include '*' wildcards." }) });
+const compileTagsOption = Object.assign(Object.assign({}, tagsOption), { option: Object.assign(Object.assign({}, tagsOption.option), { describe: "A list of tags to filter the output to." }) });
+const compileIncludeDepsOption = Object.assign(Object.assign({}, includeDepsOption), { option: Object.assign(Object.assign({}, includeDepsOption.option), { describe: "If set, dependencies of selected actions are also included in the output." }) });
+const compileIncludeDependentsOption = Object.assign(Object.assign({}, includeDependentsOption), { option: Object.assign(Object.assign({}, includeDependentsOption.option), { describe: "If set, dependents (downstream) of selected actions are also included in the output." }) });
+const credentialsOption = option("credentials", {
+    describe: "The location of the credentials JSON file to use.",
+    default: CREDENTIALS_FILENAME
+}, (argv) => {
+    getCredentialsPath(argv[projectDirOption.name], argv.credentials);
+});
+const jsonOutputOption = option("json", {
+    describe: "Outputs a JSON representation of the compiled project or test results.",
+    type: "boolean",
+    default: false
+});
+const dotOutputOption = option("dot", {
+    describe: "Outputs a dot representation of the compiled project.",
+    type: "boolean",
+    default: false
+}, (argv) => {
+    if (argv.json && argv.dot) {
+        throw new Error("Arguments --json and --dot are mutually exclusive.");
     }
-};
-const icebergOption = {
-    name: "iceberg",
-    option: {
-        describe: "Initialize the project with workflow-level Iceberg tables configuration.",
-        type: "boolean",
-        default: false,
-    },
-};
-const warehouseOption = {
-    name: "warehouse",
-    option: {
-        describe: "Target warehouse for the new project.",
-        type: "string",
-        choices: ["bigquery", "postgres", "supabase"],
-        default: "supabase"
+});
+const timeoutOption = option("timeout", {
+    describe: "Duration to allow project compilation to complete. Examples: '1s', '10m', etc.",
+    type: "string",
+    default: null,
+    coerce: (rawTimeoutString) => rawTimeoutString ? parseDuration__default["default"](rawTimeoutString) : null
+});
+const jobPrefixOption = option("job-prefix", {
+    describe: "Adds an additional prefix in the form of `sqlanvil-${jobPrefix}-`.",
+    type: "string",
+    default: null
+});
+const bigqueryJobLabelsOption = option("job-labels", {
+    describe: "Comma-separated list of labels to add to BigQuery jobs, e.g. 'key1=val1,key2=val2'.",
+    type: "string",
+    coerce: (raw) => {
+        const labels = {};
+        raw === null || raw === void 0 ? void 0 : raw.split(",").forEach(kv => {
+            if (!kv) {
+                return;
+            }
+            const [key, ...rest] = kv.split("=");
+            labels[key] = rest.join("=") || "";
+        });
+        return labels;
     }
-};
+});
+const quietCompileOption = option("quiet", {
+    describe: "Less verbose compilation output. Example usage: 'sqlanvil compile --quiet'",
+    type: "boolean",
+    default: false
+});
+const icebergOption = option("iceberg", {
+    describe: "Initialize the project with workflow-level Iceberg tables configuration.",
+    type: "boolean",
+    default: false
+});
+const warehouseOption = option("warehouse", {
+    describe: "Target warehouse for the new project.",
+    type: "string",
+    choices: ["bigquery", "postgres", "supabase"],
+    default: "supabase"
+});
 const testConnectionOptionName = "test-connection";
 const watchOptionName = "watch";
 const verboseOptionName = "verbose";
@@ -42157,7 +42126,7 @@ function runCli() {
                 description: "Show help. If [command] is specified, the help is for the given command.",
                 positionalOptions: [],
                 options: [],
-                processFn: async (argv) => {
+                processFn: async () => {
                     return 0;
                 }
             },
@@ -42167,33 +42136,25 @@ function runCli() {
                 description: "Create a new sqlanvil project (BigQuery, Postgres, or Supabase).",
                 positionalOptions: [
                     projectDirOption,
-                    {
-                        name: ProjectConfigOptions.defaultDatabase.name,
-                        option: {
-                            describe: "The default database to use, equivalent to Google Cloud Project ID."
-                        },
-                        check: (argv) => {
-                            const warehouse = argv[warehouseOption.name] || "bigquery";
-                            if (warehouse === "bigquery" && !argv[ProjectConfigOptions.defaultDatabase.name]) {
-                                throw new Error(`The ${ProjectConfigOptions.defaultDatabase.name} positional argument is ` +
-                                    `required for BigQuery projects. Use "sqlanvil help init" for more info.`);
-                            }
+                    positionalOption(ProjectConfigOptions.defaultDatabase.name, {
+                        describe: "The default database to use, equivalent to Google Cloud Project ID."
+                    }, (argv) => {
+                        const warehouse = argv[warehouseOption.name] || "bigquery";
+                        if (warehouse === "bigquery" && !argv[ProjectConfigOptions.defaultDatabase.name]) {
+                            throw new Error(`The ${ProjectConfigOptions.defaultDatabase.name} positional argument is ` +
+                                `required for BigQuery projects. Use "sqlanvil help init" for more info.`);
                         }
-                    },
-                    {
-                        name: ProjectConfigOptions.defaultLocation.name,
-                        option: {
-                            describe: "The default location to use. See " +
-                                "https://cloud.google.com/bigquery/docs/locations for supported values."
-                        },
-                        check: (argv) => {
-                            const warehouse = argv[warehouseOption.name] || "bigquery";
-                            if (warehouse === "bigquery" && !argv[ProjectConfigOptions.defaultLocation.name]) {
-                                throw new Error(`The ${ProjectConfigOptions.defaultLocation.name} positional argument is ` +
-                                    `required for BigQuery projects. Use "sqlanvil help init" for more info.`);
-                            }
+                    }),
+                    positionalOption(ProjectConfigOptions.defaultLocation.name, {
+                        describe: "The default location to use. See " +
+                            "https://cloud.google.com/bigquery/docs/locations for supported values."
+                    }, (argv) => {
+                        const warehouse = argv[warehouseOption.name] || "bigquery";
+                        if (warehouse === "bigquery" && !argv[ProjectConfigOptions.defaultLocation.name]) {
+                            throw new Error(`The ${ProjectConfigOptions.defaultLocation.name} positional argument is ` +
+                                `required for BigQuery projects. Use "sqlanvil help init" for more info.`);
                         }
-                    }
+                    })
                 ],
                 options: [warehouseOption, icebergOption],
                 processFn: async (argv) => {
@@ -42234,14 +42195,11 @@ function runCli() {
                     `accessing BigQuery.`,
                 positionalOptions: [projectDirMustExistOption],
                 options: [
-                    {
-                        name: testConnectionOptionName,
-                        option: {
-                            describe: "If true, a test query will be run using your final credentials.",
-                            type: "boolean",
-                            default: true
-                        }
-                    }
+                    option(testConnectionOptionName, {
+                        describe: "If true, a test query will be run using your final credentials.",
+                        type: "boolean",
+                        default: true
+                    })
                 ],
                 processFn: async (argv) => {
                     const finalCredentials = getBigQueryCredentials();
@@ -42277,36 +42235,34 @@ function runCli() {
                 description: "Compile the sqlanvil project. Produces JSON output describing the non-executable graph.",
                 positionalOptions: [projectDirMustExistOption],
                 options: [
-                    {
-                        name: watchOptionName,
-                        option: {
-                            describe: "Whether to watch the changes in the project directory.",
-                            type: "boolean",
-                            default: false
-                        }
-                    },
+                    option(watchOptionName, {
+                        describe: "Whether to watch the changes in the project directory.",
+                        type: "boolean",
+                        default: false
+                    }),
                     jsonOutputOption,
                     dotOutputOption,
                     timeoutOption,
                     quietCompileOption,
-                    {
-                        name: verboseOptionName,
-                        option: {
-                            describe: "Enable verbose compilation output. Example usage: 'sqlanvil compile --verbose'",
-                            type: "boolean",
-                            default: false
-                        },
-                        check: (argv) => {
-                            if (argv.quiet && argv.verbose) {
-                                throw new Error("Arguments --verbose and --quiet are mutually exclusive.");
-                            }
+                    compileActionsOption,
+                    compileTagsOption,
+                    compileIncludeDepsOption,
+                    compileIncludeDependentsOption,
+                    option(verboseOptionName, {
+                        describe: "Enable verbose compilation output. Example usage: 'sqlanvil compile --verbose'",
+                        type: "boolean",
+                        default: false
+                    }, (argv) => {
+                        if (argv.quiet && argv.verbose) {
+                            throw new Error("Arguments --verbose and --quiet are mutually exclusive.");
                         }
-                    },
+                    }),
                     ...ProjectConfigOptions.allYargsOptions
                 ],
                 processFn: async (argv) => {
                     const projectDir = argv[projectDirMustExistOption.name];
                     async function compileAndPrint() {
+                        var _a, _b;
                         let outputType = compiledGraphOutputType.Summary;
                         if (argv[jsonOutputOption.name]) {
                             outputType = compiledGraphOutputType.Json;
@@ -42323,7 +42279,16 @@ function runCli() {
                             timeoutMillis: argv[timeoutOption.name] || undefined,
                             verbose: argv[verboseOptionName] || false
                         });
-                        printCompiledGraph(compiledGraph, outputType, argv[quietCompileOption.name]);
+                        const hasSelector = ((_a = argv[actionsOption.name]) === null || _a === void 0 ? void 0 : _a.length) > 0 || ((_b = argv[tagsOption.name]) === null || _b === void 0 ? void 0 : _b.length) > 0;
+                        const outputGraph = hasSelector && !compiledGraphHasErrors(compiledGraph)
+                            ? prune(compiledGraph, {
+                                actions: argv[actionsOption.name],
+                                tags: argv[tagsOption.name],
+                                includeDependencies: argv[includeDepsOption.name],
+                                includeDependents: argv[includeDependentsOption.name]
+                            })
+                            : compiledGraph;
+                        printCompiledGraph(outputGraph, outputType, argv[quietCompileOption.name]);
                         if (compiledGraphHasErrors(compiledGraph)) {
                             print("");
                             printCompiledGraphErrors(compiledGraph.graphErrors, argv[quietCompileOption.name]);
@@ -42435,28 +42400,19 @@ function runCli() {
                 description: "Run the sqlanvil project.",
                 positionalOptions: [projectDirMustExistOption],
                 options: [
-                    {
-                        name: dryRunOptionName,
-                        option: {
-                            describe: "If set, BigQuery will validate the run SQL without applying changes to the warehouse.",
-                            type: "boolean"
-                        }
-                    },
-                    {
-                        name: runTestsOptionName,
-                        option: {
-                            describe: "If set, the project's unit tests are required to pass before running the project.",
-                            type: "boolean"
-                        }
-                    },
-                    {
-                        name: actionRetryLimitName,
-                        option: {
-                            describe: "If set, idempotent actions will be retried up to the limit.",
-                            type: "number",
-                            default: 0
-                        }
-                    },
+                    option(dryRunOptionName, {
+                        describe: "If set, BigQuery will validate the run SQL without applying changes to the warehouse.",
+                        type: "boolean"
+                    }),
+                    option(runTestsOptionName, {
+                        describe: "If set, the project's unit tests are required to pass before running the project.",
+                        type: "boolean"
+                    }),
+                    option(actionRetryLimitName, {
+                        describe: "If set, idempotent actions will be retried up to the limit.",
+                        type: "number",
+                        default: 0
+                    }),
                     actionsOption,
                     credentialsOption,
                     fullRefreshOption,
@@ -42580,14 +42536,11 @@ function runCli() {
                 positionalOptions: [projectDirMustExistOption],
                 options: [
                     actionsOption,
-                    {
-                        name: checkOptionName,
-                        option: {
-                            describe: "Check if files are formatted correctly without modifying them.",
-                            type: "boolean",
-                            default: false
-                        }
-                    }
+                    option(checkOptionName, {
+                        describe: "Check if files are formatted correctly without modifying them.",
+                        type: "boolean",
+                        default: false
+                    })
                 ],
                 processFn: async (argv) => {
                     let actions = ["{definitions,includes}/**/*.{js,sqlx}"];
@@ -42648,24 +42601,19 @@ function runCli() {
                 format: `introspect <connection> <tableRef> [${projectDirOption.name}]`,
                 description: "Read a source table's schema from a connection and write a declaration .sqlx with columnTypes.",
                 positionalOptions: [
-                    {
-                        name: "connection",
-                        option: { describe: "Connection name (from workflow_settings.yaml connections)." }
-                    },
-                    {
-                        name: "tableRef",
-                        option: { describe: "Source table as schema.table (or just table)." }
-                    },
+                    positionalOption("connection", {
+                        describe: "Connection name (from workflow_settings.yaml connections)."
+                    }),
+                    positionalOption("tableRef", {
+                        describe: "Source table as schema.table (or just table)."
+                    }),
                     projectDirOption
                 ],
                 options: [
-                    {
-                        name: "output",
-                        option: {
-                            describe: "File to write the declaration .sqlx to. Prints to stdout if omitted.",
-                            type: "string"
-                        }
-                    }
+                    option("output", {
+                        describe: "File to write the declaration .sqlx to. Prints to stdout if omitted.",
+                        type: "string"
+                    })
                 ],
                 processFn: async (argv) => {
                     const projectDir = argv[projectDirOption.name];
@@ -42739,93 +42687,62 @@ class ProjectConfigOptions {
         return projectConfigOptions;
     }
 }
-ProjectConfigOptions.defaultDatabase = {
-    name: "default-database",
-    option: {
-        describe: "The default database to use, equivalent to Google Cloud Project ID. If unset, " +
-            "the value from workflow_settings.yaml is used.",
-        type: "string"
-    }
-};
-ProjectConfigOptions.defaultSchema = {
-    name: "default-schema",
-    option: {
-        describe: "Override for the default schema name. If unset, the value from workflow_settings.yaml is used."
-    }
-};
-ProjectConfigOptions.defaultLocation = {
-    name: "default-location",
-    option: {
-        describe: "The default location to use. See " +
-            "https://cloud.google.com/bigquery/docs/locations for supported values. If unset, the " +
-            "value from workflow_settings.yaml is used."
-    }
-};
-ProjectConfigOptions.assertionSchema = {
-    name: "assertion-schema",
-    option: {
-        describe: "Default assertion schema. If unset, the value from workflow_settings.yaml is used."
-    }
-};
-ProjectConfigOptions.databaseSuffix = {
-    name: "database-suffix",
-    option: {
-        describe: "Default assertion schema. If unset, the value from workflow_settings.yaml is used."
-    }
-};
-ProjectConfigOptions.vars = {
-    name: "vars",
-    option: {
-        describe: "Override for variables to inject via '--vars=someKey=someValue,a=b', referenced by " +
-            "`sqlanvil.projectConfig.vars.someValue`.  If unset, the value from workflow_settings.yaml is used.",
-        type: "string",
-        default: null,
-        coerce: (rawVarsString) => {
-            const variables = {};
-            rawVarsString === null || rawVarsString === void 0 ? void 0 : rawVarsString.split(",").forEach(keyValueStr => {
-                const [key, value] = keyValueStr.split("=");
-                variables[key] = value;
-            });
-            return variables;
-        }
-    }
-};
-ProjectConfigOptions.schemaSuffix = {
-    name: "schema-suffix",
-    option: {
-        describe: "A suffix to be appended to output schema names. If unset, the value from workflow_settings.yaml " +
-            "is used."
-    },
-    check: (argv) => {
-        if (argv[ProjectConfigOptions.schemaSuffix.name] &&
-            !/^[a-zA-Z_0-9]+$/.test(argv[ProjectConfigOptions.schemaSuffix.name])) {
-            throw new Error(`--${ProjectConfigOptions.schemaSuffix.name} should contain only ` +
-                `alphanumeric characters and/or underscores.`);
-        }
-    }
-};
-ProjectConfigOptions.tablePrefix = {
-    name: "table-prefix",
-    option: {
-        describe: "Adds a prefix for all table names. If unset, the value from workflow_settings.yaml is used."
-    }
-};
-ProjectConfigOptions.disableAssertions = {
-    name: "disable-assertions",
-    option: {
-        describe: "Disables all assertions including built-in assertions (uniqueKey, nonNull, rowConditions) and manual assertions (type: assertion).",
-        type: "boolean",
-        default: false
+ProjectConfigOptions.defaultDatabase = option("default-database", {
+    describe: "The default database to use, equivalent to Google Cloud Project ID. If unset, " +
+        "the value from workflow_settings.yaml is used.",
+    type: "string"
+});
+ProjectConfigOptions.defaultSchema = option("default-schema", {
+    describe: "Override for the default schema name. If unset, the value from workflow_settings.yaml is used."
+});
+ProjectConfigOptions.defaultLocation = option("default-location", {
+    describe: "The default location to use. See " +
+        "https://cloud.google.com/bigquery/docs/locations for supported values. If unset, the " +
+        "value from workflow_settings.yaml is used."
+});
+ProjectConfigOptions.assertionSchema = option("assertion-schema", {
+    describe: "Default assertion schema. If unset, the value from workflow_settings.yaml is used."
+});
+ProjectConfigOptions.databaseSuffix = option("database-suffix", {
+    describe: "Default assertion schema. If unset, the value from workflow_settings.yaml is used."
+});
+ProjectConfigOptions.vars = option("vars", {
+    describe: "Override for variables to inject via '--vars=someKey=someValue,a=b', referenced by " +
+        "`sqlanvil.projectConfig.vars.someValue`.  If unset, the value from workflow_settings.yaml is used.",
+    type: "string",
+    default: null,
+    coerce: (rawVarsString) => {
+        const variables = {};
+        rawVarsString === null || rawVarsString === void 0 ? void 0 : rawVarsString.split(",").forEach(keyValueStr => {
+            const [key, value] = keyValueStr.split("=");
+            variables[key] = value;
+        });
+        return variables;
     }
-};
-ProjectConfigOptions.defaultReservation = {
-    name: "default-reservation",
-    option: {
-        describe: "The default BigQuery reservation to use for execution. If unset, the value from " +
-            "workflow_settings.yaml is used. If neither is set, default BigQuery behavior applies.",
-        type: "string"
+});
+ProjectConfigOptions.schemaSuffix = option("schema-suffix", {
+    describe: "A suffix to be appended to output schema names. If unset, the value from workflow_settings.yaml " +
+        "is used."
+}, (argv) => {
+    if (argv[ProjectConfigOptions.schemaSuffix.name] &&
+        !/^[a-zA-Z_0-9]+$/.test(argv[ProjectConfigOptions.schemaSuffix.name])) {
+        throw new Error(`--${ProjectConfigOptions.schemaSuffix.name} should contain only ` +
+            `alphanumeric characters and/or underscores.`);
     }
-};
+});
+ProjectConfigOptions.tablePrefix = option("table-prefix", {
+    describe: "Adds a prefix for all table names. If unset, the value from workflow_settings.yaml is used."
+});
+ProjectConfigOptions.disableAssertions = option("disable-assertions", {
+    describe: "Disables all assertions including built-in assertions (uniqueKey, nonNull, rowConditions) and manual assertions (type: assertion).",
+    type: "boolean",
+    default: false
+});
+ProjectConfigOptions.defaultReservation = option("default-reservation", {
+    describe: "The default BigQuery reservation to use for execution. If unset, the value from " +
+        "workflow_settings.yaml is used. If neither is set, default BigQuery behavior applies.",
+    type: "string"
+});
 ProjectConfigOptions.allYargsOptions = [
     ProjectConfigOptions.defaultDatabase,
     ProjectConfigOptions.defaultSchema,

package/package.json

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