@malloydata/db-bigquery 0.0.80-dev230822210650 → 0.0.80-dev230830211713

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, FieldTypeDef, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryRunStats, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
+import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryRunStats, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
 export interface BigQueryManagerOptions {
     credentials?: {
         clientId: string;
@@ -38,6 +38,7 @@ export declare class BigQueryAuthenticationError extends Error {
     constructor(message: string);
 }
 export declare class BigQueryConnection implements Connection, PersistSQLResults, StreamingConnection {
+    private readonly dialect;
     static DEFAULT_QUERY_OPTIONS: BigQueryQueryOptions;
     private bigQuery;
     private projectId;
@@ -49,9 +50,6 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
     private config;
     private location;
     readonly name: string;
-    bqToMalloyTypes: {
-        [key: string]: Partial<FieldTypeDef>;
-    };
     constructor(name: string, queryOptions?: QueryOptionsReader, config?: BigQueryConnectionConfiguration);
     get dialectName(): string;
     private readQueryOptions;

package/dist/bigquery_connection.js

@@ -89,28 +89,10 @@ const TIMEOUT_MS = 1000 * 60 * 10;
 // manage access to BQ, control costs, enforce global data/API limits
 class BigQueryConnection {
     constructor(name, queryOptions, config = {}) {
+        this.dialect = new malloy_1.StandardSQLDialect();
         this.temporaryTables = new Map();
         this.schemaCache = new Map();
         this.sqlSchemaCache = new Map();
-        this.bqToMalloyTypes = {
-            'DATE': { type: 'date' },
-            'STRING': { type: 'string' },
-            'INTEGER': { type: 'number', numberType: 'integer' },
-            'INT64': { type: 'number', numberType: 'integer' },
-            'FLOAT': { type: 'number', numberType: 'float' },
-            'FLOAT64': { type: 'number', numberType: 'float' },
-            'NUMERIC': { type: 'number', numberType: 'float' },
-            'BIGNUMERIC': { type: 'number', numberType: 'float' },
-            'TIMESTAMP': { type: 'timestamp' },
-            'BOOLEAN': { type: 'boolean' },
-            'BOOL': { type: 'boolean' },
-            'JSON': { type: 'json' },
-            // TODO (https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#tablefieldschema):
-            // BYTES
-            // DATETIME
-            // TIME
-            // GEOGRAPHY
-        };
         this.name = name;
         this.bigQuery = new bigquery_1.BigQuery({
             userAgent: `Malloy/${malloy_1.Malloy.version}`,
@@ -356,6 +338,7 @@ class BigQueryConnection {
         return job.id;
     }
     addFieldsToStructDef(structDef, tableFieldSchema) {
+        var _a;
         if (!tableFieldSchema.fields)
             return;
         for (const field of tableFieldSchema.fields) {
@@ -364,7 +347,7 @@ class BigQueryConnection {
             const name = field.name;
             // check for an array
             if (field.mode === 'REPEATED' && !['STRUCT', 'RECORD'].includes(type)) {
-                const malloyType = this.bqToMalloyTypes[type];
+                const malloyType = this.dialect.sqlTypeToMalloyType(type);
                 if (malloyType) {
                     const innerStructDef = {
                         type: 'struct',
@@ -396,7 +379,7 @@ class BigQueryConnection {
                 structDef.fields.push(innerStructDef);
             }
             else {
-                const malloyType = this.bqToMalloyTypes[type] || {
+                const malloyType = (_a = this.dialect.sqlTypeToMalloyType(type)) !== null && _a !== void 0 ? _a : {
                     type: 'unsupported',
                     rawType: type.toLowerCase(),
                 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.80-dev230822210650",
+  "version": "0.0.80-dev230830211713",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "@google-cloud/bigquery": "^5.5.0",
     "@google-cloud/common": "^3.6.0",
     "@google-cloud/paginator": "^4.0.1",
-    "@malloydata/malloy": "^0.0.80-dev230822210650",
+    "@malloydata/malloy": "^0.0.80-dev230830211713",
     "gaxios": "^4.2.0"
   }
 }