Compare `fe003c0 ... +100 ... 9508788`

 * @module spanner/session
 */

import {GrpcServiceObject} from './common-grpc/service-object';
// eslint-disable-next-line @typescript-eslint/no-var-requires
const common = require('./common-grpc/service-object');
import {promisifyAll} from '@google-cloud/promisify';
import * as extend from 'extend';
import * as r from 'teeny-request';

@@ -34,9 +35,9 @@

  CreateSessionCallback,
  CreateSessionOptions,
} from './database';
import {ServiceObjectConfig, DeleteCallback} from '@google-cloud/common';
import {NormalCallback} from './common';
import {ServiceError} from 'grpc';
import {ServiceObjectConfig} from '@google-cloud/common';
import {NormalCallback, CLOUD_RESOURCE_HEADER} from './common';
import {grpc, CallOptions} from 'google-gax';

export type GetSessionResponse = [Session, r.Response];


@@ -55,7 +56,9 @@


export type KeepAliveCallback = NormalCallback<google.spanner.v1.IResultSet>;
export type KeepAliveResponse = [google.spanner.v1.IResultSet];
export type DeleteResponse = [r.Response];
export type DeleteSessionResponse = [google.protobuf.IEmpty];
export type DeleteSessionCallback = NormalCallback<google.protobuf.IEmpty>;

/**
 * Create a Session object to interact with a Cloud Spanner session.
 *

@@ -94,13 +97,14 @@

 * //-
 * const session = database.session('session-name');
 */
export class Session extends GrpcServiceObject {
export class Session extends common.GrpcServiceObject {
  id!: string;
  formattedName_?: string;
  type?: types;
  txn?: Transaction;
  lastUsed?: number;
  lastError?: ServiceError;
  lastError?: grpc.ServiceError;
  resourceHeader_: {[k: string]: string};
  constructor(database: Database, name?: string) {
    const methods = {
      /**

@@ -231,15 +235,19 @@

      },
    } as {}) as ServiceObjectConfig);

    this.resourceHeader_ = {
      [CLOUD_RESOURCE_HEADER]: (this.parent as Database).formattedName_,
    };
    this.request = database.request;
    this.requestStream = database.requestStream;

    if (name) {
      this.formattedName_ = Session.formatName_(database.formattedName_, name);
    }
  }
  delete(): Promise<DeleteResponse>;
  delete(callback: DeleteCallback): void;
  delete(gaxOptions?: CallOptions): Promise<DeleteSessionResponse>;
  delete(callback: DeleteSessionCallback): void;
  delete(gaxOptions: CallOptions, callback: DeleteSessionCallback): void;
  /**
   * Delete a session.
   *

@@ -248,8 +256,10 @@

   * @see {@link v1.SpannerClient#deleteSession}
   * @see [DeleteSession API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.DeleteSession)
   *
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {DeleteSessionCallback} [callback] Callback function.
   * @returns {Promise<DeleteSessionResponse>}
   *
   * @example
   * session.delete(function(err, apiResponse) {

@@ -267,7 +277,15 @@

   *   const apiResponse = data[0];
   * });
   */
  delete(callback?: DeleteCallback): void | Promise<DeleteResponse> {
  delete(
    optionsOrCallback?: CallOptions | DeleteSessionCallback,
    cb?: DeleteSessionCallback
  ): void | Promise<DeleteSessionResponse> {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const reqOpts = {
      name: this.formattedName_,
    };

@@ -276,12 +294,18 @@

        client: 'SpannerClient',
        method: 'deleteSession',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback!
    );
  }
  getMetadata(): Promise<GetSessionMetadataResponse>;
  getMetadata(gaxOptions?: CallOptions): Promise<GetSessionMetadataResponse>;
  getMetadata(callback: GetSessionMetadataCallback): void;
  getMetadata(
    gaxOptions: CallOptions,
    callback: GetSessionMetadataCallback
  ): void;
  /**
   * @typedef {array} GetSessionMetadataResponse
   * @property {object} 0 The session's metadata.

@@ -301,6 +325,8 @@

   * @see {@link v1.SpannerClient#getSession}
   * @see [GetSession API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.GetSession)
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {GetSessionMetadataCallback} [callback] Callback function.
   * @returns {Promise<GetSessionMetadataResponse>}
   *

@@ -316,8 +342,14 @@

   * });
   */
  getMetadata(
    callback?: GetSessionMetadataCallback
    optionsOrCallback?: CallOptions | GetSessionMetadataCallback,
    cb?: GetSessionMetadataCallback
  ): void | Promise<GetSessionMetadataResponse> {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const reqOpts = {
      name: this.formattedName_,
    };

@@ -326,15 +358,25 @@

        client: 'SpannerClient',
        method: 'getSession',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback!
      (err, resp) => {
        if (resp) {
          this.metadata = resp;
        }
        callback!(err, resp);
      }
    );
  }
  keepAlive(): Promise<KeepAliveResponse>;
  keepAlive(gaxOptions?: CallOptions): Promise<KeepAliveResponse>;
  keepAlive(callback: KeepAliveCallback): void;
  keepAlive(gaxOptions: CallOptions, callback: KeepAliveCallback): void;
  /**
   * Ping the session with `SELECT 1` to prevent it from expiring.
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -345,7 +387,15 @@

   *   }
   * });
   */
  keepAlive(callback?: KeepAliveCallback): void | Promise<KeepAliveResponse> {
  keepAlive(
    optionsOrCallback?: CallOptions | KeepAliveCallback,
    cb?: KeepAliveCallback
  ): void | Promise<KeepAliveResponse> {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const reqOpts = {
      session: this.formattedName_,
      sql: 'SELECT 1',

@@ -355,6 +405,8 @@

        client: 'SpannerClient',
        method: 'executeSql',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback!
    );

@@ -15,51 +15,47 @@

 */

import {GrpcService, GrpcServiceConfig} from './common-grpc/service';
import {paginator} from '@google-cloud/paginator';
import {PreciseDate} from '@google-cloud/precise-date';
import {replaceProjectIdToken} from '@google-cloud/projectify';
import {promisifyAll} from '@google-cloud/promisify';
import * as extend from 'extend';
import {GoogleAuth, GoogleAuthOptions} from 'google-auth-library';
import * as is from 'is';
import * as path from 'path';
import {common as p} from 'protobufjs';
import * as streamEvents from 'stream-events';
import * as through from 'through2';
import {codec, Float, Int, SpannerDate, Struct} from './codec';
import {codec, Float, Int, Numeric, SpannerDate, Struct} from './codec';
import {Backup} from './backup';
import {Database} from './database';
import {
  Instance,
  CreateInstanceCallback,
  CreateInstanceResponse,
} from './instance';
import {grpc, GrpcClientOptions, CallOptions} from 'google-gax';
import {google as instanceAdmin} from '../protos/protos';
import {PagedRequest, PagedResponse, PagedCallback} from './common';
import {
  PagedOptions,
  PagedResponse,
  PagedCallback,
  PagedOptionsWithFilter,
  CLOUD_RESOURCE_HEADER,
} from './common';
import {Session} from './session';
import {SessionPool} from './session-pool';
import {Table} from './table';
import {PartitionedDml, Snapshot, Transaction} from './transaction';
import {GrpcClientOptions} from 'google-gax';
import {ChannelCredentials} from 'grpc';
import {
  createGcpApiConfig,
  gcpCallInvocationTransformer,
  gcpChannelFactoryOverride,
} from 'grpc-gcp';
import grpcGcpModule = require('grpc-gcp');
const grpcGcp = grpcGcpModule(grpc);
import * as v1 from './v1';
import * as grpc from 'grpc';

// eslint-disable-next-line @typescript-eslint/no-var-requires
const gcpApiConfig = require('./spanner_grpc_config.json');

export type IOperation = instanceAdmin.longrunning.IOperation;

export type GetInstancesRequest = PagedRequest<
  instanceAdmin.spanner.admin.instance.v1.IListInstancesRequest & {
    maxResults?: number;
  }
>;
export type GetInstancesOptions = PagedOptionsWithFilter;

export type GetInstancesResponse = PagedResponse<
  Instance,
  instanceAdmin.spanner.admin.instance.v1.IListInstancesResponse

@@ -69,37 +65,36 @@

  instanceAdmin.spanner.admin.instance.v1.IListInstancesResponse
>;

export type GetInstanceConfigsRequest = PagedRequest<
  instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsRequest & {
    maxResults?: number;
  }
>;
export type GetInstanceConfigsOptions = PagedOptions;
export type GetInstanceConfigsResponse = PagedResponse<
  instanceAdmin.spanner.admin.instance.v1.InstanceConfig,
  instanceAdmin.spanner.admin.instance.v1.IInstanceConfig,
  instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsResponse
>;
export type GetInstanceConfigsCallback = PagedCallback<
  instanceAdmin.spanner.admin.instance.v1.InstanceConfig,
  instanceAdmin.spanner.admin.instance.v1.IInstanceConfig,
  instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsResponse
>;

export interface SpannerOptions extends GrpcClientOptions {
  apiEndpoint?: string;
  servicePath?: string;
  port?: number;
  sslCreds?: ChannelCredentials;
  sslCreds?: grpc.ChannelCredentials;
}
export interface RequestConfig {
  client: string;
  method: string;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  reqOpts: any;
  gaxOpts?: {};
  gaxOpts?: CallOptions;
  headers: {[k: string]: string};
}
export interface CreateInstanceRequest {
  config: string;
  config?: string;
  nodes?: number;
  displayName?: string;
  labels?: {[k: string]: string} | null;
  gaxOptions?: CallOptions;
}
/**
 * Translates enum values to string keys.

@@ -161,7 +156,8 @@

  auth: GoogleAuth;
  clients_: Map<string, {}>;
  instances_: Map<string, Instance>;
  getInstancesStream: Function;
  projectFormattedName_: string;
  resourceHeader_: {[k: string]: string};

  /**
   * Placeholder used to auto populate a column with the commit timestamp.

@@ -225,9 +221,9 @@

        libVersion: require('../../package.json').version,
        scopes,
        // Enable grpc-gcp support
        'grpc.callInvocationTransformer': gcpCallInvocationTransformer,
        'grpc.channelFactoryOverride': gcpChannelFactoryOverride,
        'grpc.gcpApiConfig': createGcpApiConfig(gcpApiConfig),
        'grpc.callInvocationTransformer': grpcGcp.gcpCallInvocationTransformer,
        'grpc.channelFactoryOverride': grpcGcp.gcpChannelFactoryOverride,
        'grpc.gcpApiConfig': grpcGcp.createGcpApiConfig(gcpApiConfig),
        grpc,
      },
      options || {}

@@ -262,43 +258,10 @@

    this.auth = new GoogleAuth(this.options);
    this.clients_ = new Map();
    this.instances_ = new Map();

    /**
     * Get a list of {@link Instance} objects as a readable object stream.
     *
     * Wrapper around {@link v1.InstanceAdminClient#listInstances}.
     *
     * @see {@link v1.InstanceAdminClient#listInstances}
     * @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
     *
     * @method Spanner#getInstancesStream
     * @param {GetInstancesRequest} [query] Query object for listing instances.
     * @returns {ReadableStream} A readable stream that emits {@link Instance}
     *     instances.
     *
     * @example
     * const {Spanner} = require('@google-cloud/spanner');
     * const spanner = new Spanner();
     *
     * spanner.getInstancesStream()
     *   .on('error', console.error)
     *   .on('data', function(instance) {
     *     // `instance` is an `Instance` object.
     *   })
     *   .on('end', function() {
     *     // All instances retrieved.
     *   });
     *
     * //-
     * // If you anticipate many results, you can end a stream early to prevent
     * // unnecessary processing and API requests.
     * //-
     * spanner.getInstancesStream()
     *   .on('data', function(instance) {
     *     this.end();
     *   });
     */
    this.getInstancesStream = paginator.streamify('getInstances');
    this.projectFormattedName_ = 'projects/' + this.projectId;
    this.resourceHeader_ = {
      [CLOUD_RESOURCE_HEADER]: this.projectFormattedName_,
    };
  }

  createInstance(

@@ -324,6 +287,11 @@

   *     be used to control how resource metrics are aggregated. And they can
   *     be used as arguments to policy management rules (e.g. route,
   *     firewall, load balancing, etc.).
   * @property {string} [displayName] The descriptive name for this instance
   *     as it appears in UIs. Must be unique per project and between 4 and 30
   *     characters in length.
   *     Defaults to the instance unique identifier '<instance>' of the full
   *     instance name of the form 'projects/<project>/instances/<instance>'.
   */
  /**
   * @typedef {array} CreateInstanceResponse

@@ -406,30 +374,33 @@

      );
    }
    const formattedName = Instance.formatName_(this.projectId, name);
    const shortName = formattedName.split('/').pop();
    const displayName = config.displayName || formattedName.split('/').pop();
    const reqOpts = {
      parent: 'projects/' + this.projectId,
      instanceId: shortName,
      parent: this.projectFormattedName_,
      instanceId: formattedName.split('/').pop(),
      instance: extend(
        {
          name: formattedName,
          displayName: shortName,
          displayName,
          nodeCount: config.nodes || 1,
        },
        config
      ),
    };

    delete reqOpts.instance.nodes;
    delete reqOpts.instance.gaxOptions;

    if (config.config.indexOf('/') === -1) {
    if (config.config!.indexOf('/') === -1) {
      reqOpts.instance.config = `projects/${this.projectId}/instanceConfigs/${config.config}`;
    }
    this.request(
      {
        client: 'InstanceAdminClient',
        method: 'createInstance',
        reqOpts,
        gaxOpts: config.gaxOptions,
        headers: this.resourceHeader_,
      },
      (err, operation, resp) => {
        if (err) {

@@ -442,18 +413,18 @@

    );
  }

  getInstances(query?: GetInstancesRequest): Promise<GetInstancesResponse>;
  getInstances(options?: GetInstancesOptions): Promise<GetInstancesResponse>;
  getInstances(callback: GetInstancesCallback): void;
  getInstances(
    query: GetInstancesRequest,
    query: GetInstancesOptions,
    callback: GetInstancesCallback
  ): void;
  /**
   * Query object for listing instances.
   *
   * @typedef {object} GetInstancesRequest
   * @property {boolean} [autoPaginate=true] Have pagination handled
   *     automatically.
   * @typedef {object} GetInstancesOptions
   * @property {object} [gaxOptions] Request configuration options, outlined
   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
   * @property {string} [filter] An expression for filtering the results of the
   *     request. Filter rules are case insensitive. The fields eligible for
   *     filtering are:

@@ -468,21 +439,21 @@

   *     - **`labels.env:dev`** The instance's label env has the value dev.
   *     - **`name:howl labels.env:dev`** The instance's name is howl and it has
   *       the label env with value dev.
   * @property {number} [maxApiCalls] Maximum number of API calls to make.
   * @property {number} [maxResults] Maximum number of items to return.
   * @property {number} [pageSize] Maximum number of results per page.
   * @property {string} [pageToken] A previously-returned page token
   *     representing part of the larger set of results to view.
   */
  /**
   * @typedef {array} GetInstancesResponse
   * @property {Instance[]} 0 Array of {@link Instance} instances.
   * @property {object} 1 The full API response.
   * @property {object} 1 A query object to receive more results.
   * @property {object} 2 The full API response.
   */
  /**
   * @callback GetInstancesCallback
   * @param {?Error} err Request error, if any.
   * @param {Instance[]} instances Array of {@link Instance} instances.
   * @param {string} nextQuery A query object to receive more results.
   * @param {object} apiResponse The full API response.
   */
  /**

@@ -493,7 +464,7 @@

   * @see {@link v1.InstanceAdminClient#listInstances}
   * @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
   *
   * @param {GetInstancesRequest} [query] Query object for listing instances.
   * @param {GetInstancesOptions} [options] Query object for listing instances.
   * @param {GetInstancesCallback} [callback] Callback function.
   * @returns {Promise<GetInstancesResponse>}
   *

@@ -517,7 +488,9 @@

   * }
   *
   * spanner.getInstances({
   *   autoPaginate: false
   *   gaxOptions: {
   *     autoPaginate: false,
   *   }
   * }, callback);
   *
   * //-

@@ -528,26 +501,50 @@

   * });
   */
  getInstances(
    query?: GetInstancesRequest | GetInstancesCallback,
    callback?: GetInstancesCallback
    optionsOrCallback?: GetInstancesOptions | GetInstancesCallback,
    cb?: GetInstancesCallback
  ): Promise<GetInstancesResponse> | void {
    // eslint-disable-next-line @typescript-eslint/no-this-alias
    const self = this;
    if (is.fn(query)) {
      callback = query as GetInstancesCallback;
      query = {};
    }
    const reqOpts = extend({}, query, {
    const options =
      typeof optionsOrCallback === 'object'
        ? optionsOrCallback
        : ({} as GetInstancesOptions);
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const gaxOpts = extend(true, {}, options.gaxOptions);

    let reqOpts = extend({}, options, {
      parent: 'projects/' + this.projectId,
    });

    delete reqOpts.gaxOptions;

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageToken;
      delete gaxOpts.pageSize;
    }

    this.request(
      {
        client: 'InstanceAdminClient',
        method: 'listInstances',
        reqOpts,
        gaxOpts: query,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, instances, ...args) => {
      (err, instances, nextPageRequest, ...args) => {
        let instanceInstances: Instance[] | null = null;
        if (instances) {
          instanceInstances = instances.map(instance => {

@@ -556,38 +553,108 @@

            return instanceInstance;
          });
        }
        callback!(err, instanceInstances, ...args);
        const nextQuery = nextPageRequest!
          ? extend({}, options, nextPageRequest!)
          : null;
        callback!(err, instanceInstances, nextQuery, ...args);
      }
    );
  }

  /**
   * Get a list of {@link Instance} objects as a readable object stream.
   *
   * Wrapper around {@link v1.InstanceAdminClient#listInstances}.
   *
   * @see {@link v1.InstanceAdminClient#listInstances}
   * @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
   *
   * @method Spanner#getInstancesStream
   * @param {GetInstancesOptions} [options] Query object for listing instances.
   * @returns {ReadableStream} A readable stream that emits {@link Instance}
   *     instances.
   *
   * @example
   * const {Spanner} = require('@google-cloud/spanner');
   * const spanner = new Spanner();
   *
   * spanner.getInstancesStream()
   *   .on('error', console.error)
   *   .on('data', function(instance) {
   *     // `instance` is an `Instance` object.
   *   })
   *   .on('end', function() {
   *     // All instances retrieved.
   *   });
   *
   * //-
   * // If you anticipate many results, you can end a stream early to prevent
   * // unnecessary processing and API requests.
   * //-
   * spanner.getInstancesStream()
   *   .on('data', function(instance) {
   *     this.end();
   *   });
   */
  getInstancesStream(options: GetInstancesOptions = {}): NodeJS.ReadableStream {
    const gaxOpts = extend(true, {}, options.gaxOptions);

    let reqOpts = extend({}, options, {
      parent: 'projects/' + this.projectId,
    });
    delete reqOpts.gaxOptions;

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageSize;
      delete gaxOpts.pageToken;
    }

    return this.requestStream({
      client: 'InstanceAdminClient',
      method: 'listInstancesStream',
      reqOpts,
      gaxOpts,
      headers: this.resourceHeader_,
    });
  }

  getInstanceConfigs(
    query?: GetInstanceConfigsRequest
    query?: GetInstanceConfigsOptions
  ): Promise<GetInstanceConfigsResponse>;
  getInstanceConfigs(callback: GetInstanceConfigsCallback): void;
  getInstanceConfigs(
    query: GetInstanceConfigsRequest,
    query: GetInstanceConfigsOptions,
    callback: GetInstanceConfigsCallback
  ): void;
  /**
   * Query object for listing instance configs.
   * Lists the supported instance configurations for a given project.
   *
   * @typedef {object} GetInstanceConfigsRequest
   * @property {boolean} [autoPaginate=true] Have pagination handled
   *     automatically.
   * @property {number} [maxApiCalls] Maximum number of API calls to make.
   * @property {number} [maxResults] Maximum number of items to return.
   * @typedef {object} GetInstanceConfigsOptions
   * @property {number} [pageSize] Maximum number of results per page.
   * @property {string} [pageToken] A previously-returned page token
   *     representing part of the larger set of results to view.
   * @property {object} [gaxOptions] Request configuration options, outlined
   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.

   */
  /**
   * @typedef {array} GetInstanceConfigsResponse
   * @property {object[]} 0 List of all available instance configs.
   * @property {string} 0.name The unique identifier for the instance config.
   * @property {string} 0.displayName The name of the instance config as it
   *     appears in UIs.
   * @property {object} 1 The full API response.
   * @property {object} 1 A query object to receive more results.
   * @property {object} 2 The full API response.
   */
  /**
   * @callback GetInstanceConfigsCallback

@@ -597,6 +664,7 @@

   *     config.
   * @param {string} instanceConfigs.displayName The name of the instance config
   *     as it appears in UIs.
   * @param {object} nextQuery A query object to receive more results.
   * @param {object} apiResponse The full API response.
   */
  /**

@@ -607,7 +675,7 @@

   * @see {@link v1.InstanceAdminClient#listInstanceConfigs}
   * @see [ListInstanceConfigs API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs)
   *
   * @param {GetInstanceConfigsRequest} [query] Query object for listing instance
   * @param {GetInstanceConfigsOptions} [options] Query object for listing instance
   *     configs.
   * @param {GetInstanceConfigsCallback} [callback] Callback function.
   * @returns {Promise<GetInstanceConfigsResponse>}

@@ -632,7 +700,9 @@

   * }
   *
   * spanner.getInstanceConfigs({
   *   autoPaginate: false
   *   gaxOptions: {
   *     autoPaginate: false,
   *   }
   * }, callback);
   *
   * //-

@@ -643,28 +713,51 @@

   * });
   */
  getInstanceConfigs(
    queryOrCallback?: GetInstanceConfigsRequest | GetInstanceConfigsCallback,
    optionsOrCallback?: GetInstanceConfigsOptions | GetInstanceConfigsCallback,
    cb?: GetInstanceConfigsCallback
  ): Promise<GetInstanceConfigsResponse> | void {
    const callback =
      typeof queryOrCallback === 'function'
        ? (queryOrCallback as GetInstanceConfigsCallback)
        : cb;
    const query =
      typeof queryOrCallback === 'object'
        ? (queryOrCallback as GetInstanceConfigsRequest)
        : {};
    const reqOpts = extend({}, query, {
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb;
    const options =
      typeof optionsOrCallback === 'object'
        ? optionsOrCallback
        : ({} as GetInstanceConfigsOptions);

    const gaxOpts = extend(true, {}, options.gaxOptions);
    let reqOpts = extend({}, options, {
      parent: 'projects/' + this.projectId,
    });
    delete reqOpts.gaxOptions;

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageSize;
      delete gaxOpts.pageToken;
    }

    return this.request(
      {
        client: 'InstanceAdminClient',
        method: 'listInstanceConfigs',
        reqOpts,
        gaxOpts: query,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback
      (err, instanceConfigs, nextPageRequest, ...args) => {
        const nextQuery = nextPageRequest!
          ? extend({}, options, nextPageRequest!)
          : null;
        callback!(err, instanceConfigs, nextQuery, ...args);
      }
    );
  }


@@ -677,7 +770,7 @@

   * @see [ListInstanceConfigs API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs)
   *
   * @method Spanner#getInstanceConfigsStream
   * @param {GetInstanceConfigsRequest} [query] Query object for listing instance
   * @param {GetInstanceConfigsOptions} [options] Query object for listing instance
   *     configs.
   * @returns {ReadableStream} A readable stream that emits instance configs.
   *

@@ -702,16 +795,36 @@

   *   });
   */
  getInstanceConfigsStream(
    query?: GetInstanceConfigsRequest
    options: GetInstanceConfigsOptions = {}
  ): NodeJS.ReadableStream {
    const reqOpts = extend({}, query, {
    const gaxOpts = extend(true, {}, options.gaxOptions);

    let reqOpts = extend({}, options, {
      parent: 'projects/' + this.projectId,
    });

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageSize;
      delete gaxOpts.pageToken;
    }

    delete reqOpts.gaxOptions;
    return this.requestStream({
      client: 'InstanceAdminClient',
      method: 'listInstanceConfigsStream',
      reqOpts,
      gaxOpts: query,
      gaxOpts,
      headers: this.resourceHeader_,
    });
  }


@@ -764,7 +877,12 @@

      const requestFn = gaxClient[config.method].bind(
        gaxClient,
        reqOpts,
        config.gaxOpts
        // Add headers to `gaxOpts`
        extend(true, {}, config.gaxOpts, {
          otherArgs: {
            headers: config.headers,
          },
        })
      );
      callback(null, requestFn);
    });

@@ -783,7 +901,7 @@

   */
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  request(config: any, callback?: any): any {
    if (is.fn(callback)) {
    if (typeof callback === 'function') {
      this.prepareGapicRequest_(config, (err, requestFn) => {
        if (err) {
          callback(err);

@@ -939,6 +1057,20 @@

    return new codec.Int(value);
  }

  /**
   * Helper function to get a Cloud Spanner Numeric object.
   *
   * @param {string} value The numeric value as a string.
   * @returns {Numeric}
   *
   * @example
   * const {Spanner} = require('@google-cloud/spanner');
   * const numeric = Spanner.numeric("3.141592653");
   */
  static numeric(value): Numeric {
    return new codec.Numeric(value);
  }

  /**
   * Helper function to get a Cloud Spanner Struct object.
   *

@@ -969,9 +1101,9 @@

  exclude: [
    'date',
    'float',
    'getInstanceConfigs',
    'instance',
    'int',
    'numeric',
    'operation',
    'timestamp',
  ],

@@ -16,7 +16,7 @@


import {promisifyAll} from '@google-cloud/promisify';
import * as through from 'through2';
import {Operation as GaxOperation} from 'google-gax';
import {Operation as GaxOperation, CallOptions} from 'google-gax';
import {Database, UpdateSchemaCallback, UpdateSchemaResponse} from './database';
import {PartialResultStream, Row} from './partial-result-stream';
import {

@@ -90,8 +90,16 @@

     */
    this.name = name;
  }
  create(schema: Schema): Promise<CreateTableResponse>;
  create(
    schema: Schema,
    gaxOptions?: CallOptions
  ): Promise<CreateTableResponse>;
  create(schema: Schema, callback: CreateTableCallback): void;
  create(
    schema: Schema,
    gaxOptions: CallOptions,
    callback: CreateTableCallback
  ): void;
  /**
   * Create a table.
   *

@@ -143,9 +151,15 @@

   */
  create(
    schema: Schema,
    callback?: CreateTableCallback
    gaxOptionsOrCallback?: CallOptions | CreateTableCallback,
    cb?: CreateTableCallback
  ): Promise<CreateTableResponse> | void {
    this.database.createTable(schema, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this.database.createTable(schema, gaxOptions, callback!);
  }
  /**
   * Create a readable object stream to receive rows from the database using key

@@ -236,8 +250,9 @@


    return proxyStream as PartialResultStream;
  }
  delete(): Promise<DropTableResponse>;
  delete(gaxOptions?: CallOptions): Promise<DropTableResponse>;
  delete(callback: DropTableCallback): void;
  delete(gaxOptions: CallOptions, callback: DropTableCallback): void;
  /**
   * Delete the table. Not to be confused with {@link Table#deleteRows}.
   *

@@ -246,6 +261,8 @@

   * @see {@link Database#updateSchema}
   *
   * @throws {TypeError} If any arguments are passed in.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {LongRunningOperationCallback} [callback] Callback function.
   * @returns {Promise<LongRunningOperationResponse>}
   *

@@ -281,20 +298,31 @@

   *     // Table deleted successfully.
   *   });
   */
  delete(callback?: DropTableCallback): Promise<DropTableResponse> | void {
    if (callback && typeof callback !== 'function') {
      throw new TypeError(
        'Unexpected argument, please see Table#deleteRows to delete rows.'
      );
    }
  delete(
    gaxOptionsOrCallback?: CallOptions | DropTableCallback,
    cb?: DropTableCallback
  ): Promise<DropTableResponse> | void {
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    return this.database.updateSchema(
      'DROP TABLE `' + this.name + '`',
      gaxOptions,
      callback!
    );
  }
  deleteRows(keys: Key[]): Promise<DeleteRowsResponse>;
  deleteRows(
    keys: Key[],
    gaxOptions?: CallOptions
  ): Promise<DeleteRowsResponse>;
  deleteRows(keys: Key[], callback: DeleteRowsCallback): void;
  deleteRows(
    keys: Key[],
    gaxOptions: CallOptions,
    callback: DeleteRowsCallback
  ): void;
  /**
   * Delete rows from this table.
   *

@@ -303,6 +331,8 @@

   * @param {array} keys The keys for the rows to delete. If using a
   *     composite key, provide an array within this array. See the example
   * below.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -342,18 +372,27 @@

   */
  deleteRows(
    keys: Key[],
    callback?: DeleteRowsCallback
    gaxOptionsOrCallback?: CallOptions | DeleteRowsCallback,
    cb?: DeleteRowsCallback
  ): Promise<DeleteRowsResponse> | void {
    return this._mutate('deleteRows', keys, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    return this._mutate('deleteRows', keys, gaxOptions, callback!);
  }
  drop(): Promise<DropTableResponse>;
  drop(gaxOptions?: CallOptions): Promise<DropTableResponse>;
  drop(callback: DropTableCallback): void;
  drop(gaxOptions: CallOptions, callback: DropTableCallback): void;
  /**
   * Drop the table.
   *
   * @see {@link Table#delete}
   * @see {@link Database#updateSchema}
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {LongRunningOperationCallback} [callback] Callback function.
   * @returns {Promise<LongRunningOperationResponse>}
   *

@@ -389,18 +428,36 @@

   *     // Table dropped successfully.
   *   });
   */
  drop(callback?: DropTableCallback): Promise<DropTableResponse> | void {
    return this.delete(callback!);
  drop(
    gaxOptionsOrCallback?: CallOptions | DropTableCallback,
    cb?: DropTableCallback
  ): Promise<DropTableResponse> | void {
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    return this.delete(gaxOptions, callback!);
  }
  insert(rows: object | object[]): Promise<InsertRowsResponse>;
  insert(
    rows: object | object[],
    gaxOptions?: CallOptions
  ): Promise<InsertRowsResponse>;
  insert(rows: object | object[], callback: InsertRowsCallback): void;
  insert(
    rows: object | object[],
    gaxOptions: CallOptions,
    callback: InsertRowsCallback
  ): void;
  /**
   * Insert rows of data into this table.
   *
   * @see [Commit API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.Commit)
   *
   * @param {object|object[]} rows A map of names to values of data to insert
   *     into this table.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -452,9 +509,15 @@

   */
  insert(
    rows: object | object[],
    callback?: InsertRowsCallback
    gaxOptionsOrCallback?: CallOptions | InsertRowsCallback,
    cb?: InsertRowsCallback
  ): Promise<InsertRowsResponse> | void {
    this._mutate('insert', rows, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this._mutate('insert', rows, gaxOptions, callback!);
  }
  read(request: ReadRequest, options?: TimestampBounds): Promise<ReadResponse>;
  read(request: ReadRequest, callback: ReadCallback): void;

@@ -634,15 +697,25 @@

      .on('data', (row: Row) => rows.push(row))
      .on('end', () => callback!(null, rows));
  }
  replace(rows: object | object[]): Promise<ReplaceRowsResponse>;
  replace(
    rows: object | object[],
    gaxOptions?: CallOptions
  ): Promise<ReplaceRowsResponse>;
  replace(rows: object | object[], callback: ReplaceRowsCallback): void;
  replace(
    rows: object | object[],
    gaxOptions: CallOptions,
    callback: ReplaceRowsCallback
  ): void;
  /**
   * Replace rows of data within this table.
   *
   * @see [Commit API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.Commit)
   *
   * @param {object|object[]} rows A map of names to values of data to insert
   *     into this table.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -677,19 +750,35 @@

   */
  replace(
    rows: object | object[],
    callback?: ReplaceRowsCallback
    gaxOptionsOrCallback?: CallOptions | ReplaceRowsCallback,
    cb?: ReplaceRowsCallback
  ): Promise<ReplaceRowsResponse> | void {
    this._mutate('replace', rows, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this._mutate('replace', rows, gaxOptions, callback!);
  }
  update(rows: object | object[]): Promise<UpdateRowsResponse>;
  update(
    rows: object | object[],
    gaxOptions?: CallOptions
  ): Promise<UpdateRowsResponse>;
  update(rows: object | object[], callback: UpdateRowsCallback): void;
  update(
    rows: object | object[],
    gaxOptions: CallOptions,
    callback: UpdateRowsCallback
  ): void;
  /**
   * Update rows of data within this table.
   *
   * @see [Commit API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.Commit)
   *
   * @param {object|object[]} rows A map of names to values of data to insert
   *     into this table.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -728,19 +817,36 @@

   */
  update(
    rows: object | object[],
    callback?: UpdateRowsCallback
    gaxOptionsOrCallback?: CallOptions | UpdateRowsCallback,
    cb?: UpdateRowsCallback
  ): Promise<UpdateRowsResponse> | void {
    this._mutate('update', rows, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this._mutate('update', rows, gaxOptions, callback!);
  }
  upsert(rows: object | object[]): Promise<UpsertRowsResponse>;
  upsert(
    rows: object | object[],
    gaxOptions?: CallOptions
  ): Promise<UpsertRowsResponse>;
  upsert(rows: object | object[], callback: UpsertRowsCallback): void;
  upsert(
    rows: object | object[],
    gaxOptions: CallOptions,
    callback: UpsertRowsCallback
  ): void;
  /**
   * Insert or update rows of data within this table.
   *
   * @see [Commit API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.Commit)
   *
   * @param {object|object[]} rows A map of names to values of data to insert
   *     into this table.
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *

@@ -775,9 +881,15 @@

   */
  upsert(
    rows: object | object[],
    callback?: UpsertRowsCallback
    gaxOptionsOrCallback?: CallOptions | UpsertRowsCallback,
    cb?: UpsertRowsCallback
  ): Promise<UpsertRowsResponse> | void {
    this._mutate('upsert', rows, callback!);
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this._mutate('upsert', rows, gaxOptions, callback!);
  }
  /**
   * Creates a new transaction and applies the desired mutation via

@@ -795,6 +907,7 @@

  private _mutate(
    method: 'deleteRows' | 'insert' | 'replace' | 'update' | 'upsert',
    rows: object | object[],
    gaxOptions: CallOptions = {},
    callback: CommitCallback
  ): void {
    this.database.runTransaction((err, transaction) => {

@@ -804,7 +917,7 @@

      }

      transaction![method](this.name, rows as Key[]);
      transaction!.commit(callback);
      transaction!.commit(gaxOptions, callback);
    });
  }
}

@@ -17,46 +17,51 @@

import {
  ApiError,
  ExistsCallback,
  GetConfig,
  Metadata,
  ServiceObjectConfig,
  GetConfig,
} from '@google-cloud/common';
import {GrpcServiceObject} from './common-grpc/service-object';
import {promisify, promisifyAll} from '@google-cloud/promisify';
import arrify = require('arrify');
// eslint-disable-next-line @typescript-eslint/no-var-requires
const common = require('./common-grpc/service-object');
import {promisify, promisifyAll, callbackifyAll} from '@google-cloud/promisify';
import * as extend from 'extend';
import * as r from 'teeny-request';
import * as streamEvents from 'stream-events';
import * as through from 'through2';
import {Operation as GaxOperation} from 'google-gax';
import {CallOptions, grpc, Operation as GaxOperation} from 'google-gax';
import {Backup} from './backup';
import {BatchTransaction, TransactionIdentifier} from './batch-transaction';
import {google as databaseAdmin} from '../protos/protos';
import {
  Instance,
  CreateDatabaseOptions,
  google as databaseAdmin,
  google,
  google as spannerClient,
} from '../protos/protos';
import {
  CreateDatabaseCallback,
  CreateDatabaseOptions,
  GetDatabaseOperationsOptions,
  GetDatabaseOperationsResponse,
  Instance,
  GetDatabaseOperationsCallback,
} from './instance';
import {PartialResultStream, Row} from './partial-result-stream';
import {Session} from './session';
import {
  isSessionNotFoundError,
  SessionPool,
  SessionPoolOptions,
  SessionPoolCloseCallback,
  SessionPoolInterface,
  isSessionNotFoundError,
  SessionPoolOptions,
} from './session-pool';
import {Table, CreateTableCallback, CreateTableResponse} from './table';
import {CreateTableCallback, CreateTableResponse, Table} from './table';
import {
  ExecuteSqlRequest,
  RunCallback,
  RunResponse,
  RunUpdateCallback,
  Snapshot,
  TimestampBounds,
  Transaction,
  ExecuteSqlRequest,
  RunUpdateCallback,
  RunResponse,
  RunCallback,
} from './transaction';
import {
  AsyncRunTransactionCallback,

@@ -65,23 +70,21 @@

  RunTransactionOptions,
  TransactionRunner,
} from './transaction-runner';

import {google} from '../protos/protos';
import {
  IOperation,
  Schema,
  LongRunningCallback,
  NormalCallback,
  PagedOptionsWithFilter,
  CLOUD_RESOURCE_HEADER,
  PagedResponse,
  RequestCallback,
  PagedRequest,
  ResourceCallback,
  PagedResponse,
  NormalCallback,
  LongRunningCallback,
  Schema,
} from './common';
import {ServiceError, CallOptions} from 'grpc';
import {Readable, Transform, Duplex} from 'stream';
import {Duplex, Readable, Transform} from 'stream';
import {PreciseDate} from '@google-cloud/precise-date';
import {google as spannerClient} from '../protos/protos';
import {EnumKey, RequestConfig, TranslateEnumKeys} from '.';
import arrify = require('arrify');

type CreateBatchTransactionCallback = ResourceCallback<
  BatchTransaction,

@@ -120,7 +123,7 @@


type ResultSetStats = spannerClient.spanner.v1.ResultSetStats;

type GetSessionsOptions = PagedRequest<google.spanner.v1.IListSessionsRequest>;
export type GetSessionsOptions = PagedOptionsWithFilter;

/**
 * IDatabase structure with database state enum translated to string form.

@@ -166,7 +169,9 @@

>;

export type GetDatabaseConfig = GetConfig &
  databaseAdmin.spanner.admin.database.v1.GetDatabaseRequest;
  databaseAdmin.spanner.admin.database.v1.GetDatabaseRequest & {
    gaxOptions?: CallOptions;
  };
type DatabaseCloseResponse = [google.protobuf.IEmpty];

export type CreateSessionResponse = [

@@ -175,8 +180,8 @@

];

export interface CreateSessionOptions {
  name?: string | null;
  labels?: {[k: string]: string} | null;
  gaxOptions?: CallOptions;
}

export type CreateSessionCallback = ResourceCallback<

@@ -198,7 +203,10 @@

  spannerClient.spanner.v1.IBatchCreateSessionsResponse
>;

export type DatabaseDeleteCallback = NormalCallback<r.Response>;
export type DatabaseDeleteResponse = [databaseAdmin.protobuf.IEmpty];
export type DatabaseDeleteCallback = NormalCallback<
  databaseAdmin.protobuf.IEmpty
>;

export interface CancelableDuplex extends Duplex {
  cancel(): void;

@@ -212,6 +220,11 @@

  databaseAdmin.longrunning.IOperation
];

export type GetRestoreInfoCallback = NormalCallback<IRestoreInfoTranslatedEnum>;
export type GetStateCallback = NormalCallback<
  EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Database.State>
>;

interface DatabaseRequest {
  (
    config: RequestConfig,

@@ -237,11 +250,12 @@

 * const instance = spanner.instance('my-instance');
 * const database = instance.database('my-database');
 */
class Database extends GrpcServiceObject {
class Database extends common.GrpcServiceObject {
  private instance: Instance;
  formattedName_: string;
  pool_: SessionPoolInterface;
  queryOptions_?: spannerClient.spanner.v1.ExecuteSqlRequest.IQueryOptions;
  resourceHeader_: {[k: string]: string};
  request: DatabaseRequest;
  constructor(
    instance: Instance,

@@ -304,7 +318,41 @@

304	318		options: CreateDatabaseOptions,
305	319		callback: CreateDatabaseCallback
306	320		) => {
307		-	return instance.createDatabase(formattedName_, options, callback);
	321	+	const pool = this.pool_ as SessionPool;
	322	+	if (pool._pending > 0) {
	323	+	// If there are BatchCreateSessions requests pending, then we should
	324	+	// wait until these have finished before we try to create the database.
	325	+	// Otherwise the results of these requests might be propagated to
	326	+	// client requests that are submitted after the database has been
	327	+	// created. If the pending requests have not finished within 10 seconds,
	328	+	// they will be ignored and the database creation will proceed.
	329	+	let timeout;
	330	+	const promises = [
	331	+	new Promise<void>(
	332	+	resolve => (timeout = setTimeout(resolve, 10000))
	333	+	),
	334	+	new Promise<void>(resolve => {
	335	+	pool
	336	+	.on('available', () => {
	337	+	if (pool._pending === 0) {
	338	+	clearTimeout(timeout);
	339	+	resolve();
	340	+	}
	341	+	})
	342	+	.on('createError', () => {
	343	+	if (pool._pending === 0) {
	344	+	clearTimeout(timeout);
	345	+	resolve();
	346	+	}
	347	+	});
	348	+	}),
	349	+	];
	350	+	Promise.race(promises).then(() =>
	351	+	instance.createDatabase(formattedName_, options, callback)
	352	+	);
	353	+	} else {
	354	+	return instance.createDatabase(formattedName_, options, callback);
	355	+	}
308	356		},
309	357		} as {}) as ServiceObjectConfig);
310	358

@@ -314,6 +362,9 @@

        : new SessionPool(this, poolOptions);
    this.formattedName_ = formattedName_;
    this.instance = instance;
    this.resourceHeader_ = {
      [CLOUD_RESOURCE_HEADER]: this.formattedName_,
    };
    this.request = instance.request;
    // eslint-disable-next-line @typescript-eslint/no-explicit-any
    this.requestStream = instance.requestStream as any;

@@ -417,6 +468,8 @@

        client: 'SpannerClient',
        method: 'batchCreateSessions',
        reqOpts,
        gaxOpts: options.gaxOptions,
        headers: this.resourceHeader_,
      },
      (err, resp) => {
        if (err) {

@@ -555,12 +608,13 @@

        ? (optionsOrCallback as TimestampBounds)
        : {};

    this.createSession((err, session, resp) => {
    this.pool_.getReadSession((err, session) => {
      if (err) {
        callback!(err, null, resp);
        callback!(err, null, undefined);
        return;
      }
      const transaction = this.batchTransaction({session: session!}, options);
      this._releaseOnEnd(session!, transaction);
      transaction.begin((err, resp) => {
        if (err) {
          callback!(err, null, resp!);

@@ -576,6 +630,20 @@

    options: CreateSessionOptions,
    callback: CreateSessionCallback
  ): void;
  /**
   * Create a new session.
   *
   * @typedef {object} CreateSessionOptions
   * @property {Object.<string, string>} [labels] The labels for the session.
   *
   *   * Label keys must be between 1 and 63 characters long and must conform to
   *     the following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.
   *   * Label values must be between 0 and 63 characters long and must conform
   *     to the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
   *   * No more than 64 labels can be associated with a given session.
   * @property {object} [gaxOptions] Request configuration options, outlined
   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
   */
  /**
   * @typedef {array} CreateSessionResponse
   * @property {Session} 0 The newly created session.

@@ -637,10 +705,8 @@

    cb?: CreateSessionCallback
  ): void | Promise<CreateSessionResponse> {
    const callback =
      typeof optionsOrCallback === 'function'
        ? (optionsOrCallback as CreateSessionCallback)
        : cb!;
    const gaxOpts =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
    const options =
      typeof optionsOrCallback === 'object' && optionsOrCallback
        ? extend({}, optionsOrCallback)
        : ({} as CreateSessionOptions);

@@ -649,17 +715,17 @@

      database: this.formattedName_,
    };

    if (gaxOpts.labels) {
      reqOpts.session = {labels: gaxOpts.labels};
      delete gaxOpts.labels;
    if (options.labels) {
      reqOpts.session = {labels: options.labels};
    }

    this.request<google.spanner.v1.ISession>(
      {
        client: 'SpannerClient',
        method: 'createSession',
        reqOpts,
        gaxOpts,
        gaxOpts: options.gaxOptions,
        headers: this.resourceHeader_,
      },
      (err, resp) => {
        if (err) {

@@ -672,8 +738,16 @@

      }
    );
  }
  createTable(schema: Schema): Promise<CreateTableResponse>;
  createTable(schema: Schema, callback?: CreateTableCallback): void;
  createTable(
    schema: Schema,
    gaxOptions?: CallOptions
  ): Promise<CreateTableResponse>;
  createTable(schema: Schema, callback: CreateTableCallback): void;
  createTable(
    schema: Schema,
    gaxOptions: CallOptions,
    callback: CreateTableCallback
  ): void;
  /**
   * @typedef {array} CreateTableResponse
   * @property {Table} 0 The new {@link Table}.

@@ -697,6 +771,8 @@

   * @see {@link Database#updateSchema}
   *
   * @param {string} schema A DDL CREATE statement describing the table.
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {CreateTableCallback} [callback] Callback function.
   * @returns {Promise<CreateTableResponse>}
   *

@@ -743,9 +819,15 @@

   */
  createTable(
    schema: Schema,
    callback?: CreateTableCallback
    gaxOptionsOrCallback?: CallOptions | CreateTableCallback,
    cb?: CreateTableCallback
  ): void | Promise<CreateTableResponse> {
    this.updateSchema(schema, (err, operation, resp) => {
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    this.updateSchema(schema, gaxOptions, (err, operation, resp) => {
      if (err) {
        callback!(err, null, null, resp!);
        return;

@@ -776,17 +858,21 @@

      }
    });
  }
  delete(): Promise<[r.Response]>;
  delete(gaxOptions?: CallOptions): Promise<DatabaseDeleteResponse>;
  delete(callback: DatabaseDeleteCallback): void;
  delete(gaxOptions: CallOptions, callback: DatabaseDeleteCallback): void;
  /**
   * Delete the database.
   *
   * Wrapper around {@link v1.DatabaseAdminClient#dropDatabase}.
   *
   * @see {@link v1.DatabaseAdminClient#dropDatabase}
   * @see [DropDatabase API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.DropDatabase)
   * @param {BasicCallback} [callback] Callback function.
   * @returns {Promise<BasicResponse>}
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {DatabaseDeleteCallback} [callback] Callback function.
   * @returns {Promise<DatabaseDeleteResponse>}
   *
   * @example
   * const {Spanner} = require('@google-cloud/spanner');

@@ -810,7 +896,15 @@

   *   const apiResponse = data[0];
   * });
   */
  delete(callback?: DatabaseDeleteCallback): void | Promise<[r.Response]> {
  delete(
    optionsOrCallback?: CallOptions | DatabaseDeleteCallback,
    cb?: DatabaseDeleteCallback
  ): void | Promise<DatabaseDeleteResponse> {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const reqOpts: databaseAdmin.spanner.admin.database.v1.IDropDatabaseRequest = {
      database: this.formattedName_,
    };

@@ -820,13 +914,16 @@

          client: 'DatabaseAdminClient',
          method: 'dropDatabase',
          reqOpts,
          gaxOpts,
          headers: this.resourceHeader_,
        },
        callback!
      );
    });
  }
  exists(): Promise<[boolean]>;
  exists(gaxOptions?: CallOptions): Promise<[boolean]>;
  exists(callback: ExistsCallback): void;
  exists(gaxOptions: CallOptions, callback: ExistsCallback): void;
  /**
   * @typedef {array} DatabaseExistsResponse
   * @property {boolean} 0 Whether the {@link Database} exists.

@@ -840,6 +937,8 @@

   * Check if a database exists.
   *
   * @method Database#exists
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {DatabaseExistsCallback} [callback] Callback function.
   * @returns {Promise<DatabaseExistsResponse>}
   *

@@ -859,10 +958,18 @@

   *   const exists = data[0];
   * });
   */
  exists(callback?: ExistsCallback): void | Promise<[boolean]> {
  exists(
    gaxOptionsOrCallback?: CallOptions | ExistsCallback,
    cb?: ExistsCallback
  ): void | Promise<[boolean]> {
    const gaxOptions =
      typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
    const callback =
      typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;

    const NOT_FOUND = 5;

    this.getMetadata(err => {
    this.getMetadata(gaxOptions, err => {
      if (err && (err as ApiError).code !== NOT_FOUND) {
        callback!(err);
        return;

@@ -928,14 +1035,14 @@

        : ({} as GetDatabaseConfig);
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb;
    this.getMetadata((err, metadata) => {
    this.getMetadata(options.gaxOptions!, (err, metadata) => {
      if (err) {
        if (options.autoCreate && (err as ApiError).code === 5) {
          this.create(
            options,
            (err, database: Database, operation: GaxOperation) => {
              if (err) {
                callback!(err);
                callback!(err as grpc.ServiceError);
                return;
              }
              operation

@@ -954,8 +1061,9 @@

      callback!(null, this, metadata as r.Response);
    });
  }
  getMetadata(): Promise<GetMetadataResponse>;
  getMetadata(gaxOptions?: CallOptions): Promise<GetMetadataResponse>;
  getMetadata(callback: GetMetadataCallback): void;
  getMetadata(gaxOptions: CallOptions, callback: GetMetadataCallback): void;
  /**
   * @typedef {array} GetDatabaseMetadataResponse
   * @property {object} 0 The {@link Database} metadata.

@@ -974,7 +1082,8 @@

   *
   * @see {@link v1.DatabaseAdminClient#getDatabase}
   * @see [GetDatabase API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabase)
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {GetMetadataCallback} [callback] Callback function.
   * @returns {Promise<GetMetadataResponse>}
   *

@@ -1002,8 +1111,18 @@

   * });
   */
  getMetadata(
    callback?: GetMetadataCallback
    gaxOptionsOrCallback?: CallOptions | GetMetadataCallback,
    cb?: GetMetadataCallback
  ): void | Promise<GetMetadataResponse> {
    const callback =
      typeof gaxOptionsOrCallback === 'function'
        ? (gaxOptionsOrCallback as GetMetadataCallback)
        : cb;
    const gaxOpts =
      typeof gaxOptionsOrCallback === 'object'
        ? (gaxOptionsOrCallback as CallOptions)
        : {};

    const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseRequest = {
      name: this.formattedName_,
    };

@@ -1012,11 +1131,23 @@

        client: 'DatabaseAdminClient',
        method: 'getDatabase',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback!
      (err, resp) => {
        if (resp) {
          this.metadata = resp;
        }
        callback!(err, resp);
      }
    );
  }

  getRestoreInfo(
    options?: CallOptions
  ): Promise<IRestoreInfoTranslatedEnum | undefined>;
  getRestoreInfo(callback: GetRestoreInfoCallback): void;
  getRestoreInfo(options: CallOptions, callback: GetRestoreInfoCallback): void;
  /**
   * {@link google.spanner.admin.database.v1#RestoreInfo} structure with restore
   * source type enum translated to string form.

@@ -1029,6 +1160,9 @@

   * @see {@link #getMetadata}
   *
   * @method Database#getRestoreInfo
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {GetRestoreInfoCallback} [callback] Callback function.
   * @returns {Promise<IRestoreInfoTranslatedEnum | undefined>} When resolved,
   *     contains the restore information for the database if it was restored
   *     from a backup.

@@ -1041,11 +1175,24 @@

   * const restoreInfo = await database.getRestoreInfo();
   * console.log(`Database restored from ${restoreInfo.backupInfo.backup}`);
   */
  async getRestoreInfo(): Promise<IRestoreInfoTranslatedEnum | undefined> {
    const [metadata] = await this.getMetadata();
  async getRestoreInfo(
    optionsOrCallback?: CallOptions | GetRestoreInfoCallback
  ): Promise<IRestoreInfoTranslatedEnum | undefined> {
    const gaxOptions =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};

    const [metadata] = await this.getMetadata(gaxOptions);
    return metadata.restoreInfo ? metadata.restoreInfo : undefined;
  }

  getState(
    options?: CallOptions
  ): Promise<
    | EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Database.State>
    | undefined
  >;
  getState(callback: GetStateCallback): void;
  getState(options: CallOptions, callback: GetStateCallback): void;
  /**
   * Retrieves the state of the database.
   *

@@ -1055,6 +1202,9 @@

   * @see {@link #getMetadata}
   *
   * @method Database#getState
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {GetStateCallback} [callback] Callback function.
   * @returns {Promise<EnumKey<typeof, databaseAdmin.spanner.admin.database.v1.Database.State> | undefined>}
   *     When resolved, contains the current state of the database if the state
   *     is defined.

@@ -1067,16 +1217,22 @@

   * const state = await database.getState();
   * const isReady = (state === 'READY');
   */
  async getState(): Promise<
  async getState(
    optionsOrCallback?: CallOptions | GetStateCallback
  ): Promise<
    | EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Database.State>
    | undefined
  > {
    const [metadata] = await this.getMetadata();
    const gaxOptions =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};

    const [metadata] = await this.getMetadata(gaxOptions);
    return metadata.state || undefined;
  }

  getSchema(): Promise<GetSchemaResponse>;
  getSchema(options?: CallOptions): Promise<GetSchemaResponse>;
  getSchema(callback: GetSchemaCallback): void;
  getSchema(options: CallOptions, callback: GetSchemaCallback): void;
  /**
   * @typedef {array} GetSchemaResponse
   * @property {string[]} 0 An array of database DDL statements.

@@ -1097,6 +1253,8 @@

   * @see [Data Definition Language (DDL)](https://cloud.google.com/spanner/docs/data-definition-language)
   * @see [GetDatabaseDdl API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.DatabaseAdmin.GetDatabaseDdl)
   *
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {GetSchemaCallback} [callback] Callback function.
   * @returns {Promise<GetSchemaResponse>}
   *

@@ -1117,7 +1275,15 @@

   *   const apiResponse = data[1];
   * });
   */
  getSchema(callback?: GetSchemaCallback): void | Promise<GetSchemaResponse> {
  getSchema(
    optionsOrCallback?: CallOptions | GetSchemaCallback,
    cb?: GetSchemaCallback
  ): void | Promise<GetSchemaResponse> {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetDatabaseDdlRequest = {
      database: this.formattedName_,
    };

@@ -1128,6 +1294,8 @@

        client: 'DatabaseAdminClient',
        method: 'getDatabaseDdl',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
      (err, statements, ...args: any[]) => {

@@ -1141,9 +1309,7 @@

  /**
   * Options object for listing sessions.
   *
   * @typedef {object} GetSessionsRequest
   * @property {boolean} [autoPaginate=true] Have pagination handled
   *     automatically.
   * @typedef {object} GetSessionsOptions
   * @property {string} [filter] An expression for filtering the results of the
   *     request. Filter rules are case insensitive. The fields eligible for
   *     filtering are:

@@ -1158,21 +1324,23 @@

   *     - **`labels.env:dev`** The instance's label env has the value dev.
   *     - **`name:howl labels.env:dev`** The instance's name is howl and it has
   *       the label env with value dev.
   * @property {number} [maxApiCalls] Maximum number of API calls to make.
   * @property {number} [maxResults] Maximum number of items to return.
   * @property {number} [pageSize] Maximum number of results per page.
   * @property {string} [pageToken] A previously-returned page token
   *     representing part of the larger set of results to view.
   * @property {object} [gaxOptions] Request configuration options, outlined
   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
   */
  /**
   * @typedef {array} GetSessionsResponse
   * @property {Session[]} 0 Array of {@link Session} instances.
   * @property {object} 1 The full API response.
   * @property {object} 1 A query object to receive more results.
   * @property {object} 2 The full API response.
   */
  /**
   * @callback GetSessionsCallback
   * @param {?Error} err Request error, if any.
   * @param {Session[]} instances Array of {@link Session} instances.
   * @param {object} nextQuery A query object to receive more results.
   * @param {object} apiResponse The full API response.
   */
  /**

@@ -1210,7 +1378,7 @@

   * }
   *
   * database.getInstances({
   *   autoPaginate: false
   *   gaxOptions: {autoPaginate: false}
   * }, callback);
   *
   * //-

@@ -1227,19 +1395,32 @@

    // eslint-disable-next-line @typescript-eslint/no-this-alias
    const self = this;
    const callback =
      typeof optionsOrCallback === 'function'
        ? (optionsOrCallback as GetSessionsCallback)
        : cb;
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb;
    const options =
      typeof optionsOrCallback === 'object'
        ? (optionsOrCallback as GetSessionsOptions)
        : {gaxOptions: {}};
    const gaxOpts: CallOptions = options.gaxOptions as CallOptions;
    const reqOpts = extend({}, options, {
        ? optionsOrCallback
        : ({} as GetSessionsOptions);
    const gaxOpts = extend(true, {}, options.gaxOptions);
    let reqOpts = extend({}, options, {
      database: this.formattedName_,
    });

    delete reqOpts.gaxOptions;

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageSize;
      delete gaxOpts.pageToken;
    }

    this.request<
      google.spanner.v1.ISession,
      google.spanner.v1.IListSessionsResponse

@@ -1249,8 +1430,9 @@

        method: 'listSessions',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, sessions, ...args) => {
      (err, sessions, nextPageRequest, ...args) => {
        let sessionInstances: Session[] | null = null;
        if (sessions) {
          sessionInstances = sessions.map(metadata => {

@@ -1259,10 +1441,84 @@

            return session;
          });
        }
        callback!(err, sessionInstances!, ...args);
        const nextQuery = nextPageRequest!
          ? extend({}, options, nextPageRequest!)
          : null;
        callback!(err, sessionInstances!, nextQuery, ...args);
      }
    );
  }

  /**
   * Get a list of sessions as a readable object stream.
   *
   * Wrapper around {@link v1.SpannerClient#listSessions}
   *
   * @see {@link v1.SpannerClient#listSessions}
   * @see [ListSessions API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.ListSessions)
   *
   * @method Spanner#getSessionsStream
   * @param {GetSessionsOptions} [options] Options object for listing sessions.
   * @returns {ReadableStream} A readable stream that emits {@link Session}
   *     instances.
   *
   * @example
   * const {Spanner} = require('@google-cloud/spanner');
   * const spanner = new Spanner();
   *
   * const instance = spanner.instance('my-instance');
   * const database = instance.database('my-database');
   *
   * database.getSessionsStream()
   *   .on('error', console.error)
   *   .on('data', function(database) {
   *     // `sessions` is a `Session` object.
   *   })
   *   .on('end', function() {
   *     // All sessions retrieved.
   *   });
   *
   * //-
   * // If you anticipate many results, you can end a stream early to prevent
   * // unnecessary processing and API requests.
   * //-
   * database.getSessionsStream()
   *   .on('data', function(session) {
   *     this.end();
   *   });
   */
  getSessionsStream(options: GetSessionsOptions = {}): NodeJS.ReadableStream {
    const gaxOpts = extend(true, {}, options.gaxOptions);

    let reqOpts = extend({}, options, {
      database: this.formattedName_,
    });
    delete reqOpts.gaxOptions;

    // Copy over pageSize and pageToken values from gaxOptions.
    // However values set on options take precedence.
    if (gaxOpts) {
      reqOpts = extend(
        {},
        {
          pageSize: gaxOpts.pageSize,
          pageToken: gaxOpts.pageToken,
        },
        reqOpts
      );
      delete gaxOpts.pageSize;
      delete gaxOpts.pageToken;
    }

    return this.requestStream({
      client: 'SpannerClient',
      method: 'listSessionsStream',
      reqOpts,
      gaxOpts,
      headers: this.resourceHeader_,
    });
  }

  getSnapshot(options?: TimestampBounds): Promise<[Snapshot]>;
  getSnapshot(callback: GetSnapshotCallback): void;
  getSnapshot(options: TimestampBounds, callback: GetSnapshotCallback): void;

@@ -1284,6 +1540,12 @@

   * called to release the underlying {@link Session}. **Failure to do could
   * result in a Session leak.**
   *
   * **NOTE:** Since the returned {@link Snapshot} transaction is not a
   * single-use transaction, it is invalid to set the `minReadTimestamp` and
   * `maxStaleness` parameters in {@link TimestampBounds} as those parameters
   * can only be set for single-use transactions.
   * https://cloud.google.com/spanner/docs/reference/rest/v1/TransactionOptions#bounded-staleness
   *
   * @see {@link v1.SpannerClient#beginTransaction}
   *
   * @param {TimestampBounds} [options] Timestamp bounds.

@@ -1404,10 +1666,18 @@

      if (!err) {
        this._releaseOnEnd(session!, transaction!);
      }
      callback!(err, transaction);
      callback!(err as grpc.ServiceError | null, transaction);
    });
  }

  getOperations(
    options?: GetDatabaseOperationsOptions
  ): Promise<GetDatabaseOperationsResponse>;
  getOperations(callback: GetDatabaseOperationsCallback): void;
  getOperations(
    options: GetDatabaseOperationsOptions,
    callback: GetDatabaseOperationsCallback
  ): void;
  /**
   * Query object for listing database operations.
   *

@@ -1418,6 +1688,9 @@

   * @property {number} [pageSize] Maximum number of results per page.
   * @property {string} [pageToken] A previously-returned page token
   *     representing part of the larger set of results to view.
   * @property {object} [gaxOptions] Request configuration options, outlined
   *     here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
   * @param {GetDatabaseOperationsCallback} [callback] Callback function.
   */
  /**
   * @typedef {array} GetDatabaseOperationsResponse

@@ -1459,8 +1732,12 @@

   * } while (pageToken);
   */
  async getOperations(
    options?: GetDatabaseOperationsOptions
    optionsOrCallback?:
      | GetDatabaseOperationsOptions
      | GetDatabaseOperationsCallback
  ): Promise<GetDatabaseOperationsResponse> {
    const options =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    // Create a query that lists database operations only on this database from
    // the instance. Operation name will be prefixed with the database path for
    // all operations on this database

@@ -1529,7 +1806,7 @@

        requestStream.cancel();
      }
    };
    function destroyStream(err: ServiceError) {
    function destroyStream(err: grpc.ServiceError) {
      waitForSessionStream.destroy(err);
    }
    function releaseSession() {

@@ -1628,6 +1905,7 @@

        method: 'restoreDatabase',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, operation, resp) => {
        if (err) {

@@ -1859,20 +2137,41 @@

        return;
      }

      const transaction = session!.partitionedDml();
      this._runPartitionedUpdate(session!, query, callback);
    });
  }

  _runPartitionedUpdate(
    session: Session,
    query: string | ExecuteSqlRequest,
    callback?: RunUpdateCallback
  ): void | Promise<number> {
    const transaction = session.partitionedDml();

    transaction.begin(err => {
      if (err) {
        this.pool_.release(session!);
        callback!(err, 0);
        return;
      }

      transaction.begin(err => {
      transaction.runUpdate(query, (err, updateCount) => {
        if (err) {
          if (err.code !== grpc.status.ABORTED) {
            this.pool_.release(session!);
            callback!(err, 0);
            return;
          }
          this._runPartitionedUpdate(session, query, callback);
        } else {
          this.pool_.release(session!);
          callback!(err, 0);
          callback!(null, updateCount);
          return;
        }

        this._releaseOnEnd(session!, transaction);
        transaction.runUpdate(query, callback!);
      });
    });
  }

  /**
   * Create a readable object stream to receive resulting rows from a SQL
   * statement.

@@ -2018,12 +2317,15 @@

      dataStream
        .once('data', () => (dataReceived = true))
        .once('error', err => {
          if (!dataReceived && isSessionNotFoundError(err)) {
          if (
            !dataReceived &&
            isSessionNotFoundError(err as grpc.ServiceError)
          ) {
            // If it is a 'Session not found' error and we have not yet received
            // any data, we can safely retry the query on a new session.
            // Register the error on the session so the pool can discard it.
            if (session) {
              session.lastError = err;
              session.lastError = err as grpc.ServiceError;
            }
            // Remove the current data stream from the end user stream.
            dataStream.unpipe(proxyStream);

@@ -2141,12 +2443,12 @@

        : {};

    this.pool_.getWriteSession((err, session?, transaction?) => {
      if (err && isSessionNotFoundError(err)) {
      if (err && isSessionNotFoundError(err as grpc.ServiceError)) {
        this.runTransaction(options, runFn!);
        return;
      }
      if (err) {
        runFn!(err);
        runFn!(err as grpc.ServiceError);
        return;
      }


@@ -2307,8 +2609,16 @@

    }
    return new Table(this, name);
  }
  updateSchema(statements: Schema): Promise<UpdateSchemaResponse>;
  updateSchema(
    statements: Schema,
    gaxOptions?: CallOptions
  ): Promise<UpdateSchemaResponse>;
  updateSchema(statements: Schema, callback: UpdateSchemaCallback): void;
  updateSchema(
    statements: Schema,
    gaxOptions: CallOptions,
    callback: UpdateSchemaCallback
  ): void;
  /**
   * Update the schema of the database by creating/altering/dropping tables,
   * columns, indexes, etc.

@@ -2327,6 +2637,8 @@

   * @param {string|string[]|object} statements An array of database DDL
   *     statements, or an
   *     [`UpdateDatabaseDdlRequest` object](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.database.v1#google.spanner.admin.database.v1.UpdateDatabaseDdlRequest).
   * @param {object} [gaxOptions] Request configuration options, outlined here:
   *     https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
   * @param {LongRunningOperationCallback} [callback] Callback function.
   * @returns {Promise<LongRunningOperationResponse>}
   *

@@ -2384,8 +2696,14 @@

   */
  updateSchema(
    statements: Schema,
    callback?: UpdateSchemaCallback
    optionsOrCallback?: CallOptions | UpdateSchemaCallback,
    cb?: UpdateSchemaCallback
  ): Promise<UpdateSchemaResponse> | void {
    const gaxOpts =
      typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
    const callback =
      typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

    if (typeof statements === 'string' || Array.isArray(statements)) {
      statements = {
        statements: arrify(statements) as string[],

@@ -2402,6 +2720,8 @@

        client: 'DatabaseAdminClient',
        method: 'updateDatabaseDdl',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      callback!
    );

@@ -2439,17 +2759,49 @@

promisifyAll(Database, {
  exclude: [
    'batchTransaction',
    'getMetadata',
    'getRestoreInfo',
    'getState',
    'getOperations',
    'runTransaction',
    'runTransactionAsync',
    'table',
    'updateSchema',
    'session',
  ],
});

/*! Developer Documentation
 *
 * All async methods (except for streams) will return a Promise in the event
 * that a callback is omitted.
 */
callbackifyAll(Database, {
  exclude: [
    'create',
    'batchCreateSessions',
    'batchTransaction',
    'close',
    'createBatchTransaction',
    'createSession',
    'createTable',
    'delete',
    'exists',
    'get',
    'getMetadata',
    'getSchema',
    'getSessions',
    'getSnapshot',
    'getTransaction',
    'restore',
    'run',
    'runPartitionedUpdate',
    'runTransaction',
    'runTransactionAsync',
    'session',
    'table',
    'updateSchema',
  ],
});

/**
 * Reference to the {@link Database} class.
 * @name module:@google-cloud/spanner.Database

@@ -13,18 +13,24 @@

 * limitations under the License.
 */

import {promisifyAll} from '@google-cloud/promisify';
import {promisifyAll, callbackifyAll} from '@google-cloud/promisify';
import {Instance} from './instance';
import {
  IOperation,
  LongRunningCallback,
  RequestCallback,
  ResourceCallback,
  NormalCallback,
  CLOUD_RESOURCE_HEADER,
} from './common';
import {EnumKey, Spanner, RequestConfig, TranslateEnumKeys} from '.';
import {Metadata, Operation as GaxOperation} from 'google-gax';
import {
  grpc,
  CallOptions,
  Metadata,
  Operation as GaxOperation,
} from 'google-gax';
import {DateStruct, PreciseDate} from '@google-cloud/precise-date';
import {CallOptions, status} from 'grpc';
import {google as databaseAdmin} from '../protos/protos';
import {common as p} from 'protobufjs';


@@ -64,7 +70,7 @@

  databaseAdmin.spanner.admin.database.v1.IBackup
>;

type DeleteCallback = RequestCallback<void>;
type DeleteCallback = RequestCallback<databaseAdmin.protobuf.IEmpty>;

interface BackupRequest {
  (

@@ -73,6 +79,11 @@

  ): void;
  <T>(config: RequestConfig, callback: RequestCallback<T>): void;
}
export type GetStateCallback = NormalCallback<
  EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Backup.State>
>;
export type GetExpireTimeCallback = NormalCallback<PreciseDate>;
export type ExistsCallback = NormalCallback<boolean>;
/**
 * The {@link Backup} class represents a Cloud Spanner backup.
 *

@@ -90,12 +101,17 @@

  id: string;
  formattedName_: string;
  instanceFormattedName_: string;
  resourceHeader_: {[k: string]: string};
  request: BackupRequest;
  metadata?: databaseAdmin.spanner.admin.database.v1.IBackup;
  constructor(instance: Instance, name: string) {
    this.request = instance.request;
    this.instanceFormattedName_ = instance.formattedName_;
    this.formattedName_ = Backup.formatName_(instance.formattedName_, name);
    this.id = this.formattedName_.split('/').pop() || '';
    this.resourceHeader_ = {
      [CLOUD_RESOURCE_HEADER]: this.instanceFormattedName_,
    };
  }

  create(options: CreateBackupOptions): Promise<CreateBackupResponse>;

@@ -154,7 +170,7 @@

    options: CreateBackupOptions,
    callback?: CreateBackupCallback
  ): Promise<CreateBackupResponse> | void {
    const gaxOpts: CallOptions = options.gaxOptions as CallOptions;
    const gaxOpts = options.gaxOptions;
    const reqOpts: databaseAdmin.spanner.admin.database.v1.ICreateBackupRequest = {
      parent: this.instanceFormattedName_,
      backupId: this.id,

@@ -164,12 +180,13 @@

        name: this.formattedName_,
      },
    };
    return this.request(
    this.request(
      {
        client: 'DatabaseAdminClient',
        method: 'createBackup',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, operation, resp) => {
        if (err) {

@@ -181,7 +198,6 @@

    );
  }

  getMetadata(): Promise<GetMetadataResponse>;
  getMetadata(gaxOptions?: CallOptions): Promise<GetMetadataResponse>;
  getMetadata(callback: GetMetadataCallback): void;
  getMetadata(gaxOptions: CallOptions, callback: GetMetadataCallback): void;

@@ -231,19 +247,29 @@

    const reqOpts: databaseAdmin.spanner.admin.database.v1.IGetBackupRequest = {
      name: this.formattedName_,
    };
    return this.request<IBackupTranslatedEnum>(
    this.request<IBackupTranslatedEnum>(
      {
        client: 'DatabaseAdminClient',
        method: 'getBackup',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, response) => {
        if (response) {
          this.metadata = response;
        }
        callback!(err, response);
      }
    );
  }

  getState(): Promise<
    | EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Backup.State>
    | undefined
    | null
  >;
  getState(callback: GetStateCallback): void;
  /**
   * Retrieves the state of the backup.
   *

@@ -252,6 +278,7 @@

   * @see {@link #getMetadata}
   *
   * @method Backup#getState
   * @param {GetStateCallback} [callback] Callback function.
   * @returns {Promise<EnumKey<typeof, databaseAdmin.spanner.admin.database.v1.Backup.State> | undefined>}
   *     When resolved, contains the current state of the backup if it exists.
   *

@@ -266,11 +293,14 @@

  async getState(): Promise<
    | EnumKey<typeof databaseAdmin.spanner.admin.database.v1.Backup.State>
    | undefined
    | null
  > {
    const [backupInfo] = await this.getMetadata();
    return backupInfo.state || undefined;
    return backupInfo.state;
  }

  getExpireTime(): Promise<PreciseDate | undefined>;
  getExpireTime(callback: GetExpireTimeCallback): void;
  /**
   * Retrieves the expiry time of the backup.
   *

@@ -294,6 +324,8 @@

    return new PreciseDate(backupInfo.expireTime as DateStruct);
  }

  exists(): Promise<boolean>;
  exists(callback: ExistsCallback): void;
  /**
   * Checks whether the backup exists.
   *

@@ -318,7 +350,7 @@

      // Found therefore it exists
      return true;
    } catch (err) {
      if (err.code === status.NOT_FOUND) {
      if (err.code === grpc.status.NOT_FOUND) {
        return false;
      }
      // Some other error occurred, rethrow

@@ -393,21 +425,21 @@

        paths: ['expire_time'],
      },
    };
    return this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
    this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
      {
        client: 'DatabaseAdminClient',
        method: 'updateBackup',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      (err, response) => {
        callback!(err, response);
      }
    );
  }

  delete(): Promise<void>;
  delete(gaxOptions?: CallOptions): Promise<void>;
  delete(gaxOptions?: CallOptions): Promise<databaseAdmin.protobuf.IEmpty>;
  delete(callback: DeleteCallback): void;
  delete(gaxOptions: CallOptions, callback: DeleteCallback): void;
  /**

@@ -429,7 +461,7 @@

  delete(
    gaxOptionsOrCallback?: CallOptions | DeleteCallback,
    cb?: DeleteCallback
  ): void | Promise<void> {
  ): void | Promise<databaseAdmin.protobuf.IEmpty> {
    const callback =
      typeof gaxOptionsOrCallback === 'function'
        ? (gaxOptionsOrCallback as DeleteCallback)

@@ -441,12 +473,13 @@

    const reqOpts: databaseAdmin.spanner.admin.database.v1.IDeleteBackupRequest = {
      name: this.formattedName_,
    };
    return this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
    this.request<databaseAdmin.spanner.admin.database.v1.IBackup>(
      {
        client: 'DatabaseAdminClient',
        method: 'deleteBackup',
        reqOpts,
        gaxOpts,
        headers: this.resourceHeader_,
      },
      err => {
        callback!(err);

@@ -488,6 +521,15 @@

  exclude: ['getState', 'getExpireTime', 'exists'],
});

/*! Developer Documentation
 *
 * All async methods (except for streams) will return a Promise in the event
 * that a callback is omitted.
 */
callbackifyAll(Backup, {
  exclude: ['create', 'getMetadata', 'updateExpireTime', 'delete'],
});

/**
 * Reference to the {@link Backup} class.
 * @name module:@google-cloud/spanner.Backup

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Learn more Showing 3 files with coverage changes found.

New file .prettierrc.js

New

Loading file...

New file .mocharc.js

New

Loading file...

Changes in src/common.ts

-21

→

+21

Loading file...

98.60% ø ø

test: unskip "should list database operations"

skuruppu

#1248 9508788

CI Passed

98.60% ø ø

chore: update bucket for cloud-rad (#1247)

yoshi-automation

29749b9

CI Passed

98.60% ø ø

test: skip tests that filter on get operations (#1246)

skuruppu

7b65691

CI Passed

Hiding 1 contexual commits

98.60% ø ø

docs: update list of available samples (#1239)

yoshi-automation

9d6012c

CI Passed

98.60% ø ø

docs(samples): updated NUMERIC samples (#1238)

skuruppu

cefa3a1

CI Passed

Hiding 4 contexual commits

+76

98.59% ø ø

chore: release 5.3.0 (#1193)

Unknown

0a4577e

Hiding 6 contexual commits

+171

+242

-71

98.25% 100.00% +<.01%

fix: `Database not found` could be returned after create() (#1220)

olavloite

1fddbb9

CI Passed

Hiding 2 contexual commits

+39

+63

-2

-22

98.13% ø -0.11%

build: perform publish using Node 12, update cloud rad kokoro build job (#1218)

yoshi-automation

13d2efe

CI Passed

Hiding 1 contexual commits

+19

-16

98.06% 100.00% -0.18%

build: use gapic-generator-typescript v1.0.7. (#1217)

yoshi-automation

588900c

CI Passed

Hiding 3 contexual commits

+43

+38

98.24% 100.00% +<.01%

feat: return full nextQuery object in paginated calls (#1199)

AVaksman

445015f

CI Passed

+22

98.24% ø ø

build: --credential-file-override is no longer required (#1211)

yoshi-automation

3fc5a15

CI Passed

98.24% 100.00% +<.01%

feat: accept gaxOptions in Database and Session #delete() (#1206)

AVaksman

2444e8e

CI Passed

+32

98.24% ø ø

docs: add links to the CHANGELOG from the README.md for Java and Node (#1204)

yoshi-automation

6e1f300

CI Passed

98.24% ø ø

build: update protos (#1201)

yoshi-automation

429f083

CI Passed

98.24% ø ø

build: config for new ref docs (#1202)

yoshi-automation

488dc47

CI Passed

98.24% ø ø

build: rename _toc to toc, move gittatributes files to node templates (#1195)

yoshi-automation

d835ba2

CI Passed

98.24% ø ø

build: missing parenthesis in publish script, delete Node 8 tests, add config for cloud-rad for nodejs (#1190)

yoshi-automation

f947b12

CI Passed

98.24% ø ø

chore: add dev deps for cloud rad (#1192)

fhinkel

8ec6659

CI Passed

98.24% ø ø

fix(spanner): update UpdateBackup to be retryable (#1194)

yoshi-automation

e53a247

CI Passed

98.24% ø ø

feat: Spanner numeric type, add Node 8 tests (#1189)

yoshi-automation

c2bc40e

CI Passed

98.24% ø ø

refactor(test): use exponential backoff and retry a sample test (#1187)

AVaksman

26e6322

CI Passed

Hiding 2 contexual commits

98.24% ø ø

chore(deps): update dependency @types/mocha to v8 (#1180)

renovate-bot

14fd3cd

CI Passed

98.24% ø ø

chore: update samples cleanup (#1175)

AVaksman

c390ed9

CI Passed

98.24% ø ø

fix: typeo in nodejs .gitattribute (#1178)

yoshi-automation

439d5af

CI Passed

98.24% ø ø

chore: re-generated to pick up changes from self (#1176)

yoshi-automation

1953725

CI Passed

98.24% ø ø

chore: release 5.2.1 (#1174)

Unknown

e40abaf

CI Passed

98.24% ø ø

chore(deps): update dependency p-limit to v3 (#1172)

laljikanjareeya

8efd31d

CI Passed

98.24% 100.00% +<.01%

fix: remove error listener to prevent memory leak (#1168)

olavloite

523bd67

CI Passed

98.24% 94.87% +0.11%

perf: increase default min sessions to 25 (#1167)

olavloite

e4aba27

CI Passed

+37

+59

493	464		* @see {@link v1.InstanceAdminClient#listInstances}
494	465		* @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
495	466		*
496		-	* @param {GetInstancesRequest} [query] Query object for listing instances.
	467	+	* @param {GetInstancesOptions} [options] Query object for listing instances.
497	468		* @param {GetInstancesCallback} [callback] Callback function.
498	469		* @returns {Promise<GetInstancesResponse>}
499	470		*

939	1057		return new codec.Int(value);
940	1058		}
941	1059
	1060	+	/**
	1061	+	* Helper function to get a Cloud Spanner Numeric object.
	1062	+	*
	1063	+	* @param {string} value The numeric value as a string.
	1064	+	* @returns {Numeric}
	1065	+	*
	1066	+	* @example
	1067	+	* const {Spanner} = require('@google-cloud/spanner');
	1068	+	* const numeric = Spanner.numeric("3.141592653");
	1069	+	*/
	1070	+	static numeric(value): Numeric {
	1071	+	return new codec.Numeric(value);
	1072	+	}
	1073	+
942	1074		/**
943	1075		* Helper function to get a Cloud Spanner Struct object.
944	1076		*

969	1101		exclude: [
970	1102		'date',
971	1103		'float',
972		-	'getInstanceConfigs',
973	1104		'instance',
974	1105		'int',
	1106	+	'numeric',
975	1107		'operation',
976	1108		'timestamp',
977	1109		],

728	817		*/
729	818		update(
730	819		rows: object \| object[],
731		-	callback?: UpdateRowsCallback
	820	+	gaxOptionsOrCallback?: CallOptions \| UpdateRowsCallback,
	821	+	cb?: UpdateRowsCallback
732	822		): Promise<UpdateRowsResponse> \| void {
733		-	this._mutate('update', rows, callback!);
	823	+	const gaxOptions =
	824	+	typeof gaxOptionsOrCallback === 'object' ? gaxOptionsOrCallback : {};
	825	+	const callback =
	826	+	typeof gaxOptionsOrCallback === 'function' ? gaxOptionsOrCallback : cb!;
	827	+
	828	+	this._mutate('update', rows, gaxOptions, callback!);
734	829		}
735		-	upsert(rows: object \| object[]): Promise<UpsertRowsResponse>;
	830	+	upsert(
	831	+	rows: object \| object[],
	832	+	gaxOptions?: CallOptions
	833	+	): Promise<UpsertRowsResponse>;
736	834		upsert(rows: object \| object[], callback: UpsertRowsCallback): void;
	835	+	upsert(
	836	+	rows: object \| object[],
	837	+	gaxOptions: CallOptions,
	838	+	callback: UpsertRowsCallback
	839	+	): void;
737	840		/**
738	841		* Insert or update rows of data within this table.
739	842		*
740	843		* @see [Commit API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.Commit)
741	844		*
742	845		* @param {object\|object[]} rows A map of names to values of data to insert
743	846		* into this table.
	847	+	*
	848	+	* @param {object} [gaxOptions] Request configuration options, outlined here:
	849	+	* https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
744	850		* @param {BasicCallback} [callback] Callback function.
745	851		* @returns {Promise<BasicResponse>}
746	852		*

Compare `fe003c0 ... +100 ... 9508788`

No flags found

Show failed CI and contexual commits `c`

102 Commits

18	18		* @module spanner/session
19	19		*/
20	20
21		-	import {GrpcServiceObject} from './common-grpc/service-object';
	21	+	// eslint-disable-next-line @typescript-eslint/no-var-requires
	22	+	const common = require('./common-grpc/service-object');
22	23		import {promisifyAll} from '@google-cloud/promisify';
23	24		import * as extend from 'extend';
24	25		import * as r from 'teeny-request';

34	35		CreateSessionCallback,
35	36		CreateSessionOptions,
36	37		} from './database';
37		-	import {ServiceObjectConfig, DeleteCallback} from '@google-cloud/common';
38		-	import {NormalCallback} from './common';
39		-	import {ServiceError} from 'grpc';
	38	+	import {ServiceObjectConfig} from '@google-cloud/common';
	39	+	import {NormalCallback, CLOUD_RESOURCE_HEADER} from './common';
	40	+	import {grpc, CallOptions} from 'google-gax';
40	41
41	42		export type GetSessionResponse = [Session, r.Response];
42	43

55	56
56	57		export type KeepAliveCallback = NormalCallback<google.spanner.v1.IResultSet>;
57	58		export type KeepAliveResponse = [google.spanner.v1.IResultSet];
58		-	export type DeleteResponse = [r.Response];
	59	+	export type DeleteSessionResponse = [google.protobuf.IEmpty];
	60	+	export type DeleteSessionCallback = NormalCallback<google.protobuf.IEmpty>;
	61	+
59	62		/**
60	63		* Create a Session object to interact with a Cloud Spanner session.
61	64		*

94	97		* //-
95	98		* const session = database.session('session-name');
96	99		*/
97		-	export class Session extends GrpcServiceObject {
	100	+	export class Session extends common.GrpcServiceObject {
98	101		id!: string;
99	102		formattedName_?: string;
100	103		type?: types;
101	104		txn?: Transaction;
102	105		lastUsed?: number;
103		-	lastError?: ServiceError;
	106	+	lastError?: grpc.ServiceError;
	107	+	resourceHeader_: {[k: string]: string};
104	108		constructor(database: Database, name?: string) {
105	109		const methods = {
106	110		/**

231	235		},
232	236		} as {}) as ServiceObjectConfig);
233	237
	238	+	this.resourceHeader_ = {
	239	+	[CLOUD_RESOURCE_HEADER]: (this.parent as Database).formattedName_,
	240	+	};
234	241		this.request = database.request;
235	242		this.requestStream = database.requestStream;
236	243
237	244		if (name) {
238	245		this.formattedName_ = Session.formatName_(database.formattedName_, name);
239	246		}
240	247		}
241		-	delete(): Promise<DeleteResponse>;
242		-	delete(callback: DeleteCallback): void;
	248	+	delete(gaxOptions?: CallOptions): Promise<DeleteSessionResponse>;
	249	+	delete(callback: DeleteSessionCallback): void;
	250	+	delete(gaxOptions: CallOptions, callback: DeleteSessionCallback): void;
243	251		/**
244	252		* Delete a session.
245	253		*

248	256		* @see {@link v1.SpannerClient#deleteSession}
249	257		* @see [DeleteSession API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.DeleteSession)
250	258		*
251		-	* @param {BasicCallback} [callback] Callback function.
252		-	* @returns {Promise<BasicResponse>}
	259	+	* @param {object} [gaxOptions] Request configuration options, outlined here:
	260	+	* https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
	261	+	* @param {DeleteSessionCallback} [callback] Callback function.
	262	+	* @returns {Promise<DeleteSessionResponse>}
253	263		*
254	264		* @example
255	265		* session.delete(function(err, apiResponse) {

267	277		* const apiResponse = data[0];
268	278		* });
269	279		*/
270		-	delete(callback?: DeleteCallback): void \| Promise<DeleteResponse> {
	280	+	delete(
	281	+	optionsOrCallback?: CallOptions \| DeleteSessionCallback,
	282	+	cb?: DeleteSessionCallback
	283	+	): void \| Promise<DeleteSessionResponse> {
	284	+	const gaxOpts =
	285	+	typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
	286	+	const callback =
	287	+	typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
	288	+
271	289		const reqOpts = {
272	290		name: this.formattedName_,
273	291		};

276	294		client: 'SpannerClient',
277	295		method: 'deleteSession',
278	296		reqOpts,
	297	+	gaxOpts,
	298	+	headers: this.resourceHeader_,
279	299		},
280	300		callback!
281	301		);
282	302		}
283		-	getMetadata(): Promise<GetSessionMetadataResponse>;
	303	+	getMetadata(gaxOptions?: CallOptions): Promise<GetSessionMetadataResponse>;
284	304		getMetadata(callback: GetSessionMetadataCallback): void;
	305	+	getMetadata(
	306	+	gaxOptions: CallOptions,
	307	+	callback: GetSessionMetadataCallback
	308	+	): void;
285	309		/**
286	310		* @typedef {array} GetSessionMetadataResponse
287	311		* @property {object} 0 The session's metadata.

301	325		* @see {@link v1.SpannerClient#getSession}
302	326		* @see [GetSession API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#google.spanner.v1.Spanner.GetSession)
303	327		*
	328	+	* @param {object} [gaxOptions] Request configuration options, outlined here:
	329	+	* https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
304	330		* @param {GetSessionMetadataCallback} [callback] Callback function.
305	331		* @returns {Promise<GetSessionMetadataResponse>}
306	332		*

316	342		* });
317	343		*/
318	344		getMetadata(
319		-	callback?: GetSessionMetadataCallback
	345	+	optionsOrCallback?: CallOptions \| GetSessionMetadataCallback,
	346	+	cb?: GetSessionMetadataCallback
320	347		): void \| Promise<GetSessionMetadataResponse> {
	348	+	const gaxOpts =
	349	+	typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
	350	+	const callback =
	351	+	typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
	352	+
321	353		const reqOpts = {
322	354		name: this.formattedName_,
323	355		};

406	374		);
407	375		}
408	376		const formattedName = Instance.formatName_(this.projectId, name);
409		-	const shortName = formattedName.split('/').pop();
	377	+	const displayName = config.displayName \|\| formattedName.split('/').pop();
410	378		const reqOpts = {
411		-	parent: 'projects/' + this.projectId,
412		-	instanceId: shortName,
	379	+	parent: this.projectFormattedName_,
	380	+	instanceId: formattedName.split('/').pop(),
413	381		instance: extend(
414	382		{
415	383		name: formattedName,
416		-	displayName: shortName,
	384	+	displayName,
417	385		nodeCount: config.nodes \|\| 1,
418	386		},
419	387		config
420	388		),
421	389		};
422	390
423	391		delete reqOpts.instance.nodes;
	392	+	delete reqOpts.instance.gaxOptions;
424	393
425		-	if (config.config.indexOf('/') === -1) {
	394	+	if (config.config!.indexOf('/') === -1) {
426	395		reqOpts.instance.config = `projects/${this.projectId}/instanceConfigs/${config.config}`;
427	396		}
428	397		this.request(
429	398		{
430	399		client: 'InstanceAdminClient',
431	400		method: 'createInstance',
432	401		reqOpts,
	402	+	gaxOpts: config.gaxOptions,
	403	+	headers: this.resourceHeader_,
433	404		},
434	405		(err, operation, resp) => {
435	406		if (err) {

517	488		* }
518	489		*
519	490		* spanner.getInstances({
520		-	* autoPaginate: false
	491	+	* gaxOptions: {
	492	+	* autoPaginate: false,
	493	+	* }
521	494		* }, callback);
522	495		*
523	496		* //-

632	700		* }
633	701		*
634	702		* spanner.getInstanceConfigs({
635		-	* autoPaginate: false
	703	+	* gaxOptions: {
	704	+	* autoPaginate: false,
	705	+	* }
636	706		* }, callback);
637	707		*
638	708		* //-

764	877		const requestFn = gaxClient[config.method].bind(
765	878		gaxClient,
766	879		reqOpts,
767		-	config.gaxOpts
	880	+	// Add headers to `gaxOpts`
	881	+	extend(true, {}, config.gaxOpts, {
	882	+	otherArgs: {
	883	+	headers: config.headers,
	884	+	},
	885	+	})
768	886		);
769	887		callback(null, requestFn);
770	888		});

326	358		client: 'SpannerClient',
327	359		method: 'getSession',
328	360		reqOpts,
	361	+	gaxOpts,
	362	+	headers: this.resourceHeader_,
329	363		},
330		-	callback!
	364	+	(err, resp) => {
	365	+	if (resp) {
	366	+	this.metadata = resp;
	367	+	}
	368	+	callback!(err, resp);
	369	+	}
331	370		);
332	371		}
333		-	keepAlive(): Promise<KeepAliveResponse>;
	372	+	keepAlive(gaxOptions?: CallOptions): Promise<KeepAliveResponse>;
334	373		keepAlive(callback: KeepAliveCallback): void;
	374	+	keepAlive(gaxOptions: CallOptions, callback: KeepAliveCallback): void;
335	375		/**
336	376		* Ping the session with `SELECT 1` to prevent it from expiring.
337	377		*
	378	+	* @param {object} [gaxOptions] Request configuration options, outlined here:
	379	+	* https://googleapis.github.io/gax-nodejs/classes/CallSettings.html.
338	380		* @param {BasicCallback} [callback] Callback function.
339	381		* @returns {Promise<BasicResponse>}
340	382		*

345	387		* }
346	388		* });
347	389		*/
348		-	keepAlive(callback?: KeepAliveCallback): void \| Promise<KeepAliveResponse> {
	390	+	keepAlive(
	391	+	optionsOrCallback?: CallOptions \| KeepAliveCallback,
	392	+	cb?: KeepAliveCallback
	393	+	): void \| Promise<KeepAliveResponse> {
	394	+	const gaxOpts =
	395	+	typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
	396	+	const callback =
	397	+	typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
	398	+
349	399		const reqOpts = {
350	400		session: this.formattedName_,
351	401		sql: 'SELECT 1',

355	405		client: 'SpannerClient',
356	406		method: 'executeSql',
357	407		reqOpts,
	408	+	gaxOpts,
	409	+	headers: this.resourceHeader_,
358	410		},
359	411		callback!
360	412		);

15	15		*/
16	16
17	17		import {GrpcService, GrpcServiceConfig} from './common-grpc/service';
18		-	import {paginator} from '@google-cloud/paginator';
19	18		import {PreciseDate} from '@google-cloud/precise-date';
20	19		import {replaceProjectIdToken} from '@google-cloud/projectify';
21	20		import {promisifyAll} from '@google-cloud/promisify';
22	21		import * as extend from 'extend';
23	22		import {GoogleAuth, GoogleAuthOptions} from 'google-auth-library';
24		-	import * as is from 'is';
25	23		import * as path from 'path';
26	24		import {common as p} from 'protobufjs';
27	25		import * as streamEvents from 'stream-events';
28	26		import * as through from 'through2';
29		-	import {codec, Float, Int, SpannerDate, Struct} from './codec';
	27	+	import {codec, Float, Int, Numeric, SpannerDate, Struct} from './codec';
30	28		import {Backup} from './backup';
31	29		import {Database} from './database';
32	30		import {
33	31		Instance,
34	32		CreateInstanceCallback,
35	33		CreateInstanceResponse,
36	34		} from './instance';
	35	+	import {grpc, GrpcClientOptions, CallOptions} from 'google-gax';
37	36		import {google as instanceAdmin} from '../protos/protos';
38		-	import {PagedRequest, PagedResponse, PagedCallback} from './common';
	37	+	import {
	38	+	PagedOptions,
	39	+	PagedResponse,
	40	+	PagedCallback,
	41	+	PagedOptionsWithFilter,
	42	+	CLOUD_RESOURCE_HEADER,
	43	+	} from './common';
39	44		import {Session} from './session';
40	45		import {SessionPool} from './session-pool';
41	46		import {Table} from './table';
42	47		import {PartitionedDml, Snapshot, Transaction} from './transaction';
43		-	import {GrpcClientOptions} from 'google-gax';
44		-	import {ChannelCredentials} from 'grpc';
45		-	import {
46		-	createGcpApiConfig,
47		-	gcpCallInvocationTransformer,
48		-	gcpChannelFactoryOverride,
49		-	} from 'grpc-gcp';
	48	+	import grpcGcpModule = require('grpc-gcp');
	49	+	const grpcGcp = grpcGcpModule(grpc);
50	50		import * as v1 from './v1';
51		-	import * as grpc from 'grpc';
52	51
53	52		// eslint-disable-next-line @typescript-eslint/no-var-requires
54	53		const gcpApiConfig = require('./spanner_grpc_config.json');
55	54
56	55		export type IOperation = instanceAdmin.longrunning.IOperation;
57	56
58		-	export type GetInstancesRequest = PagedRequest<
59		-	instanceAdmin.spanner.admin.instance.v1.IListInstancesRequest & {
60		-	maxResults?: number;
61		-	}
62		-	>;
	57	+	export type GetInstancesOptions = PagedOptionsWithFilter;
	58	+
63	59		export type GetInstancesResponse = PagedResponse<
64	60		Instance,
65	61		instanceAdmin.spanner.admin.instance.v1.IListInstancesResponse

69	65		instanceAdmin.spanner.admin.instance.v1.IListInstancesResponse
70	66		>;
71	67
72		-	export type GetInstanceConfigsRequest = PagedRequest<
73		-	instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsRequest & {
74		-	maxResults?: number;
75		-	}
76		-	>;
	68	+	export type GetInstanceConfigsOptions = PagedOptions;
77	69		export type GetInstanceConfigsResponse = PagedResponse<
78		-	instanceAdmin.spanner.admin.instance.v1.InstanceConfig,
	70	+	instanceAdmin.spanner.admin.instance.v1.IInstanceConfig,
79	71		instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsResponse
80	72		>;
81	73		export type GetInstanceConfigsCallback = PagedCallback<
82		-	instanceAdmin.spanner.admin.instance.v1.InstanceConfig,
	74	+	instanceAdmin.spanner.admin.instance.v1.IInstanceConfig,
83	75		instanceAdmin.spanner.admin.instance.v1.IListInstanceConfigsResponse
84	76		>;
85	77
86	78		export interface SpannerOptions extends GrpcClientOptions {
87	79		apiEndpoint?: string;
88	80		servicePath?: string;
89	81		port?: number;
90		-	sslCreds?: ChannelCredentials;
	82	+	sslCreds?: grpc.ChannelCredentials;
91	83		}
92	84		export interface RequestConfig {
93	85		client: string;
94	86		method: string;
95	87		// eslint-disable-next-line @typescript-eslint/no-explicit-any
96	88		reqOpts: any;
97		-	gaxOpts?: {};
	89	+	gaxOpts?: CallOptions;
	90	+	headers: {[k: string]: string};
98	91		}
99	92		export interface CreateInstanceRequest {
100		-	config: string;
	93	+	config?: string;
101	94		nodes?: number;
	95	+	displayName?: string;
102	96		labels?: {[k: string]: string} \| null;
	97	+	gaxOptions?: CallOptions;
103	98		}
104	99		/**
105	100		* Translates enum values to string keys.

161	156		auth: GoogleAuth;
162	157		clients_: Map<string, {}>;
163	158		instances_: Map<string, Instance>;
164		-	getInstancesStream: Function;
	159	+	projectFormattedName_: string;
	160	+	resourceHeader_: {[k: string]: string};
165	161
166	162		/**
167	163		* Placeholder used to auto populate a column with the commit timestamp.

225	221		libVersion: require('../../package.json').version,
226	222		scopes,
227	223		// Enable grpc-gcp support
228		-	'grpc.callInvocationTransformer': gcpCallInvocationTransformer,
229		-	'grpc.channelFactoryOverride': gcpChannelFactoryOverride,
230		-	'grpc.gcpApiConfig': createGcpApiConfig(gcpApiConfig),
	224	+	'grpc.callInvocationTransformer': grpcGcp.gcpCallInvocationTransformer,
	225	+	'grpc.channelFactoryOverride': grpcGcp.gcpChannelFactoryOverride,
	226	+	'grpc.gcpApiConfig': grpcGcp.createGcpApiConfig(gcpApiConfig),
231	227		grpc,
232	228		},
233	229		options \|\| {}

262	258		this.auth = new GoogleAuth(this.options);
263	259		this.clients_ = new Map();
264	260		this.instances_ = new Map();
265		-
266		-	/**
267		-	* Get a list of {@link Instance} objects as a readable object stream.
268		-	*
269		-	* Wrapper around {@link v1.InstanceAdminClient#listInstances}.
270		-	*
271		-	* @see {@link v1.InstanceAdminClient#listInstances}
272		-	* @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
273		-	*
274		-	* @method Spanner#getInstancesStream
275		-	* @param {GetInstancesRequest} [query] Query object for listing instances.
276		-	* @returns {ReadableStream} A readable stream that emits {@link Instance}
277		-	* instances.
278		-	*
279		-	* @example
280		-	* const {Spanner} = require('@google-cloud/spanner');
281		-	* const spanner = new Spanner();
282		-	*
283		-	* spanner.getInstancesStream()
284		-	* .on('error', console.error)
285		-	* .on('data', function(instance) {
286		-	* // `instance` is an `Instance` object.
287		-	* })
288		-	* .on('end', function() {
289		-	* // All instances retrieved.
290		-	* });
291		-	*
292		-	* //-
293		-	* // If you anticipate many results, you can end a stream early to prevent
294		-	* // unnecessary processing and API requests.
295		-	* //-
296		-	* spanner.getInstancesStream()
297		-	* .on('data', function(instance) {
298		-	* this.end();
299		-	* });
300		-	*/
301		-	this.getInstancesStream = paginator.streamify('getInstances');
	261	+	this.projectFormattedName_ = 'projects/' + this.projectId;
	262	+	this.resourceHeader_ = {
	263	+	[CLOUD_RESOURCE_HEADER]: this.projectFormattedName_,
	264	+	};
302	265		}
303	266
304	267		createInstance(

324	287		* be used to control how resource metrics are aggregated. And they can
325	288		* be used as arguments to policy management rules (e.g. route,
326	289		* firewall, load balancing, etc.).
	290	+	* @property {string} [displayName] The descriptive name for this instance
	291	+	* as it appears in UIs. Must be unique per project and between 4 and 30
	292	+	* characters in length.
	293	+	* Defaults to the instance unique identifier '<instance>' of the full
	294	+	* instance name of the form 'projects/<project>/instances/<instance>'.
327	295		*/
328	296		/**
329	297		* @typedef {array} CreateInstanceResponse

442	413		);
443	414		}
444	415
445		-	getInstances(query?: GetInstancesRequest): Promise<GetInstancesResponse>;
	416	+	getInstances(options?: GetInstancesOptions): Promise<GetInstancesResponse>;
446	417		getInstances(callback: GetInstancesCallback): void;
447	418		getInstances(
448		-	query: GetInstancesRequest,
	419	+	query: GetInstancesOptions,
449	420		callback: GetInstancesCallback
450	421		): void;
451	422		/**
452	423		* Query object for listing instances.
453	424		*
454		-	* @typedef {object} GetInstancesRequest
455		-	* @property {boolean} [autoPaginate=true] Have pagination handled
456		-	* automatically.
	425	+	* @typedef {object} GetInstancesOptions
	426	+	* @property {object} [gaxOptions] Request configuration options, outlined
	427	+	* here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
457	428		* @property {string} [filter] An expression for filtering the results of the
458	429		* request. Filter rules are case insensitive. The fields eligible for
459	430		* filtering are:

Compare fe003c0 ... +100 ... 9508788

No flags found

Show failed CI and contexual commits c 102 Commits

Compare `fe003c0 ... +100 ... 9508788`

Show failed CI and contexual commits `c`

102 Commits

468	439		* - `labels.env:dev` The instance's label env has the value dev.
469	440		* - `name:howl labels.env:dev` The instance's name is howl and it has
470	441		* the label env with value dev.
471		-	* @property {number} [maxApiCalls] Maximum number of API calls to make.
472		-	* @property {number} [maxResults] Maximum number of items to return.
473	442		* @property {number} [pageSize] Maximum number of results per page.
474	443		* @property {string} [pageToken] A previously-returned page token
475	444		* representing part of the larger set of results to view.
476	445		*/
477	446		/**
478	447		* @typedef {array} GetInstancesResponse
479	448		* @property {Instance[]} 0 Array of {@link Instance} instances.
480		-	* @property {object} 1 The full API response.
	449	+	* @property {object} 1 A query object to receive more results.
	450	+	* @property {object} 2 The full API response.
481	451		*/
482	452		/**
483	453		* @callback GetInstancesCallback
484	454		* @param {?Error} err Request error, if any.
485	455		* @param {Instance[]} instances Array of {@link Instance} instances.
	456	+	* @param {string} nextQuery A query object to receive more results.
486	457		* @param {object} apiResponse The full API response.
487	458		*/
488	459		/**

528	501		* });
529	502		*/
530	503		getInstances(
531		-	query?: GetInstancesRequest \| GetInstancesCallback,
532		-	callback?: GetInstancesCallback
	504	+	optionsOrCallback?: GetInstancesOptions \| GetInstancesCallback,
	505	+	cb?: GetInstancesCallback
533	506		): Promise<GetInstancesResponse> \| void {
534	507		// eslint-disable-next-line @typescript-eslint/no-this-alias
535	508		const self = this;
536		-	if (is.fn(query)) {
537		-	callback = query as GetInstancesCallback;
538		-	query = {};
539		-	}
540		-	const reqOpts = extend({}, query, {
	509	+	const options =
	510	+	typeof optionsOrCallback === 'object'
	511	+	? optionsOrCallback
	512	+	: ({} as GetInstancesOptions);
	513	+	const callback =
	514	+	typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
	515	+
	516	+	const gaxOpts = extend(true, {}, options.gaxOptions);
	517	+
	518	+	let reqOpts = extend({}, options, {
541	519		parent: 'projects/' + this.projectId,
542	520		});
	521	+
	522	+	delete reqOpts.gaxOptions;
	523	+
	524	+	// Copy over pageSize and pageToken values from gaxOptions.
	525	+	// However values set on options take precedence.
	526	+	if (gaxOpts) {
	527	+	reqOpts = extend(
	528	+	{},
	529	+	{
	530	+	pageSize: gaxOpts.pageSize,
	531	+	pageToken: gaxOpts.pageToken,
	532	+	},
	533	+	reqOpts
	534	+	);
	535	+	delete gaxOpts.pageToken;
	536	+	delete gaxOpts.pageSize;
	537	+	}
	538	+
543	539		this.request(
544	540		{
545	541		client: 'InstanceAdminClient',
546	542		method: 'listInstances',
547	543		reqOpts,
548		-	gaxOpts: query,
	544	+	gaxOpts,
	545	+	headers: this.resourceHeader_,
549	546		},
550		-	(err, instances, ...args) => {
	547	+	(err, instances, nextPageRequest, ...args) => {
551	548		let instanceInstances: Instance[] \| null = null;
552	549		if (instances) {
553	550		instanceInstances = instances.map(instance => {

556	553		return instanceInstance;
557	554		});
558	555		}
559		-	callback!(err, instanceInstances, ...args);
	556	+	const nextQuery = nextPageRequest!
	557	+	? extend({}, options, nextPageRequest!)
	558	+	: null;
	559	+	callback!(err, instanceInstances, nextQuery, ...args);
560	560		}
561	561		);
562	562		}
563	563
	564	+	/**
	565	+	* Get a list of {@link Instance} objects as a readable object stream.
	566	+	*
	567	+	* Wrapper around {@link v1.InstanceAdminClient#listInstances}.
	568	+	*
	569	+	* @see {@link v1.InstanceAdminClient#listInstances}
	570	+	* @see [ListInstances API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstances)
	571	+	*
	572	+	* @method Spanner#getInstancesStream
	573	+	* @param {GetInstancesOptions} [options] Query object for listing instances.
	574	+	* @returns {ReadableStream} A readable stream that emits {@link Instance}
	575	+	* instances.
	576	+	*
	577	+	* @example
	578	+	* const {Spanner} = require('@google-cloud/spanner');
	579	+	* const spanner = new Spanner();
	580	+	*
	581	+	* spanner.getInstancesStream()
	582	+	* .on('error', console.error)
	583	+	* .on('data', function(instance) {
	584	+	* // `instance` is an `Instance` object.
	585	+	* })
	586	+	* .on('end', function() {
	587	+	* // All instances retrieved.
	588	+	* });
	589	+	*
	590	+	* //-
	591	+	* // If you anticipate many results, you can end a stream early to prevent
	592	+	* // unnecessary processing and API requests.
	593	+	* //-
	594	+	* spanner.getInstancesStream()
	595	+	* .on('data', function(instance) {
	596	+	* this.end();
	597	+	* });
	598	+	*/
	599	+	getInstancesStream(options: GetInstancesOptions = {}): NodeJS.ReadableStream {
	600	+	const gaxOpts = extend(true, {}, options.gaxOptions);
	601	+
	602	+	let reqOpts = extend({}, options, {
	603	+	parent: 'projects/' + this.projectId,
	604	+	});
	605	+	delete reqOpts.gaxOptions;
	606	+
	607	+	// Copy over pageSize and pageToken values from gaxOptions.
	608	+	// However values set on options take precedence.
	609	+	if (gaxOpts) {
	610	+	reqOpts = extend(
	611	+	{},
	612	+	{
	613	+	pageSize: gaxOpts.pageSize,
	614	+	pageToken: gaxOpts.pageToken,
	615	+	},
	616	+	reqOpts
	617	+	);
	618	+	delete gaxOpts.pageSize;
	619	+	delete gaxOpts.pageToken;
	620	+	}
	621	+
	622	+	return this.requestStream({
	623	+	client: 'InstanceAdminClient',
	624	+	method: 'listInstancesStream',
	625	+	reqOpts,
	626	+	gaxOpts,
	627	+	headers: this.resourceHeader_,
	628	+	});
	629	+	}
	630	+
564	631		getInstanceConfigs(
565		-	query?: GetInstanceConfigsRequest
	632	+	query?: GetInstanceConfigsOptions
566	633		): Promise<GetInstanceConfigsResponse>;
567	634		getInstanceConfigs(callback: GetInstanceConfigsCallback): void;
568	635		getInstanceConfigs(
569		-	query: GetInstanceConfigsRequest,
	636	+	query: GetInstanceConfigsOptions,
570	637		callback: GetInstanceConfigsCallback
571	638		): void;
572	639		/**
573		-	* Query object for listing instance configs.
	640	+	* Lists the supported instance configurations for a given project.
574	641		*
575		-	* @typedef {object} GetInstanceConfigsRequest
576		-	* @property {boolean} [autoPaginate=true] Have pagination handled
577		-	* automatically.
578		-	* @property {number} [maxApiCalls] Maximum number of API calls to make.
579		-	* @property {number} [maxResults] Maximum number of items to return.
	642	+	* @typedef {object} GetInstanceConfigsOptions
580	643		* @property {number} [pageSize] Maximum number of results per page.
581	644		* @property {string} [pageToken] A previously-returned page token
582	645		* representing part of the larger set of results to view.
	646	+	* @property {object} [gaxOptions] Request configuration options, outlined
	647	+	* here: https://googleapis.github.io/gax-nodejs/global.html#CallOptions.
	648	+
583	649		*/
584	650		/**
585	651		* @typedef {array} GetInstanceConfigsResponse
586	652		* @property {object[]} 0 List of all available instance configs.
587	653		* @property {string} 0.name The unique identifier for the instance config.
588	654		* @property {string} 0.displayName The name of the instance config as it
589	655		* appears in UIs.
590		-	* @property {object} 1 The full API response.
	656	+	* @property {object} 1 A query object to receive more results.
	657	+	* @property {object} 2 The full API response.
591	658		*/
592	659		/**
593	660		* @callback GetInstanceConfigsCallback

597	664		* config.
598	665		* @param {string} instanceConfigs.displayName The name of the instance config
599	666		* as it appears in UIs.
	667	+	* @param {object} nextQuery A query object to receive more results.
600	668		* @param {object} apiResponse The full API response.
601	669		*/
602	670		/**

607	675		* @see {@link v1.InstanceAdminClient#listInstanceConfigs}
608	676		* @see [ListInstanceConfigs API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs)
609	677		*
610		-	* @param {GetInstanceConfigsRequest} [query] Query object for listing instance
	678	+	* @param {GetInstanceConfigsOptions} [options] Query object for listing instance
611	679		* configs.
612	680		* @param {GetInstanceConfigsCallback} [callback] Callback function.
613	681		* @returns {Promise<GetInstanceConfigsResponse>}

643	713		* });
644	714		*/
645	715		getInstanceConfigs(
646		-	queryOrCallback?: GetInstanceConfigsRequest \| GetInstanceConfigsCallback,
	716	+	optionsOrCallback?: GetInstanceConfigsOptions \| GetInstanceConfigsCallback,
647	717		cb?: GetInstanceConfigsCallback
648	718		): Promise<GetInstanceConfigsResponse> \| void {
649	719		const callback =
650		-	typeof queryOrCallback === 'function'
651		-	? (queryOrCallback as GetInstanceConfigsCallback)
652		-	: cb;
653		-	const query =
654		-	typeof queryOrCallback === 'object'
655		-	? (queryOrCallback as GetInstanceConfigsRequest)
656		-	: {};
657		-	const reqOpts = extend({}, query, {
	720	+	typeof optionsOrCallback === 'function' ? optionsOrCallback : cb;
	721	+	const options =
	722	+	typeof optionsOrCallback === 'object'
	723	+	? optionsOrCallback
	724	+	: ({} as GetInstanceConfigsOptions);
	725	+
	726	+	const gaxOpts = extend(true, {}, options.gaxOptions);
	727	+	let reqOpts = extend({}, options, {
658	728		parent: 'projects/' + this.projectId,
659	729		});
	730	+	delete reqOpts.gaxOptions;
	731	+
	732	+	// Copy over pageSize and pageToken values from gaxOptions.
	733	+	// However values set on options take precedence.
	734	+	if (gaxOpts) {
	735	+	reqOpts = extend(
	736	+	{},
	737	+	{
	738	+	pageSize: gaxOpts.pageSize,
	739	+	pageToken: gaxOpts.pageToken,
	740	+	},
	741	+	reqOpts
	742	+	);
	743	+	delete gaxOpts.pageSize;
	744	+	delete gaxOpts.pageToken;
	745	+	}
	746	+
660	747		return this.request(
661	748		{
662	749		client: 'InstanceAdminClient',
663	750		method: 'listInstanceConfigs',
664	751		reqOpts,
665		-	gaxOpts: query,
	752	+	gaxOpts,
	753	+	headers: this.resourceHeader_,
666	754		},
667		-	callback
	755	+	(err, instanceConfigs, nextPageRequest, ...args) => {
	756	+	const nextQuery = nextPageRequest!
	757	+	? extend({}, options, nextPageRequest!)
	758	+	: null;
	759	+	callback!(err, instanceConfigs, nextQuery, ...args);
	760	+	}
668	761		);
669	762		}
670	763

677	770		* @see [ListInstanceConfigs API Documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.InstanceAdmin.ListInstanceConfigs)
678	771		*
679	772		* @method Spanner#getInstanceConfigsStream
680		-	* @param {GetInstanceConfigsRequest} [query] Query object for listing instance
	773	+	* @param {GetInstanceConfigsOptions} [options] Query object for listing instance
681	774		* configs.
682	775		* @returns {ReadableStream} A readable stream that emits instance configs.
683	776		*

702	795		* });
703	796		*/
704	797		getInstanceConfigsStream(
705		-	query?: GetInstanceConfigsRequest
	798	+	options: GetInstanceConfigsOptions = {}
706	799		): NodeJS.ReadableStream {
707		-	const reqOpts = extend({}, query, {
	800	+	const gaxOpts = extend(true, {}, options.gaxOptions);
	801	+
	802	+	let reqOpts = extend({}, options, {
708	803		parent: 'projects/' + this.projectId,
709	804		});
	805	+
	806	+	// Copy over pageSize and pageToken values from gaxOptions.
	807	+	// However values set on options take precedence.
	808	+	if (gaxOpts) {
	809	+	reqOpts = extend(
	810	+	{},
	811	+	{
	812	+	pageSize: gaxOpts.pageSize,
	813	+	pageToken: gaxOpts.pageToken,
	814	+	},
	815	+	reqOpts
	816	+	);
	817	+	delete gaxOpts.pageSize;
	818	+	delete gaxOpts.pageToken;
	819	+	}
	820	+
	821	+	delete reqOpts.gaxOptions;
710	822		return this.requestStream({
711	823		client: 'InstanceAdminClient',
712	824		method: 'listInstanceConfigsStream',
713	825		reqOpts,
714		-	gaxOpts: query,
	826	+	gaxOpts,
	827	+	headers: this.resourceHeader_,
715	828		});
716	829		}
717	830

783	901		*/
784	902		// eslint-disable-next-line @typescript-eslint/no-explicit-any
785	903		request(config: any, callback?: any): any {
786		-	if (is.fn(callback)) {
	904	+	if (typeof callback === 'function') {
787	905		this.prepareGapicRequest_(config, (err, requestFn) => {
788	906		if (err) {
789	907		callback(err);

16	16
17	17		import {promisifyAll} from '@google-cloud/promisify';
18	18		import * as through from 'through2';
19		-	import {Operation as GaxOperation} from 'google-gax';
	19	+	import {Operation as GaxOperation, CallOptions} from 'google-gax';
20	20		import {Database, UpdateSchemaCallback, UpdateSchemaResponse} from './database';
21	21		import {PartialResultStream, Row} from './partial-result-stream';
22	22		import {