@malloydata/db-bigquery 0.0.393 → 0.0.395

package/dist/bigquery_connection.d.ts

@@ -84,7 +84,7 @@ export declare class BigQueryConnection extends BaseConnection implements Connec
     downloadMalloyQuery(sqlCommand: string): Promise<ResourceStream<RowMetadata>>;
     private dryRunSQLQuery;
     estimateQueryCost(sqlCommand: string): Promise<QueryRunStats>;
-    private normalizeTablePath;
+    private decodeTablePathSegments;
     getTableFieldSchema(tablePath: string): Promise<SchemaInfo>;
     executeSQLRaw(sqlCommand: string): Promise<QueryData>;
     test(): Promise<void>;

package/dist/bigquery_connection.js

@@ -239,17 +239,29 @@ class BigQueryConnection extends connection_1.BaseConnection {
             queryCostBytes: Number(dryRunResults.metadata.statistics.totalBytesProcessed),
         };
     }
-    normalizeTablePath(tablePath) {
-        if (tablePath.split('.').length === 2) {
-            return `${this.projectId}.${tablePath}`;
-        }
-        else {
-            return tablePath;
+    // The whole-backtick form `` `proj.dataset.table` `` parses as one
+    // quoted segment, but the metadata API still wants the parts
+    // separately — split its decoded body on `.` to recover them.
+    decodeTablePathSegments(tablePath) {
+        const result = (0, malloy_1.decodeDottedTablePath)(tablePath, {
+            quoteChar: '`',
+            escapeStyle: 'backslash',
+            bareIdentRegex: this.dialect.tablePathBareIdentRegex,
+            dialectName: 'BigQuery',
+        });
+        if (!result.ok)
+            return [tablePath];
+        if (result.segments.length === 1 && result.segments[0].quoted) {
+            return result.segments[0].value.split('.');
         }
+        return result.segments.map(s => s.value);
     }
     async getTableFieldSchema(tablePath) {
         var _a, _b, _c, _d;
-        const segments = this.normalizeTablePath(tablePath).split('.');
+        let segments = this.decodeTablePathSegments(tablePath);
+        if (segments.length === 2) {
+            segments = [this.projectId, ...segments];
+        }
         if (segments.length !== 3) {
             throw new Error(`Improper table path: ${tablePath}. A table path requires 2 or 3 segments`);
         }
@@ -430,7 +442,10 @@ class BigQueryConnection extends connection_1.BaseConnection {
         }
     }
     async fetchTableSchema(tableName, tablePath) {
-        tablePath = this.normalizeTablePath(tablePath);
+        // Keep the canonical tablePath (which may be backtick-wrapped for
+        // wildcard tables) for downstream SQL emission. The metadata lookup
+        // wants the unwrapped form, which `getTableFieldSchema` handles via
+        // `normalizeTablePath`.
         try {
             const tableFieldSchema = await this.getTableFieldSchema(tablePath);
             const tableDef = {
@@ -578,9 +593,9 @@ class BigQueryConnection extends connection_1.BaseConnection {
         return (0, malloy_1.toAsyncGenerator)(streamBigQuery);
     }
     async fetchTableMetadata(tablePath) {
-        const tablePathInfo = tablePath.split('.');
+        const [proj, dataset, table] = this.decodeTablePathSegments(tablePath);
         return {
-            url: `https://console.cloud.google.com/bigquery?ws=!1m5!1m4!4m3!1s${tablePathInfo[0]}!2s${tablePathInfo[1]}!3s${tablePathInfo[2]}`,
+            url: `https://console.cloud.google.com/bigquery?ws=!1m5!1m4!4m3!1s${proj}!2s${dataset}!3s${table}`,
         };
     }
     async close() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.393",
+  "version": "0.0.395",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "@google-cloud/bigquery": "^7.3.0",
     "@google-cloud/common": "^5.0.1",
     "@google-cloud/paginator": "^5.0.0",
-    "@malloydata/malloy": "0.0.393",
+    "@malloydata/malloy": "0.0.395",
     "gaxios": "^4.2.0"
   }
 }