@sqlanvil/cli 1.12.0 → 1.14.0

package/bundle.js

@@ -35,6 +35,7 @@ var bigquery = require('@google-cloud/bigquery');
 var EventEmitter = require('events');
 var Long = require('long');
 var os = require('os');
+var googleAuthLibrary = require('google-auth-library');
 var promisePoolExecutor = require('promise-pool-executor');
 var sizeof = require('object-sizeof');
 var QueryStream = require('pg-query-stream');
@@ -1277,6 +1278,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [project] ConnectionConfig project
          * @property {string|null} [dataset] ConnectionConfig dataset
          * @property {string|null} [saKeyId] ConnectionConfig saKeyId
+         * @property {string|null} [billingProject] ConnectionConfig billingProject
          * @property {string|null} [host] ConnectionConfig host
          * @property {number|null} [port] ConnectionConfig port
          * @property {string|null} [database] ConnectionConfig database
@@ -1330,6 +1332,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         ConnectionConfig.prototype.saKeyId = "";
 
+        /**
+         * ConnectionConfig billingProject.
+         * @member {string} billingProject
+         * @memberof sqlanvil.ConnectionConfig
+         * @instance
+         */
+        ConnectionConfig.prototype.billingProject = "";
+
         /**
          * ConnectionConfig host.
          * @member {string} host
@@ -1402,6 +1412,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 writer.uint32(/* id 7, wireType 2 =*/58).string(message.database);
             if (message.defaultSchema != null && Object.hasOwnProperty.call(message, "defaultSchema"))
                 writer.uint32(/* id 8, wireType 2 =*/66).string(message.defaultSchema);
+            if (message.billingProject != null && Object.hasOwnProperty.call(message, "billingProject"))
+                writer.uint32(/* id 9, wireType 2 =*/74).string(message.billingProject);
             return writer;
         };
 
@@ -1458,6 +1470,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.saKeyId = reader.string();
                         break;
                     }
+                case 9: {
+                        message.billingProject = reader.string();
+                        break;
+                    }
                 case 5: {
                         message.host = reader.string();
                         break;
@@ -1525,6 +1541,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.saKeyId != null && message.hasOwnProperty("saKeyId"))
                 if (!$util.isString(message.saKeyId))
                     return "saKeyId: string expected";
+            if (message.billingProject != null && message.hasOwnProperty("billingProject"))
+                if (!$util.isString(message.billingProject))
+                    return "billingProject: string expected";
             if (message.host != null && message.hasOwnProperty("host"))
                 if (!$util.isString(message.host))
                     return "host: string expected";
@@ -1564,6 +1583,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.dataset = String(object.dataset);
             if (object.saKeyId != null)
                 message.saKeyId = String(object.saKeyId);
+            if (object.billingProject != null)
+                message.billingProject = String(object.billingProject);
             if (object.host != null)
                 message.host = String(object.host);
             if (object.port != null)
@@ -1597,6 +1618,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.port = 0;
                 object.database = "";
                 object.defaultSchema = "";
+                object.billingProject = "";
             }
             if (message.platform != null && message.hasOwnProperty("platform"))
                 object.platform = message.platform;
@@ -1614,6 +1636,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.database = message.database;
             if (message.defaultSchema != null && message.hasOwnProperty("defaultSchema"))
                 object.defaultSchema = message.defaultSchema;
+            if (message.billingProject != null && message.hasOwnProperty("billingProject"))
+                object.billingProject = message.billingProject;
             return object;
         };
 
@@ -43282,6 +43306,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [projectId] BigQuery projectId
          * @property {string|null} [credentials] BigQuery credentials
          * @property {string|null} [location] BigQuery location
+         * @property {string|null} [accessToken] BigQuery accessToken
          */
 
         /**
@@ -43323,6 +43348,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         BigQuery.prototype.location = "";
 
+        /**
+         * BigQuery accessToken.
+         * @member {string} accessToken
+         * @memberof sqlanvil.BigQuery
+         * @instance
+         */
+        BigQuery.prototype.accessToken = "";
+
         /**
          * Creates a new BigQuery instance using the specified properties.
          * @function create
@@ -43353,6 +43386,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 writer.uint32(/* id 3, wireType 2 =*/26).string(message.credentials);
             if (message.location != null && Object.hasOwnProperty.call(message, "location"))
                 writer.uint32(/* id 4, wireType 2 =*/34).string(message.location);
+            if (message.accessToken != null && Object.hasOwnProperty.call(message, "accessToken"))
+                writer.uint32(/* id 5, wireType 2 =*/42).string(message.accessToken);
             return writer;
         };
 
@@ -43405,6 +43440,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.location = reader.string();
                         break;
                     }
+                case 5: {
+                        message.accessToken = reader.string();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7, long);
                     break;
@@ -43453,6 +43492,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.location != null && message.hasOwnProperty("location"))
                 if (!$util.isString(message.location))
                     return "location: string expected";
+            if (message.accessToken != null && message.hasOwnProperty("accessToken"))
+                if (!$util.isString(message.accessToken))
+                    return "accessToken: string expected";
             return null;
         };
 
@@ -43478,6 +43520,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.credentials = String(object.credentials);
             if (object.location != null)
                 message.location = String(object.location);
+            if (object.accessToken != null)
+                message.accessToken = String(object.accessToken);
             return message;
         };
 
@@ -43498,6 +43542,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.projectId = "";
                 object.credentials = "";
                 object.location = "";
+                object.accessToken = "";
             }
             if (message.projectId != null && message.hasOwnProperty("projectId"))
                 object.projectId = message.projectId;
@@ -43505,6 +43550,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.credentials = message.credentials;
             if (message.location != null && message.hasOwnProperty("location"))
                 object.location = message.location;
+            if (message.accessToken != null && message.hasOwnProperty("accessToken"))
+                object.accessToken = message.accessToken;
             return object;
         };
 
@@ -46319,7 +46366,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.12.0";
+const version = "1.14.0";
 const dataformVersion = "3.0.60";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -48436,6 +48483,19 @@ class LimitedResultSet {
 }
 
 const EXTRA_GOOGLE_SCOPES = ["https://www.googleapis.com/auth/drive"];
+function bigQueryClientOptions(credentials, projectId) {
+    const base = {
+        projectId,
+        scopes: EXTRA_GOOGLE_SCOPES,
+        location: credentials.location
+    };
+    if (credentials.accessToken) {
+        const authClient = new googleAuthLibrary.OAuth2Client();
+        authClient.setCredentials({ access_token: credentials.accessToken });
+        return Object.assign(Object.assign({}, base), { authClient: authClient });
+    }
+    return Object.assign(Object.assign({}, base), { credentials: credentials.credentials ? JSON.parse(credentials.credentials) : undefined });
+}
 const BIGQUERY_DATE_RELATED_FIELDS = [
     "BigQueryDate",
     "BigQueryTime",
@@ -48635,12 +48695,7 @@ class BigQueryDbAdapter {
         }
         projectId = projectId || this.bigQueryCredentials.projectId;
         if (!this.clients.has(projectId)) {
-            this.clients.set(projectId, new bigquery.BigQuery({
-                projectId,
-                scopes: EXTRA_GOOGLE_SCOPES,
-                location: this.bigQueryCredentials.location,
-                credentials: this.bigQueryCredentials.credentials && JSON.parse(this.bigQueryCredentials.credentials)
-            }));
+            this.clients.set(projectId, new bigquery.BigQuery(bigQueryClientOptions(this.bigQueryCredentials, projectId)));
         }
         return this.clients.get(projectId);
     }

package/package.json

@@ -6,6 +6,7 @@
         "deepmerge": "^4.2.2",
         "fs-extra": "^9.0.0",
         "glob": "13.0.6",
+        "google-auth-library": "^9.15.1",
         "google-sql-syntax-ts": "^1.0.3",
         "js-beautify": "^1.10.2",
         "js-yaml": "^4.1.1",
@@ -63,7 +64,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.12.0",
+    "version": "1.14.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -1216,6 +1216,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [project] ConnectionConfig project
          * @property {string|null} [dataset] ConnectionConfig dataset
          * @property {string|null} [saKeyId] ConnectionConfig saKeyId
+         * @property {string|null} [billingProject] ConnectionConfig billingProject
          * @property {string|null} [host] ConnectionConfig host
          * @property {number|null} [port] ConnectionConfig port
          * @property {string|null} [database] ConnectionConfig database
@@ -1269,6 +1270,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         ConnectionConfig.prototype.saKeyId = "";
 
+        /**
+         * ConnectionConfig billingProject.
+         * @member {string} billingProject
+         * @memberof sqlanvil.ConnectionConfig
+         * @instance
+         */
+        ConnectionConfig.prototype.billingProject = "";
+
         /**
          * ConnectionConfig host.
          * @member {string} host
@@ -1341,6 +1350,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 writer.uint32(/* id 7, wireType 2 =*/58).string(message.database);
             if (message.defaultSchema != null && Object.hasOwnProperty.call(message, "defaultSchema"))
                 writer.uint32(/* id 8, wireType 2 =*/66).string(message.defaultSchema);
+            if (message.billingProject != null && Object.hasOwnProperty.call(message, "billingProject"))
+                writer.uint32(/* id 9, wireType 2 =*/74).string(message.billingProject);
             return writer;
         };
 
@@ -1397,6 +1408,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.saKeyId = reader.string();
                         break;
                     }
+                case 9: {
+                        message.billingProject = reader.string();
+                        break;
+                    }
                 case 5: {
                         message.host = reader.string();
                         break;
@@ -1464,6 +1479,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.saKeyId != null && message.hasOwnProperty("saKeyId"))
                 if (!$util.isString(message.saKeyId))
                     return "saKeyId: string expected";
+            if (message.billingProject != null && message.hasOwnProperty("billingProject"))
+                if (!$util.isString(message.billingProject))
+                    return "billingProject: string expected";
             if (message.host != null && message.hasOwnProperty("host"))
                 if (!$util.isString(message.host))
                     return "host: string expected";
@@ -1503,6 +1521,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.dataset = String(object.dataset);
             if (object.saKeyId != null)
                 message.saKeyId = String(object.saKeyId);
+            if (object.billingProject != null)
+                message.billingProject = String(object.billingProject);
             if (object.host != null)
                 message.host = String(object.host);
             if (object.port != null)
@@ -1536,6 +1556,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.port = 0;
                 object.database = "";
                 object.defaultSchema = "";
+                object.billingProject = "";
             }
             if (message.platform != null && message.hasOwnProperty("platform"))
                 object.platform = message.platform;
@@ -1553,6 +1574,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.database = message.database;
             if (message.defaultSchema != null && message.hasOwnProperty("defaultSchema"))
                 object.defaultSchema = message.defaultSchema;
+            if (message.billingProject != null && message.hasOwnProperty("billingProject"))
+                object.billingProject = message.billingProject;
             return object;
         };
 
@@ -43221,6 +43244,7 @@ const sqlanvil = $root.sqlanvil = (() => {
          * @property {string|null} [projectId] BigQuery projectId
          * @property {string|null} [credentials] BigQuery credentials
          * @property {string|null} [location] BigQuery location
+         * @property {string|null} [accessToken] BigQuery accessToken
          */
 
         /**
@@ -43262,6 +43286,14 @@ const sqlanvil = $root.sqlanvil = (() => {
          */
         BigQuery.prototype.location = "";
 
+        /**
+         * BigQuery accessToken.
+         * @member {string} accessToken
+         * @memberof sqlanvil.BigQuery
+         * @instance
+         */
+        BigQuery.prototype.accessToken = "";
+
         /**
          * Creates a new BigQuery instance using the specified properties.
          * @function create
@@ -43292,6 +43324,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 writer.uint32(/* id 3, wireType 2 =*/26).string(message.credentials);
             if (message.location != null && Object.hasOwnProperty.call(message, "location"))
                 writer.uint32(/* id 4, wireType 2 =*/34).string(message.location);
+            if (message.accessToken != null && Object.hasOwnProperty.call(message, "accessToken"))
+                writer.uint32(/* id 5, wireType 2 =*/42).string(message.accessToken);
             return writer;
         };
 
@@ -43344,6 +43378,10 @@ const sqlanvil = $root.sqlanvil = (() => {
                         message.location = reader.string();
                         break;
                     }
+                case 5: {
+                        message.accessToken = reader.string();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7, long);
                     break;
@@ -43392,6 +43430,9 @@ const sqlanvil = $root.sqlanvil = (() => {
             if (message.location != null && message.hasOwnProperty("location"))
                 if (!$util.isString(message.location))
                     return "location: string expected";
+            if (message.accessToken != null && message.hasOwnProperty("accessToken"))
+                if (!$util.isString(message.accessToken))
+                    return "accessToken: string expected";
             return null;
         };
 
@@ -43417,6 +43458,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 message.credentials = String(object.credentials);
             if (object.location != null)
                 message.location = String(object.location);
+            if (object.accessToken != null)
+                message.accessToken = String(object.accessToken);
             return message;
         };
 
@@ -43437,6 +43480,7 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.projectId = "";
                 object.credentials = "";
                 object.location = "";
+                object.accessToken = "";
             }
             if (message.projectId != null && message.hasOwnProperty("projectId"))
                 object.projectId = message.projectId;
@@ -43444,6 +43488,8 @@ const sqlanvil = $root.sqlanvil = (() => {
                 object.credentials = message.credentials;
             if (message.location != null && message.hasOwnProperty("location"))
                 object.location = message.location;
+            if (message.accessToken != null && message.hasOwnProperty("accessToken"))
+                object.accessToken = message.accessToken;
             return object;
         };