@sqlanvil/cli 1.36.0 → 1.36.1

package/README.md

@@ -12,7 +12,7 @@ authority for the version you have installed: `sqlanvil help` lists the commands
 
 ```bash
 npm install -g @sqlanvil/cli
-sqlanvil --version    # sqlanvil 1.36.0 (Dataform core 3.1.0)
+sqlanvil --version    # sqlanvil 1.36.1 (Dataform core 3.1.2)
 ```
 
 Requires Node.js 20.19+ or 22.12+. `--version` reports the sqlanvil release and the Dataform core
@@ -349,7 +349,7 @@ exist.
 | `--environment` | | Load a named environment from `environments:` in `workflow_settings.yaml`. That environment's `schemaSuffix`, `vars`, `defaultDatabase`, `defaultLocation` and `credentials` file apply. See [Named Environments](https://sqlanvil.com/docs/guides/environments/). |
 | `--default-database` | `defaultProject` | Default database. On BigQuery, the Google Cloud project ID. |
 | `--default-schema` | `defaultDataset` | Default schema (a dataset on BigQuery). |
-| `--default-location` | `defaultLocation` | BigQuery only. Default location, e.g. `US`. |
+| `--default-location` | `defaultLocation` | BigQuery only. Default location, e.g. `US`. `run` and `validate` send BigQuery jobs and create new datasets in this location, even when the credentials file names a different `location` (since 1.36.1; `run` warns about the mismatch). |
 | `--assertion-schema` | `defaultAssertionDataset` | Schema that assertions are written to. |
 | `--database-suffix` | `projectSuffix` | Suffix appended to database names. |
 | `--schema-suffix` | `datasetSuffix` | Suffix appended to schema names, e.g. `dev` gives `analytics_dev`. Letters, digits and underscores only. |

package/bundle.js

@@ -55124,8 +55124,8 @@ function requireVersion () {
 	hasRequiredVersion = 1;
 	Object.defineProperty(version, "__esModule", { value: true });
 	version.dataformVersion = version.version = void 0;
-	version.version = "1.36.0";
-	version.dataformVersion = "3.1.0";
+	version.version = "1.36.1";
+	version.dataformVersion = "3.1.2";
 	
 	return version;
 }
@@ -57183,8 +57183,9 @@ function requireBigquery () {
 	        return tablesMetadata;
 	    }
 	    async search(searchText, options = { limit: 1000 }) {
+	        const location = options.location || this.bigQueryCredentials.location || "US";
 	        const results = await this.execute(`select table_catalog, table_schema, table_name
-       from region-${this.bigQueryCredentials.location}.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS
+       from region-${location}.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS
        where regexp_contains(table_schema, @searchText) or regexp_contains(table_name, @searchText) or regexp_contains(field_path, @searchText)
        group by 1, 2, 3`, {
 	            params: {
@@ -57192,12 +57193,14 @@ function requireBigquery () {
 	            },
 	            interactive: true,
 	            rowLimit: options.limit,
+	            bigquery: { location },
 	        });
-	        return await Promise.all(results.rows.map((row) => this.table({
+	        const tables = await Promise.all(results.rows.map((row) => this.table({
 	            database: row.table_catalog,
 	            schema: row.table_schema,
 	            name: row.table_name,
 	        })));
+	        return tables.filter((table) => Boolean(table));
 	    }
 	    async table(target) {
 	        var _a;
@@ -57243,8 +57246,8 @@ function requireBigquery () {
 	        });
 	        return data[0].map((dataset) => dataset.id);
 	    }
-	    async createSchema(database, schema) {
-	        await this.execute(`create schema if not exists \`${database || this.bigQueryCredentials.projectId}.${schema}\``, { bigquery: { location: this.bigQueryCredentials.location || "US" } });
+	    async createSchema(database, schema, location) {
+	        await this.execute(`create schema if not exists \`${database || this.bigQueryCredentials.projectId}.${schema}\``, { bigquery: { location: location || this.bigQueryCredentials.location || "US" } });
 	    }
 	    async setMetadata(action) {
 	        const { target, actionDescriptor } = action;
@@ -59241,7 +59244,10 @@ function requireRun () {
 	            const existingSchemas = new Set(await this.dbadapter.schemas(database));
 	            await Promise.all(Array.from(schemas)
 	                .filter((schema) => !existingSchemas.has(schema))
-	                .map((schema) => this.dbadapter.createSchema(database, schema)));
+	                .map((schema) => {
+	                var _a;
+	                return this.dbadapter.createSchema(database, schema, ((_a = this.graph.projectConfig) === null || _a === void 0 ? void 0 : _a.defaultLocation) || undefined);
+	            }));
 	        }));
 	    }
 	    async executeAllActionsReadyForExecution() {
@@ -59341,7 +59347,7 @@ function requireRun () {
 	        actionResult.timing = timer.current();
 	        this.notifyListeners();
 	        await this.dbadapter.withClientLock(async (client) => {
-	            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+	            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 	            for (const task of action.tasks.slice(actionResult.tasks.length)) {
 	                if (this.stopped) {
 	                    return actionResult;
@@ -59352,10 +59358,11 @@ function requireRun () {
 	                        bigquery: {
 	                            labels: Object.assign(Object.assign({}, (((_b = (_a = this.executionOptions) === null || _a === void 0 ? void 0 : _a.bigquery) === null || _b === void 0 ? void 0 : _b.labels) || {})), (((_c = action.actionDescriptor) === null || _c === void 0 ? void 0 : _c.bigqueryLabels) || {})),
 	                            actionRetryLimit: (_e = (_d = this.executionOptions) === null || _d === void 0 ? void 0 : _d.bigquery) === null || _e === void 0 ? void 0 : _e.actionRetryLimit,
-	                            jobPrefix: (_g = (_f = this.executionOptions) === null || _f === void 0 ? void 0 : _f.bigquery) === null || _g === void 0 ? void 0 : _g.jobPrefix,
-	                            dryRun: (_j = (_h = this.executionOptions) === null || _h === void 0 ? void 0 : _h.bigquery) === null || _j === void 0 ? void 0 : _j.dryRun,
-	                            reservation: ((_k = action.actionDescriptor) === null || _k === void 0 ? void 0 : _k.reservation) ||
-	                                ((_l = this.graph.projectConfig) === null || _l === void 0 ? void 0 : _l.defaultReservation),
+	                            location: ((_f = this.graph.projectConfig) === null || _f === void 0 ? void 0 : _f.defaultLocation) || undefined,
+	                            jobPrefix: (_h = (_g = this.executionOptions) === null || _g === void 0 ? void 0 : _g.bigquery) === null || _h === void 0 ? void 0 : _h.jobPrefix,
+	                            dryRun: (_k = (_j = this.executionOptions) === null || _j === void 0 ? void 0 : _j.bigquery) === null || _k === void 0 ? void 0 : _k.dryRun,
+	                            reservation: ((_l = action.actionDescriptor) === null || _l === void 0 ? void 0 : _l.reservation) ||
+	                                ((_m = this.graph.projectConfig) === null || _m === void 0 ? void 0 : _m.defaultReservation),
 	                        },
 	                    }, action);
 	                    if (taskStatus === ts_1.sqlanvil.TaskResult.ExecutionStatus.FAILED) {
@@ -60333,6 +60340,7 @@ function requireConsole () {
 	console$1.print = print;
 	console$1.printSuccess = printSuccess;
 	console$1.printError = printError;
+	console$1.printWarning = printWarning;
 	console$1.printInitResult = printInitResult;
 	console$1.printInitCredsResult = printInitCredsResult;
 	console$1.isInteractive = isInteractive;
@@ -60458,6 +60466,9 @@ function requireConsole () {
 	function printError(errorText, indentCount = 0) {
 	    writeStdErr(errorOutput(errorText), indentCount);
 	}
+	function printWarning(warningText, indentCount = 0) {
+	    writeStdErr(warningOutput(warningText), indentCount);
+	}
 	function printInitResult(result) {
 	    if (result.dirsCreated && result.dirsCreated.length) {
 	        writeStdOut(successOutput("Directories successfully created:"));
@@ -66680,7 +66691,7 @@ function requireValidate_command () {
 	        dbadapter = await mysql_1.MySqlDbAdapter.create(readCredentials);
 	    }
 	    else if (warehouse === "bigquery") {
-	        dbadapter = new bigquery_1.BigQueryDbAdapter(readCredentials);
+	        dbadapter = new bigquery_1.BigQueryDbAdapter(Object.assign(Object.assign({}, readCredentials), { location: compiledGraph.projectConfig.defaultLocation || readCredentials.location }));
 	    }
 	    else {
 	        dbadapter = await postgres_1.PostgresDbAdapter.create(readCredentials);
@@ -66869,6 +66880,7 @@ function requireRun_command () {
 	        ...project_config_options_1.ProjectConfigOptions.allYargsOptions,
 	    ],
 	    processFn: async (argv) => {
+	        var _a;
 	        if (argv[common_options_1.jsonOutputOption.name] && !argv[dryRunOptionName]) {
 	            (0, console_1.print)(`For execution, the --${common_options_1.jsonOutputOption.name} option is only supported if the ` +
 	                `--${dryRunOptionName} option is enabled`);
@@ -66928,6 +66940,16 @@ function requireRun_command () {
 	            return (0, validate_command_1.runValidate)(argv);
 	        }
 	        const readCredentials = api_1.credentials.read((0, common_options_1.credentialsPathWithEnvironment)(argv[common_options_1.projectDirOption.name], argv), warehouse);
+	        const defaultLocation = (_a = compiledGraph.projectConfig) === null || _a === void 0 ? void 0 : _a.defaultLocation;
+	        if (warehouse.toLowerCase() === "bigquery" &&
+	            !argv[common_options_1.jsonOutputOption.name] &&
+	            defaultLocation &&
+	            readCredentials.location &&
+	            defaultLocation.toLowerCase() !== readCredentials.location.toLowerCase()) {
+	            (0, console_1.printWarning)(`Warning: defaultLocation "${defaultLocation}" in the project config differs from ` +
+	                `location "${readCredentials.location}" in the credentials file. BigQuery jobs and ` +
+	                `new datasets will use "${defaultLocation}".\n`);
+	        }
 	        let dbadapter;
 	        if (warehouse.toLowerCase() === "supabase") {
 	            dbadapter = await supabase_1.SupabaseDbAdapter.create(readCredentials);

package/package.json

@@ -90,7 +90,7 @@
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
     },
-    "version": "1.36.0",
+    "version": "1.36.1",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"