typeorm 0.3.29-dev.cc07c90 → 1.0.0-beta.1

package/browser/driver/spanner/SpannerQueryRunner.js

@@ -1,34 +1,37 @@
-import { TypeORMError } from "../../error";
-import { QueryFailedError } from "../../error/QueryFailedError";
-import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
-import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
-import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
-import { QueryResult } from "../../query-runner/QueryResult";
-import { Table } from "../../schema-builder/table/Table";
-import { TableCheck } from "../../schema-builder/table/TableCheck";
-import { TableColumn } from "../../schema-builder/table/TableColumn";
-import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
-import { TableIndex } from "../../schema-builder/table/TableIndex";
-import { TableUnique } from "../../schema-builder/table/TableUnique";
-import { View } from "../../schema-builder/view/View";
-import { Broadcaster } from "../../subscriber/Broadcaster";
-import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
-import { OrmUtils } from "../../util/OrmUtils";
-import { Query } from "../Query";
-import { MetadataTableType } from "../types/MetadataTableType";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpannerQueryRunner = void 0;
+const error_1 = require("../../error");
+const QueryFailedError_1 = require("../../error/QueryFailedError");
+const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
+const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
+const BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
+const QueryResult_1 = require("../../query-runner/QueryResult");
+const Table_1 = require("../../schema-builder/table/Table");
+const TableCheck_1 = require("../../schema-builder/table/TableCheck");
+const TableColumn_1 = require("../../schema-builder/table/TableColumn");
+const TableForeignKey_1 = require("../../schema-builder/table/TableForeignKey");
+const TableIndex_1 = require("../../schema-builder/table/TableIndex");
+const TableUnique_1 = require("../../schema-builder/table/TableUnique");
+const View_1 = require("../../schema-builder/view/View");
+const Broadcaster_1 = require("../../subscriber/Broadcaster");
+const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
+const OrmUtils_1 = require("../../util/OrmUtils");
+const Query_1 = require("../Query");
+const MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single postgres database connection.
  */
-export class SpannerQueryRunner extends BaseQueryRunner {
+class SpannerQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
     constructor(driver, mode) {
         super();
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.mode = mode;
-        this.broadcaster = new Broadcaster(this);
+        this.broadcaster = new Broadcaster_1.Broadcaster(this);
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -60,6 +63,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         this.isTransactionActive = true;
@@ -72,7 +76,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         }
         await this.connect();
         await this.sessionTransaction.begin();
-        this.connection.logger.logQuery("START TRANSACTION");
+        this.dataSource.logger.logQuery("START TRANSACTION");
         await this.broadcaster.broadcast("AfterTransactionStart");
     }
     /**
@@ -81,10 +85,10 @@ export class SpannerQueryRunner extends BaseQueryRunner {
      */
     async commitTransaction() {
         if (!this.isTransactionActive || !this.sessionTransaction)
-            throw new TransactionNotStartedError();
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         await this.sessionTransaction.commit();
-        this.connection.logger.logQuery("COMMIT");
+        this.dataSource.logger.logQuery("COMMIT");
         this.isTransactionActive = false;
         await this.broadcaster.broadcast("AfterTransactionCommit");
     }
@@ -94,23 +98,26 @@ export class SpannerQueryRunner extends BaseQueryRunner {
      */
     async rollbackTransaction() {
         if (!this.isTransactionActive || !this.sessionTransaction)
-            throw new TransactionNotStartedError();
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         await this.sessionTransaction.rollback();
-        this.connection.logger.logQuery("ROLLBACK");
+        this.dataSource.logger.logQuery("ROLLBACK");
         this.isTransactionActive = false;
         await this.broadcaster.broadcast("AfterTransactionRollback");
     }
     /**
      * Executes a given SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
+            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         await this.connect();
-        this.driver.connection.logger.logQuery(query, parameters, this);
+        this.driver.dataSource.logger.logQuery(query, parameters, this);
         await this.broadcaster.broadcast("BeforeQuery", query, parameters);
-        const broadcasterResult = new BroadcasterResult();
+        const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         try {
             const queryStartTime = Date.now();
             let rawResult = undefined;
@@ -152,8 +159,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, rawResult, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
-                this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
-            const result = new QueryResult();
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+            const result = new QueryResult_1.QueryResult();
             result.raw = rawResult;
             result.records = rawResult ? rawResult[0] : [];
             if (rawResult && rawResult[1] && rawResult[1].rowCountExact) {
@@ -165,9 +172,9 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             return result;
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
-            throw new QueryFailedError(query, parameters, err);
+            throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
         finally {
             await broadcasterResult.wait();
@@ -178,11 +185,13 @@ export class SpannerQueryRunner extends BaseQueryRunner {
      * Used for creating/altering/dropping tables, columns, indexes, etc.
      *
      * DDL changing queries should be executed by `updateSchema()` method.
+     * @param query
+     * @param parameters
      */
     async updateDDL(query, parameters) {
         if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
-        this.driver.connection.logger.logQuery(query, parameters, this);
+            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+        this.driver.dataSource.logger.logQuery(query, parameters, this);
         try {
             const queryStartTime = Date.now();
             const [operation] = await this.driver.instanceDatabase.updateSchema(query);
@@ -193,21 +202,25 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             const queryExecutionTime = queryEndTime - queryStartTime;
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
-                this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
-            throw new QueryFailedError(query, parameters, err);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
+            throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     async stream(query, parameters, onEnd, onError) {
         if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
+            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         try {
-            this.driver.connection.logger.logQuery(query, parameters, this);
+            this.driver.dataSource.logger.logQuery(query, parameters, this);
             const request = {
                 sql: query,
                 params: parameters
@@ -228,8 +241,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             return stream;
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
-            throw new QueryFailedError(query, parameters, err);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
+            throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
     }
     /**
@@ -241,99 +254,123 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     /**
      * Returns all available schema names including system schemas.
      * If database parameter specified, returns schemas of that database.
+     * @param database
      */
     async getSchemas(database) {
         return Promise.resolve([]);
     }
     /**
      * Checks if database with the given name exist.
+     * @param database
      */
     async hasDatabase(database) {
-        throw new TypeORMError(`Check database queries are not supported by Spanner driver.`);
+        throw new error_1.TypeORMError(`Check database queries are not supported by Spanner driver.`);
     }
     /**
      * Loads currently using database
      */
     async getCurrentDatabase() {
-        throw new TypeORMError(`Check database queries are not supported by Spanner driver.`);
+        throw new error_1.TypeORMError(`Check database queries are not supported by Spanner driver.`);
     }
     /**
      * Checks if schema with the given name exist.
+     * @param schema
      */
     async hasSchema(schema) {
-        const result = await this.query(`SELECT * FROM "information_schema"."schemata" WHERE "schema_name" = '${schema}'`);
+        const result = await this.query(`SELECT * FROM "information_schema"."schemata" WHERE "schema_name" = @param0`, [schema]);
         return result.length ? true : false;
     }
     /**
      * Loads currently using database schema
      */
     async getCurrentSchema() {
-        throw new TypeORMError(`Check schema queries are not supported by Spanner driver.`);
+        throw new error_1.TypeORMError(`Check schema queries are not supported by Spanner driver.`);
     }
     /**
      * Checks if table with the given name exist in the database.
+     * @param tableOrName
      */
     async hasTable(tableOrName) {
-        const tableName = tableOrName instanceof Table ? tableOrName.name : tableOrName;
+        const tableName = tableOrName instanceof Table_1.Table ? tableOrName.name : tableOrName;
         const sql = `SELECT * FROM \`INFORMATION_SCHEMA\`.\`TABLES\` ` +
             `WHERE \`TABLE_CATALOG\` = '' AND \`TABLE_SCHEMA\` = '' AND \`TABLE_TYPE\` = 'BASE TABLE' ` +
-            `AND \`TABLE_NAME\` = '${tableName}'`;
-        const result = await this.query(sql);
+            `AND \`TABLE_NAME\` = @param0`;
+        const result = await this.query(sql, [tableName]);
         return result.length ? true : false;
     }
     /**
      * Checks if column with the given name exist in the given table.
+     * @param tableOrName
+     * @param columnName
      */
     async hasColumn(tableOrName, columnName) {
-        const tableName = tableOrName instanceof Table ? tableOrName.name : tableOrName;
+        const tableName = tableOrName instanceof Table_1.Table ? tableOrName.name : tableOrName;
         const sql = `SELECT * FROM \`INFORMATION_SCHEMA\`.\`COLUMNS\` ` +
             `WHERE \`TABLE_CATALOG\` = '' AND \`TABLE_SCHEMA\` = '' ` +
-            `AND \`TABLE_NAME\` = '${tableName}' AND \`COLUMN_NAME\` = '${columnName}'`;
-        const result = await this.query(sql);
+            `AND \`TABLE_NAME\` = @param0 AND \`COLUMN_NAME\` = @param1`;
+        const result = await this.query(sql, [tableName, columnName]);
         return result.length ? true : false;
     }
     /**
      * Creates a new database.
      * Note: Spanner does not support database creation inside a transaction block.
+     * @param database
+     * @param ifNotExists
      */
-    async createDatabase(database, ifNotExist) {
-        if (ifNotExist) {
+    async createDatabase(database, ifNotExists) {
+        if (ifNotExists) {
             const databaseAlreadyExists = await this.hasDatabase(database);
             if (databaseAlreadyExists)
                 return Promise.resolve();
         }
-        const up = `CREATE DATABASE "${database}"`;
-        const down = `DROP DATABASE "${database}"`;
-        await this.executeQueries(new Query(up), new Query(down));
+        const escaped = this.driver.escape(database);
+        const up = `CREATE DATABASE ${escaped}`;
+        const down = `DROP DATABASE ${escaped}`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * Drops database.
      * Note: Spanner does not support database dropping inside a transaction block.
-     */
-    async dropDatabase(database, ifExist) {
-        const up = ifExist
-            ? `DROP DATABASE IF EXISTS "${database}"`
-            : `DROP DATABASE "${database}"`;
-        const down = `CREATE DATABASE "${database}"`;
-        await this.executeQueries(new Query(up), new Query(down));
+     * @param database
+     * @param ifExists
+     */
+    async dropDatabase(database, ifExists) {
+        if (ifExists) {
+            const databaseExists = await this.hasDatabase(database);
+            if (!databaseExists)
+                return;
+        }
+        const escaped = this.driver.escape(database);
+        const up = `DROP DATABASE ${escaped}`;
+        const down = `CREATE DATABASE ${escaped}`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * Creates a new table schema.
+     * @param schemaPath
+     * @param ifNotExists
      */
-    async createSchema(schemaPath, ifNotExist) {
+    async createSchema(schemaPath, ifNotExists) {
         return Promise.resolve();
     }
     /**
      * Drops table schema.
+     * @param schemaPath
+     * @param ifExists
+     * @param isCascade
      */
-    async dropSchema(schemaPath, ifExist, isCascade) {
+    async dropSchema(schemaPath, ifExists, isCascade) {
         return Promise.resolve();
     }
     /**
      * Creates a new table.
+     * @param table
+     * @param ifNotExists
+     * @param createForeignKeys
+     * @param createIndices
      */
-    async createTable(table, ifNotExist = false, createForeignKeys = true, createIndices = true) {
-        if (ifNotExist) {
+    async createTable(table, ifNotExists = false, createForeignKeys = true, createIndices = true) {
+        if (ifNotExists) {
             const isTableExist = await this.hasTable(table);
             if (isTableExist)
                 return Promise.resolve();
@@ -350,7 +387,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             table.indices.forEach((index) => {
                 // new index may be passed without name. In this case we generate index name manually.
                 if (!index.name)
-                    index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
+                    index.name = this.dataSource.namingStrategy.indexName(table, index.columnNames, index.where);
                 upQueries.push(this.createIndexSql(table, index));
                 downQueries.push(this.dropIndexSql(table, index));
             });
@@ -360,13 +397,13 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         for (const column of generatedColumns) {
             const insertQuery = this.insertTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             upQueries.push(insertQuery);
@@ -376,11 +413,15 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops the table.
+     * @param target
+     * @param ifExists
+     * @param dropForeignKeys
+     * @param dropIndices
      */
-    async dropTable(target, ifExist, dropForeignKeys = true, dropIndices = true) {
+    async dropTable(target, ifExists, dropForeignKeys = true, dropIndices = true) {
         // It needs because if table does not exist and dropForeignKeys or dropIndices is true, we don't need
         // to perform drop queries for foreign keys and indices.
-        if (ifExist) {
+        if (ifExists) {
             const isTableExist = await this.hasTable(target);
             if (!isTableExist)
                 return Promise.resolve();
@@ -406,12 +447,12 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         for (const column of generatedColumns) {
             const deleteQuery = this.deleteTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             const insertQuery = this.insertTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
@@ -422,6 +463,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
      */
     async createView(view) {
         const upQueries = [];
@@ -434,9 +476,16 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops the view.
-     */
-    async dropView(target) {
-        const viewName = target instanceof View ? target.name : target;
+     * @param target
+     * @param ifExists
+     */
+    async dropView(target, ifExists) {
+        const viewName = target instanceof View_1.View ? target.name : target;
+        if (ifExists) {
+            const foundViews = await this.loadViews([viewName]);
+            if (foundViews.length === 0)
+                return;
+        }
         const view = await this.getCachedView(viewName);
         const upQueries = [];
         const downQueries = [];
@@ -448,22 +497,26 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Renames the given table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
-        throw new TypeORMError(`Rename table queries are not supported by Spanner driver.`);
+        throw new error_1.TypeORMError(`Rename table queries are not supported by Spanner driver.`);
     }
     /**
      * Creates a new column from the column in the table.
+     * @param tableOrName
+     * @param column
      */
     async addColumn(tableOrName, column) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${this.driver.escape(column.name)}`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${this.driver.escape(column.name)}`));
         // create column index
         const columnIndex = clonedTable.indices.find((index) => index.columnNames.length === 1 &&
             index.columnNames[0] === column.name);
@@ -472,15 +525,15 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             downQueries.push(this.dropIndexSql(table, columnIndex));
         }
         else if (column.isUnique) {
-            const uniqueIndex = new TableIndex({
-                name: this.connection.namingStrategy.indexName(table, [
+            const uniqueIndex = new TableIndex_1.TableIndex({
+                name: this.dataSource.namingStrategy.indexName(table, [
                     column.name,
                 ]),
                 columnNames: [column.name],
                 isUnique: true,
             });
             clonedTable.indices.push(uniqueIndex);
-            clonedTable.uniques.push(new TableUnique({
+            clonedTable.uniques.push(new TableUnique_1.TableUnique({
                 name: uniqueIndex.name,
                 columnNames: uniqueIndex.columnNames,
             }));
@@ -490,13 +543,13 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         if (column.generatedType && column.asExpression) {
             const insertQuery = this.insertTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             upQueries.push(insertQuery);
@@ -508,6 +561,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     * @param tableOrName
+     * @param columns
      */
     async addColumns(tableOrName, columns) {
         for (const column of columns) {
@@ -516,18 +571,21 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newTableColumnOrName
      */
     async renameColumn(tableOrName, oldTableColumnOrName, newTableColumnOrName) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const oldColumn = oldTableColumnOrName instanceof TableColumn
+        const oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn
             ? oldTableColumnOrName
             : table.columns.find((c) => c.name === oldTableColumnOrName);
         if (!oldColumn)
-            throw new TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
+            throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
         let newColumn;
-        if (newTableColumnOrName instanceof TableColumn) {
+        if (newTableColumnOrName instanceof TableColumn_1.TableColumn) {
             newColumn = newTableColumnOrName;
         }
         else {
@@ -538,19 +596,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldTableColumnOrName, newColumn) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         let clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
-        const oldColumn = oldTableColumnOrName instanceof TableColumn
+        const oldColumn = oldTableColumnOrName instanceof TableColumn_1.TableColumn
             ? oldTableColumnOrName
             : table.columns.find((column) => column.name === oldTableColumnOrName);
         if (!oldColumn)
-            throw new TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
+            throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
         if (oldColumn.name !== newColumn.name ||
             oldColumn.type !== newColumn.type ||
             oldColumn.length !== newColumn.length ||
@@ -566,30 +627,30 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         else {
             if (newColumn.precision !== oldColumn.precision ||
                 newColumn.scale !== oldColumn.scale) {
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
             }
             if (oldColumn.isNullable !== newColumn.isNullable) {
                 if (newColumn.isNullable) {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
                 }
                 else {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
                 }
             }
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique === true) {
-                    const uniqueIndex = new TableIndex({
-                        name: this.connection.namingStrategy.indexName(table, [
+                    const uniqueIndex = new TableIndex_1.TableIndex({
+                        name: this.dataSource.namingStrategy.indexName(table, [
                             newColumn.name,
                         ]),
                         columnNames: [newColumn.name],
                         isUnique: true,
                     });
                     clonedTable.indices.push(uniqueIndex);
-                    clonedTable.uniques.push(new TableUnique({
+                    clonedTable.uniques.push(new TableUnique_1.TableUnique({
                         name: uniqueIndex.name,
                         columnNames: uniqueIndex.columnNames,
                     }));
@@ -615,6 +676,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -623,16 +686,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     * @param tableOrName
+     * @param columnOrName
+     * @param ifExists
      */
-    async dropColumn(tableOrName, columnOrName) {
-        const table = tableOrName instanceof Table
+    async dropColumn(tableOrName, columnOrName, ifExists) {
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const column = columnOrName instanceof TableColumn
+        const column = columnOrName instanceof TableColumn_1.TableColumn
             ? columnOrName
             : table.findColumnByName(columnOrName);
-        if (!column)
-            throw new TypeORMError(`Column "${columnOrName}" was not found in table "${table.name}"`);
+        if (!column) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Column "${columnOrName}" was not found in table "${table.name}"`);
+        }
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
@@ -653,17 +722,17 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             upQueries.push(this.dropCheckConstraintSql(table, columnCheck));
             downQueries.push(this.createCheckConstraintSql(table, columnCheck));
         }
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${this.driver.escape(column.name)}`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${this.driver.escape(column.name)}`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(column)}`));
         if (column.generatedType && column.asExpression) {
             const deleteQuery = this.deleteTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             const insertQuery = this.insertTypeormMetadataSql({
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
@@ -676,16 +745,21 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops the columns in the table.
+     * @param tableOrName
+     * @param columns
+     * @param ifExists
      */
-    async dropColumns(tableOrName, columns) {
+    async dropColumns(tableOrName, columns, ifExists) {
         for (const column of [...columns]) {
-            await this.dropColumn(tableOrName, column);
+            await this.dropColumn(tableOrName, column, ifExists);
         }
     }
     /**
      * Creates a new primary key.
      *
      * Not supported in Spanner.
+     * @param tableOrName
+     * @param columnNames
      * @see https://cloud.google.com/spanner/docs/schema-and-data-model#notes_about_key_columns
      */
     async createPrimaryKey(tableOrName, columnNames) {
@@ -693,54 +767,71 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         throw new Error("The keys of a table can't change; you can't add a key column to an existing table or remove a key column from an existing table.");
     }
     /**
-     * Creates a new primary key.
+     * Drops a primary key.
      *
      * Not supported in Spanner.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      * @see https://cloud.google.com/spanner/docs/schema-and-data-model#notes_about_key_columns
      */
-    async dropPrimaryKey(tableOrName) {
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
         throw new Error("The keys of a table can't change; you can't add a key column to an existing table or remove a key column from an existing table.");
     }
     /**
      * Creates new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
-        throw new TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
+        throw new error_1.TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
-        throw new TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
+        throw new error_1.TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
-        throw new TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
+        throw new error_1.TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
+     * @param ifExists
      */
-    async dropUniqueConstraints(tableOrName, uniqueConstraints) {
-        throw new TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
+    async dropUniqueConstraints(tableOrName, uniqueConstraints, ifExists) {
+        throw new error_1.TypeORMError(`Spanner does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates a new check constraint.
+     * @param tableOrName
+     * @param checkConstraint
      */
     async createCheckConstraint(tableOrName, checkConstraint) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new check constraint may be passed without name. In this case we generate unique name manually.
         if (!checkConstraint.name)
             checkConstraint.name =
-                this.connection.namingStrategy.checkConstraintName(table, checkConstraint.expression);
+                this.dataSource.namingStrategy.checkConstraintName(table, checkConstraint.expression);
         const up = this.createCheckConstraintSql(table, checkConstraint);
         const down = this.dropCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
@@ -748,6 +839,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         const promises = checkConstraints.map((checkConstraint) => this.createCheckConstraint(tableOrName, checkConstraint));
@@ -755,16 +848,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
-        const table = tableOrName instanceof Table
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const checkConstraint = checkOrName instanceof TableCheck
+        const checkConstraint = checkOrName instanceof TableCheck_1.TableCheck
             ? checkOrName
             : table.checks.find((c) => c.name === checkOrName);
-        if (!checkConstraint)
-            throw new TypeORMError(`Supplied check constraint was not found in table ${table.name}`);
+        if (!checkConstraint) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Supplied check constraint was not found in table ${table.name}`);
+        }
         const up = this.dropCheckConstraintSql(table, checkConstraint);
         const down = this.createCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
@@ -772,45 +871,60 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops check constraints.
+     * @param tableOrName
+     * @param checkConstraints
+     * @param ifExists
      */
-    async dropCheckConstraints(tableOrName, checkConstraints) {
-        const promises = checkConstraints.map((checkConstraint) => this.dropCheckConstraint(tableOrName, checkConstraint));
+    async dropCheckConstraints(tableOrName, checkConstraints, ifExists) {
+        const promises = checkConstraints.map((checkConstraint) => this.dropCheckConstraint(tableOrName, checkConstraint, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates new exclusion constraint.
+     * @param tableOrName
+     * @param exclusionConstraint
      */
     async createExclusionConstraint(tableOrName, exclusionConstraint) {
-        throw new TypeORMError(`Spanner does not support exclusion constraints.`);
+        throw new error_1.TypeORMError(`Spanner does not support exclusion constraints.`);
     }
     /**
      * Creates new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
-        throw new TypeORMError(`Spanner does not support exclusion constraints.`);
+        throw new error_1.TypeORMError(`Spanner does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
-        throw new TypeORMError(`Spanner does not support exclusion constraints.`);
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
+        throw new error_1.TypeORMError(`Spanner does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
-        throw new TypeORMError(`Spanner does not support exclusion constraints.`);
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
+        throw new error_1.TypeORMError(`Spanner does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new FK may be passed without name. In this case we generate FK name manually.
         if (!foreignKey.name)
-            foreignKey.name = this.connection.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
         const up = this.createForeignKeySql(table, foreignKey);
         const down = this.dropForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -818,6 +932,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         for (const foreignKey of foreignKeys) {
@@ -826,16 +942,25 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
-        const table = tableOrName instanceof Table
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const foreignKey = foreignKeyOrName instanceof TableForeignKey
+        const foreignKey = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
-            throw new TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
+        if (!foreignKey) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
+        }
+        if (!foreignKey.name) {
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+        }
         const up = this.dropForeignKeySql(table, foreignKey);
         const down = this.createForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -843,17 +968,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops a foreign keys from the table.
+     * @param tableOrName
+     * @param foreignKeys
+     * @param ifExists
      */
-    async dropForeignKeys(tableOrName, foreignKeys) {
+    async dropForeignKeys(tableOrName, foreignKeys, ifExists) {
         for (const foreignKey of [...foreignKeys]) {
-            await this.dropForeignKey(tableOrName, foreignKey);
+            await this.dropForeignKey(tableOrName, foreignKey, ifExists);
         }
     }
     /**
      * Creates a new index.
+     * @param tableOrName
+     * @param index
      */
     async createIndex(tableOrName, index) {
-        const table = tableOrName instanceof Table
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new index may be passed without name. In this case we generate index name manually.
@@ -866,6 +996,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         for (const index of indices) {
@@ -874,16 +1006,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops an index from the table.
+     * @param tableOrName
+     * @param indexOrName
+     * @param ifExists
      */
-    async dropIndex(tableOrName, indexOrName) {
-        const table = tableOrName instanceof Table
+    async dropIndex(tableOrName, indexOrName, ifExists) {
+        const table = tableOrName instanceof Table_1.Table
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const index = indexOrName instanceof TableIndex
+        const index = indexOrName instanceof TableIndex_1.TableIndex
             ? indexOrName
             : table.indices.find((i) => i.name === indexOrName);
-        if (!index)
-            throw new TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        if (!index) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        }
         // new index may be passed without name. In this case we generate index name manually.
         if (!index.name)
             index.name = this.generateIndexName(table, index);
@@ -894,17 +1032,26 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops an indices from the table.
+     * @param tableOrName
+     * @param indices
+     * @param ifExists
      */
-    async dropIndices(tableOrName, indices) {
+    async dropIndices(tableOrName, indices, ifExists) {
         for (const index of [...indices]) {
-            await this.dropIndex(tableOrName, index);
+            await this.dropIndex(tableOrName, index, ifExists);
         }
     }
     /**
      * Clears all table contents.
      * Spanner does not support TRUNCATE TABLE statement, so we use DELETE FROM.
+     * @param tableName
+     * @param options
+     * @param options.cascade
      */
-    async clearTable(tableName) {
+    async clearTable(tableName, options) {
+        if (options?.cascade) {
+            throw new error_1.TypeORMError(`Spanner does not support clearing table with cascade option`);
+        }
         await this.query(`DELETE FROM ${this.escapePath(tableName)} WHERE true`);
     }
     /**
@@ -1032,6 +1179,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
+     * @param tableNames
      */
     async loadTables(tableNames) {
         if (tableNames && tableNames.length === 0) {
@@ -1046,13 +1194,14 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             dbTables.push(...(await this.query(tablesSql)));
         }
         else {
+            const placeholders = tableNames
+                .map((_, i) => `@param${i}`)
+                .join(", ");
             const tablesSql = `SELECT \`TABLE_NAME\` ` +
                 `FROM \`INFORMATION_SCHEMA\`.\`TABLES\` ` +
                 `WHERE \`TABLE_CATALOG\` = '' AND \`TABLE_SCHEMA\` = '' AND \`TABLE_TYPE\` = 'BASE TABLE' ` +
-                `AND \`TABLE_NAME\` IN (${tableNames
-                    .map((tableName) => `'${tableName}'`)
-                    .join(", ")})`;
-            dbTables.push(...(await this.query(tablesSql)));
+                `AND \`TABLE_NAME\` IN (${placeholders})`;
+            dbTables.push(...(await this.query(tablesSql, tableNames)));
         }
         // if tables were not found in the db, no need to proceed
         if (!dbTables.length)
@@ -1097,7 +1246,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
         ]);
         // create tables for loaded tables
         return Promise.all(dbTables.map(async (dbTable) => {
-            const table = new Table();
+            const table = new Table_1.Table();
             table.name = this.driver.buildTableName(dbTable["TABLE_NAME"]);
             // create columns from the loaded columns
             table.columns = await Promise.all(dbColumns
@@ -1111,7 +1260,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                             dbColumn["COLUMN_NAME"] &&
                         dbIndex["IS_UNIQUE"] === true);
                 });
-                const tableMetadata = this.connection.entityMetadatas.find((metadata) => this.getTablePath(table) ===
+                const tableMetadata = this.dataSource.entityMetadatas.find((metadata) => this.getTablePath(table) ===
                     this.getTablePath(metadata));
                 const hasIgnoredIndex = columnUniqueIndices.length > 0 &&
                     tableMetadata &&
@@ -1128,7 +1277,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                         dbIndex["COLUMN_NAME"] !==
                             dbColumn["COLUMN_NAME"]);
                 });
-                const tableColumn = new TableColumn();
+                const tableColumn = new TableColumn_1.TableColumn();
                 tableColumn.name = dbColumn["COLUMN_NAME"];
                 let fullType = dbColumn["SPANNER_TYPE"].toLowerCase();
                 if (fullType.indexOf("array") !== -1) {
@@ -1151,7 +1300,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                     // We cannot relay on information_schema.columns.generation_expression, because it is formatted different.
                     const asExpressionQuery = this.selectTypeormMetadataSql({
                         table: dbTable["TABLE_NAME"],
-                        type: MetadataTableType.GENERATED_COLUMN,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                         name: tableColumn.name,
                     });
                     const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
@@ -1179,25 +1328,25 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             const tableForeignKeys = dbForeignKeys.filter((dbForeignKey) => {
                 return (dbForeignKey["TABLE_NAME"] === dbTable["TABLE_NAME"]);
             });
-            table.foreignKeys = OrmUtils.uniq(tableForeignKeys, (dbForeignKey) => dbForeignKey["CONSTRAINT_NAME"]).map((dbForeignKey) => {
+            table.foreignKeys = OrmUtils_1.OrmUtils.uniq(tableForeignKeys, (dbForeignKey) => dbForeignKey["CONSTRAINT_NAME"]).map((dbForeignKey) => {
                 const foreignKeys = tableForeignKeys.filter((dbFk) => dbFk["CONSTRAINT_NAME"] ===
                     dbForeignKey["CONSTRAINT_NAME"]);
-                return new TableForeignKey({
+                return new TableForeignKey_1.TableForeignKey({
                     name: dbForeignKey["CONSTRAINT_NAME"],
-                    columnNames: OrmUtils.uniq(foreignKeys.map((dbFk) => dbFk["COLUMN_NAME"])),
+                    columnNames: OrmUtils_1.OrmUtils.uniq(foreignKeys.map((dbFk) => dbFk["COLUMN_NAME"])),
                     referencedDatabase: dbForeignKey["REFERENCED_TABLE_SCHEMA"],
                     referencedTableName: dbForeignKey["REFERENCED_TABLE_NAME"],
-                    referencedColumnNames: OrmUtils.uniq(foreignKeys.map((dbFk) => dbFk["REFERENCED_COLUMN_NAME"])),
+                    referencedColumnNames: OrmUtils_1.OrmUtils.uniq(foreignKeys.map((dbFk) => dbFk["REFERENCED_COLUMN_NAME"])),
                     onDelete: dbForeignKey["DELETE_RULE"],
                     onUpdate: dbForeignKey["UPDATE_RULE"],
                 });
             });
             const tableIndices = dbIndices.filter((dbIndex) => dbIndex["TABLE_NAME"] === dbTable["TABLE_NAME"]);
-            table.indices = OrmUtils.uniq(tableIndices, (dbIndex) => dbIndex["INDEX_NAME"]).map((constraint) => {
+            table.indices = OrmUtils_1.OrmUtils.uniq(tableIndices, (dbIndex) => dbIndex["INDEX_NAME"]).map((constraint) => {
                 const indices = tableIndices.filter((index) => {
                     return index["INDEX_NAME"] === constraint["INDEX_NAME"];
                 });
-                return new TableIndex({
+                return new TableIndex_1.TableIndex({
                     table: table,
                     name: constraint["INDEX_NAME"],
                     columnNames: indices.map((i) => i["COLUMN_NAME"]),
@@ -1206,10 +1355,10 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                 });
             });
             const tableChecks = dbChecks.filter((dbCheck) => dbCheck["TABLE_NAME"] === dbTable["TABLE_NAME"]);
-            table.checks = OrmUtils.uniq(tableChecks, (dbIndex) => dbIndex["CONSTRAINT_NAME"]).map((constraint) => {
+            table.checks = OrmUtils_1.OrmUtils.uniq(tableChecks, (dbIndex) => dbIndex["CONSTRAINT_NAME"]).map((constraint) => {
                 const checks = tableChecks.filter((dbC) => dbC["CONSTRAINT_NAME"] ===
                     constraint["CONSTRAINT_NAME"]);
-                return new TableCheck({
+                return new TableCheck_1.TableCheck({
                     name: constraint["CONSTRAINT_NAME"],
                     columnNames: checks.map((c) => c["COLUMN_NAME"]),
                     expression: constraint["CHECK_CLAUSE"],
@@ -1220,6 +1369,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds create table sql.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -1241,8 +1392,8 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                     unique.columnNames.indexOf(column.name) !== -1);
             });
             if (!isUniqueIndexExist && !isUniqueConstraintExist)
-                table.indices.push(new TableIndex({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                table.indices.push(new TableIndex_1.TableIndex({
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                     isUnique: true,
                 }));
@@ -1252,7 +1403,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             table.uniques.forEach((unique) => {
                 const uniqueExist = table.indices.some((index) => index.name === unique.name);
                 if (!uniqueExist) {
-                    table.indices.push(new TableIndex({
+                    table.indices.push(new TableIndex_1.TableIndex({
                         name: unique.name,
                         columnNames: unique.columnNames,
                         isUnique: true,
@@ -1265,7 +1416,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                 .map((check) => {
                 const checkName = check.name
                     ? check.name
-                    : this.connection.namingStrategy.checkConstraintName(table, check.expression);
+                    : this.dataSource.namingStrategy.checkConstraintName(table, check.expression);
                 return `CONSTRAINT \`${checkName}\` CHECK (${check.expression})`;
             })
                 .join(", ");
@@ -1278,7 +1429,7 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
+                    fk.name = this.dataSource.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
@@ -1295,30 +1446,31 @@ export class SpannerQueryRunner extends BaseQueryRunner {
                 .join(", ");
             sql += ` PRIMARY KEY (${columnNames})`;
         }
-        return new Query(sql);
+        return new Query_1.Query(sql);
     }
     /**
      * Builds drop table sql.
+     * @param tableOrPath
      */
     dropTableSql(tableOrPath) {
-        return new Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
+        return new Query_1.Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
     }
     createViewSql(view) {
         const materializedClause = view.materialized ? "MATERIALIZED " : "";
         const viewName = this.escapePath(view);
         const expression = typeof view.expression === "string"
             ? view.expression
-            : view.expression(this.connection).getQuery();
-        return new Query(`CREATE ${materializedClause}VIEW ${viewName} SQL SECURITY INVOKER AS ${expression}`);
+            : view.expression(this.dataSource).getQuery();
+        return new Query_1.Query(`CREATE ${materializedClause}VIEW ${viewName} SQL SECURITY INVOKER AS ${expression}`);
     }
     async insertViewDefinitionSql(view) {
         const { schema, tableName: name } = this.driver.parseTableName(view);
         const type = view.materialized
-            ? MetadataTableType.MATERIALIZED_VIEW
-            : MetadataTableType.VIEW;
+            ? MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW
+            : MetadataTableType_1.MetadataTableType.VIEW;
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         return this.insertTypeormMetadataSql({
             type,
             schema,
@@ -1328,23 +1480,27 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param view
      */
     dropViewSql(view) {
         const materializedClause = view.materialized ? "MATERIALIZED " : "";
-        return new Query(`DROP ${materializedClause}VIEW ${this.escapePath(view)}`);
+        return new Query_1.Query(`DROP ${materializedClause}VIEW ${this.escapePath(view)}`);
     }
     /**
      * Builds remove view sql.
+     * @param view
      */
     async deleteViewDefinitionSql(view) {
         const { schema, tableName: name } = this.driver.parseTableName(view);
         const type = view.materialized
-            ? MetadataTableType.MATERIALIZED_VIEW
-            : MetadataTableType.VIEW;
+            ? MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW
+            : MetadataTableType_1.MetadataTableType.VIEW;
         return this.deleteTypeormMetadataSql({ type, schema, name });
     }
     /**
      * Builds create index sql.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
@@ -1355,30 +1511,38 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             indexType += "UNIQUE ";
         if (index.isNullFiltered)
             indexType += "NULL_FILTERED ";
-        return new Query(`CREATE ${indexType}INDEX \`${index.name}\` ON ${this.escapePath(table)} (${columns})`);
+        return new Query_1.Query(`CREATE ${indexType}INDEX \`${index.name}\` ON ${this.escapePath(table)} (${columns})`);
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
      */
     dropIndexSql(table, indexOrName) {
-        const indexName = indexOrName instanceof TableIndex ? indexOrName.name : indexOrName;
-        return new Query(`DROP INDEX \`${indexName}\``);
+        const indexName = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName.name : indexOrName;
+        return new Query_1.Query(`DROP INDEX \`${indexName}\``);
     }
     /**
      * Builds create check constraint sql.
+     * @param table
+     * @param checkConstraint
      */
     createCheckConstraintSql(table, checkConstraint) {
-        return new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${checkConstraint.name}\` CHECK (${checkConstraint.expression})`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${checkConstraint.name}\` CHECK (${checkConstraint.expression})`);
     }
     /**
      * Builds drop check constraint sql.
+     * @param table
+     * @param checkOrName
      */
     dropCheckConstraintSql(table, checkOrName) {
-        const checkName = checkOrName instanceof TableCheck ? checkOrName.name : checkOrName;
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT \`${checkName}\``);
+        const checkName = checkOrName instanceof TableCheck_1.TableCheck ? checkOrName.name : checkOrName;
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT \`${checkName}\``);
     }
     /**
      * Builds create foreign key sql.
+     * @param table
+     * @param foreignKey
      */
     createForeignKeySql(table, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -1389,19 +1553,22 @@ export class SpannerQueryRunner extends BaseQueryRunner {
             .join(",");
         const sql = `ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${foreignKey.name}\` FOREIGN KEY (${columnNames}) ` +
             `REFERENCES ${this.escapePath(this.getTablePath(foreignKey))} (${referencedColumnNames})`;
-        return new Query(sql);
+        return new Query_1.Query(sql);
     }
     /**
      * Builds drop foreign key sql.
+     * @param table
+     * @param foreignKeyOrName
      */
     dropForeignKeySql(table, foreignKeyOrName) {
-        const foreignKeyName = foreignKeyOrName instanceof TableForeignKey
+        const foreignKeyName = foreignKeyOrName instanceof TableForeignKey_1.TableForeignKey
             ? foreignKeyOrName.name
             : foreignKeyOrName;
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT \`${foreignKeyName}\``);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT \`${foreignKeyName}\``);
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { tableName } = this.driver.parseTableName(target);
@@ -1409,9 +1576,10 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds a part of query to create/change a column.
+     * @param column
      */
     buildCreateColumnSql(column) {
-        let c = `${this.driver.escape(column.name)} ${this.connection.driver.createFullType(column)}`;
+        let c = `${this.driver.escape(column.name)} ${this.dataSource.driver.createFullType(column)}`;
         // Spanner supports only STORED generated column type
         if (column.generatedType === "STORED" && column.asExpression) {
             c += ` AS (${column.asExpression}) STORED`;
@@ -1424,11 +1592,13 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Executes sql used special for schema build.
+     * @param upQueries
+     * @param downQueries
      */
     async executeQueries(upQueries, downQueries) {
-        if (upQueries instanceof Query)
+        if (upQueries instanceof Query_1.Query)
             upQueries = [upQueries];
-        if (downQueries instanceof Query)
+        if (downQueries instanceof Query_1.Query)
             downQueries = [downQueries];
         this.sqlInMemory.upQueries.push(...upQueries);
         this.sqlInMemory.downQueries.push(...downQueries);
@@ -1451,10 +1621,12 @@ export class SpannerQueryRunner extends BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param comment
      */
     changeTableComment(tableOrName, comment) {
-        throw new TypeORMError(`spanner driver does not support change table comment.`);
+        throw new error_1.TypeORMError(`spanner driver does not support change table comment.`);
     }
 }
-
-//# sourceMappingURL=SpannerQueryRunner.js.map
+exports.SpannerQueryRunner = SpannerQueryRunner;
+//# sourceMappingURL=SpannerQueryRunner.js.map