@malloydata/db-bigquery 0.0.11-dev221202152346 → 0.0.11-dev221202180154

package/dist/bigquery_connection.d.ts

@@ -1,7 +1,7 @@
 import { RowMetadata } from "@google-cloud/bigquery";
 import bigquery from "@google-cloud/bigquery/build/src/types";
 import { ResourceStream } from "@google-cloud/paginator";
-import { FetchSchemaAndRunSimultaneously, FetchSchemaAndRunStreamSimultaneously, PersistSQLResults, PooledConnection, QueryData, StructDef, StreamingConnection, MalloyQueryData, FieldTypeDef, SQLBlock, Connection, QueryDataRow } from "@malloydata/malloy";
+import { PersistSQLResults, PooledConnection, QueryData, StructDef, StreamingConnection, MalloyQueryData, FieldTypeDef, SQLBlock, Connection, QueryDataRow } from "@malloydata/malloy";
 export interface BigQueryManagerOptions {
     credentials?: {
         clientId: string;
@@ -29,7 +29,7 @@ declare type QueryOptionsReader = Partial<BigQueryQueryOptions> | (() => Partial
 export declare class BigQueryAuthenticationError extends Error {
     constructor(message: string);
 }
-export declare class BigQueryConnection implements Connection, PersistSQLResults, StreamingConnection, FetchSchemaAndRunSimultaneously {
+export declare class BigQueryConnection implements Connection, PersistSQLResults, StreamingConnection {
     static DEFAULT_QUERY_OPTIONS: BigQueryQueryOptions;
     private bigQuery;
     private projectId;
@@ -50,8 +50,6 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
     canStream(): this is StreamingConnection;
-    canFetchSchemaAndRunSimultaneously(): this is FetchSchemaAndRunSimultaneously;
-    canFetchSchemaAndRunStreamSimultaneously(): this is FetchSchemaAndRunStreamSimultaneously;
     private _runSQL;
     runSQL(sqlCommand: string, options?: Partial<BigQueryQueryOptions>, rowIndex?: number): Promise<MalloyQueryData>;
     runSQLBlockAndFetchResultSchema(sqlBlock: SQLBlock, options?: {
@@ -78,9 +76,12 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
         errors: Record<string, string>;
     }>;
     private getSQLBlockSchema;
-    fetchSchemaForSQLBlocks(sqlRefs: SQLBlock[]): Promise<{
-        schemas: Record<string, StructDef>;
-        errors: Record<string, string>;
+    fetchSchemaForSQLBlock(sqlRef: SQLBlock): Promise<{
+        structDef: StructDef;
+        error?: undefined;
+    } | {
+        error: string;
+        structDef?: undefined;
     }>;
     private createBigQueryJobAndGetResults;
     private createBigQueryJob;

package/dist/bigquery_connection.js

@@ -139,12 +139,6 @@ class BigQueryConnection {
     canStream() {
         return true;
     }
-    canFetchSchemaAndRunSimultaneously() {
-        return true;
-    }
-    canFetchSchemaAndRunStreamSimultaneously() {
-        return false;
-    }
     async _runSQL(sqlCommand, options = {}, rowIndex = 0) {
         var _a, _b, _c, _d;
         const defaultOptions = this.readQueryOptions();
@@ -176,7 +170,7 @@ class BigQueryConnection {
         return data;
     }
     async runSQLBlockAndFetchResultSchema(sqlBlock, options) {
-        const { data, schema: schemaRaw } = await this._runSQL(sqlBlock.select, options);
+        const { data, schema: schemaRaw } = await this._runSQL(sqlBlock.selectStr, options);
         const schema = this.structDefFromSQLSchema(sqlBlock, schemaRaw);
         return { data, schema };
     }
@@ -469,7 +463,7 @@ class BigQueryConnection {
             try {
                 const [job] = await this.bigQuery.createQueryJob({
                     location: this.location,
-                    query: sqlRef.select,
+                    query: sqlRef.selectStr,
                     dryRun: true,
                 });
                 return job.metadata.statistics.query.schema;
@@ -480,32 +474,22 @@ class BigQueryConnection {
         }
         throw lastFetchError;
     }
-    async fetchSchemaForSQLBlocks(sqlRefs) {
-        const schemas = {};
-        const errors = {};
-        for (const sqlRef of sqlRefs) {
-            const key = sqlRef.name;
-            let inCache = this.sqlSchemaCache.get(key);
-            if (!inCache) {
-                try {
-                    const tableFieldSchema = await this.getSQLBlockSchema(sqlRef);
-                    inCache = {
-                        schema: this.structDefFromSQLSchema(sqlRef, tableFieldSchema),
-                    };
-                    this.schemaCache.set(key, inCache);
-                }
-                catch (error) {
-                    inCache = { error: error.message };
-                }
-            }
-            if (inCache.schema !== undefined) {
-                schemas[key] = inCache.schema;
+    async fetchSchemaForSQLBlock(sqlRef) {
+        const key = sqlRef.name;
+        let inCache = this.sqlSchemaCache.get(key);
+        if (!inCache) {
+            try {
+                const tableFieldSchema = await this.getSQLBlockSchema(sqlRef);
+                inCache = {
+                    structDef: this.structDefFromSQLSchema(sqlRef, tableFieldSchema),
+                };
             }
-            else {
-                errors[key] = inCache.error;
+            catch (error) {
+                inCache = { error: error.message };
             }
+            this.sqlSchemaCache.set(key, inCache);
         }
-        return { schemas, errors };
+        return inCache;
     }
     // TODO this needs to extend the wait for results using a timeout set by the user,
     // and probably needs to loop to check for results - BQ docs now say that after ~2min of waiting,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.11-dev221202152346",
+  "version": "0.0.11-dev221202180154",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@google-cloud/bigquery": "^5.5.0",
     "@google-cloud/common": "^3.6.0",
-    "@malloydata/malloy": "^0.0.11-dev221202152346",
+    "@malloydata/malloy": "^0.0.11-dev221202180154",
     "gaxios": "^4.2.0"
   }
 }