@malloydata/db-bigquery 0.0.120-dev240131223846 → 0.0.121-dev240201150428

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 { Connection, FetchSchemaOptions, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, FetchSchemaOptions, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
 export interface BigQueryManagerOptions {
     credentials?: {
         clientId: string;
@@ -11,15 +11,13 @@ export interface BigQueryManagerOptions {
     projectId?: string | undefined;
     userAgent: string;
 }
-export interface BigQueryQueryOptions {
-    rowLimit: number;
-}
 interface CredentialBody {
     client_email?: string;
     private_key?: string;
 }
 interface BigQueryConnectionConfiguration {
-    projectId?: string /** This ID is used for Bigquery Table Normalization */;
+    /** This ID is used for Bigquery Table Normalization */
+    projectId?: string;
     serviceAccountKeyPath?: string;
     location?: string;
     maximumBytesBilled?: string;
@@ -27,20 +25,30 @@ interface BigQueryConnectionConfiguration {
     billingProjectId?: string;
     credentials?: CredentialBody;
 }
+interface BigQueryConnectionOptions extends ConnectionConfig {
+    /** This ID is used for Bigquery Table Normalization */
+    projectId?: string;
+    serviceAccountKeyPath?: string;
+    location?: string;
+    maximumBytesBilled?: string;
+    timeoutMs?: string;
+    billingProjectId?: string;
+    client_email?: string;
+    private_key?: string;
+}
 interface SchemaInfo {
     schema: bigquery.ITableFieldSchema;
     needsTableSuffixPseudoColumn: boolean;
     needsPartitionTimePseudoColumn: boolean;
     needsPartitionDatePseudoColumn: boolean;
 }
-type QueryOptionsReader = Partial<BigQueryQueryOptions> | (() => Partial<BigQueryQueryOptions>);
 export declare class BigQueryAuthenticationError extends Error {
     constructor(message: string);
 }
 export declare class BigQueryConnection implements Connection, PersistSQLResults, StreamingConnection {
     readonly name: string;
     private readonly dialect;
-    static DEFAULT_QUERY_OPTIONS: BigQueryQueryOptions;
+    static DEFAULT_QUERY_OPTIONS: RunSQLOptions;
     private bigQuery;
     private billingProjectId;
     private temporaryTables;
@@ -50,6 +58,7 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
     private queryOptions?;
     private config;
     private location;
+    constructor(option: BigQueryConnectionOptions, queryOptions?: QueryOptionsReader);
     constructor(name: string, queryOptions?: QueryOptionsReader, config?: BigQueryConnectionConfiguration);
     get dialectName(): string;
     private readQueryOptions;
@@ -58,10 +67,8 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
     canStream(): this is StreamingConnection;
     get supportsNesting(): boolean;
     private _runSQL;
-    runSQL(sqlCommand: string, options?: Partial<BigQueryQueryOptions>, rowIndex?: number): Promise<MalloyQueryData>;
-    runSQLBlockAndFetchResultSchema(sqlBlock: SQLBlock, options?: {
-        rowLimit?: number | undefined;
-    }): Promise<{
+    runSQL(sqlCommand: string, options?: RunSQLOptions, rowIndex?: number): Promise<MalloyQueryData>;
+    runSQLBlockAndFetchResultSchema(sqlBlock: SQLBlock, options?: RunSQLOptions): Promise<{
         data: MalloyQueryData;
         schema: StructDef;
     }>;

package/dist/bigquery_connection.js

@@ -88,12 +88,25 @@ const MAXIMUM_BYTES_BILLED = String(25 * 1024 * 1024 * 1024);
 const TIMEOUT_MS = 1000 * 60 * 10;
 // manage access to BQ, control costs, enforce global data/API limits
 class BigQueryConnection {
-    constructor(name, queryOptions, config = {}) {
-        this.name = name;
+    constructor(arg, queryOptions, config = {}) {
         this.dialect = new malloy_1.StandardSQLDialect();
         this.temporaryTables = new Map();
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
+        if (typeof arg === 'string') {
+            this.name = arg;
+        }
+        else {
+            const { name, client_email, private_key, ...args } = arg;
+            this.name = name;
+            config = args;
+            if (client_email || private_key) {
+                config.credentials = {
+                    client_email,
+                    private_key,
+                };
+            }
+        }
         this.bigQuery = new bigquery_1.BigQuery({
             userAgent: `Malloy/${malloy_1.Malloy.version}`,
             keyFilename: config.serviceAccountKeyPath,

package/package.json

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