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

package/driver/sap/SapQueryRunner.js

@@ -33,7 +33,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         super();
         this.lock = new QueryLock_1.QueryLock();
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.broadcaster = new Broadcaster_1.Broadcaster(this);
         this.mode = mode;
     }
@@ -69,6 +69,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         if (this.isReleased)
@@ -119,14 +120,16 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         await this.broadcaster.broadcast("AfterTransactionRollback");
     }
     /**
-     * @description Switches on/off AUTOCOMMIT mode
-     * @link https://help.sap.com/docs/HANA_SERVICE_CF/7c78579ce9b14a669c1f3295b0d8ca16/d538d11053bd4f3f847ec5ce817a3d4c.html?locale=en-US
+     * Switches AUTOCOMMIT mode on/off
+     * @see https://help.sap.com/docs/HANA_SERVICE_CF/7c78579ce9b14a669c1f3295b0d8ca16/d538d11053bd4f3f847ec5ce817a3d4c.html?locale=en-US
+     * @param options
+     * @param options.status
      */
     async setAutoCommit(options) {
         const connection = await this.connect();
         connection.setAutoCommit(options.status === "on");
         const query = `SET TRANSACTION AUTOCOMMIT DDL ${options.status.toUpperCase()}`;
-        this.driver.connection.logger.logQuery(query, [], this);
+        this.driver.dataSource.logger.logQuery(query, [], this);
         try {
             await (0, node_util_1.promisify)(connection.exec).call(connection, query);
         }
@@ -136,6 +139,9 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Executes a given SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
@@ -144,7 +150,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const databaseConnection = await this.connect();
         let statement;
         const result = new QueryResult_1.QueryResult();
-        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_1.BroadcasterResult();
         try {
@@ -163,13 +169,13 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 throw new error_1.QueryFailedError(query, parameters, err);
             }
             // log slow queries if maxQueryExecution time is set
-            const maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
+            const maxQueryExecutionTime = this.driver.dataSource.options.maxQueryExecutionTime;
             const queryEndTime = Date.now();
             const queryExecutionTime = queryEndTime - queryStartTime;
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime) {
-                this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
             }
             if (typeof raw === "number") {
                 result.affected = raw;
@@ -180,7 +186,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             result.raw = raw;
             if (isInsertQuery) {
                 const lastIdQuery = `SELECT CURRENT_IDENTITY_VALUE() FROM "SYS"."DUMMY"`;
-                this.driver.connection.logger.logQuery(lastIdQuery, [], this);
+                this.driver.dataSource.logger.logQuery(lastIdQuery, [], this);
                 try {
                     const identityValueResult = await (0, node_util_1.promisify)(databaseConnection.exec).call(databaseConnection, lastIdQuery);
                     result.raw =
@@ -193,7 +199,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
         }
         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 err;
         }
@@ -215,6 +221,10 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     async stream(query, parameters, onEnd, onError) {
         if (this.isReleased)
@@ -237,7 +247,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         };
         try {
             const databaseConnection = await this.connect();
-            this.driver.connection.logger.logQuery(query, parameters, this);
+            this.driver.dataSource.logger.logQuery(query, parameters, this);
             statement = await (0, node_util_1.promisify)(databaseConnection.prepare).call(databaseConnection, query);
             resultSet = await (0, node_util_1.promisify)(statement.executeQuery).call(statement, parameters);
             const stream = this.driver.streamClient.createObjectStream(resultSet);
@@ -245,14 +255,14 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 stream.on("end", onEnd);
             }
             stream.on("error", (error) => {
-                this.driver.connection.logger.logQueryError(error, query, parameters, this);
+                this.driver.dataSource.logger.logQueryError(error, query, parameters, this);
                 onError?.(error);
             });
             stream.on("close", cleanup);
             return stream;
         }
         catch (error) {
-            this.driver.connection.logger.logQueryError(error, query, parameters, this);
+            this.driver.dataSource.logger.logQueryError(error, query, parameters, this);
             await cleanup();
             throw new error_1.QueryFailedError(query, parameters, error);
         }
@@ -267,6 +277,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Returns all available schema names including system schemas.
      * If database parameter specified, returns schemas of that database.
+     * @param database
      */
     async getSchemas(database) {
         const query = database
@@ -277,6 +288,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if database with the given name exist.
+     * @param database
      */
     async hasDatabase(database) {
         const databases = await this.getDatabases();
@@ -298,6 +310,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if schema with the given name exist.
+     * @param schema
      */
     async hasSchema(schema) {
         const schemas = await this.getSchemas();
@@ -312,81 +325,106 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if table with the given name exist in the database.
+     * @param tableOrName
      */
     async hasTable(tableOrName) {
         const parsedTableName = this.driver.parseTableName(tableOrName);
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
         }
-        const sql = `SELECT COUNT(*) as "hasTable" FROM "SYS"."TABLES" WHERE "SCHEMA_NAME" = '${parsedTableName.schema}' AND "TABLE_NAME" = '${parsedTableName.tableName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT COUNT(*) as "hasTable" FROM "SYS"."TABLES" WHERE "SCHEMA_NAME" = ? AND "TABLE_NAME" = ?`;
+        const result = await this.query(sql, [
+            parsedTableName.schema,
+            parsedTableName.tableName,
+        ]);
         return result[0].hasTable > 0;
     }
     /**
      * Checks if column with the given name exist in the given table.
+     * @param tableOrName
+     * @param columnName
      */
     async hasColumn(tableOrName, columnName) {
         const parsedTableName = this.driver.parseTableName(tableOrName);
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
         }
-        const sql = `SELECT COUNT(*) as "hasColumn" FROM "SYS"."TABLE_COLUMNS" WHERE "SCHEMA_NAME" = '${parsedTableName.schema}' AND "TABLE_NAME" = '${parsedTableName.tableName}' AND "COLUMN_NAME" = '${columnName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT COUNT(*) as "hasColumn" FROM "SYS"."TABLE_COLUMNS" WHERE "SCHEMA_NAME" = ? AND "TABLE_NAME" = ? AND "COLUMN_NAME" = ?`;
+        const result = await this.query(sql, [
+            parsedTableName.schema,
+            parsedTableName.tableName,
+            columnName,
+        ]);
         return result[0].hasColumn > 0;
     }
     /**
      * Creates a new database.
+     * @param database
+     * @param ifNotExists
      */
-    async createDatabase(database, ifNotExist) {
+    async createDatabase(database, ifNotExists) {
         return Promise.resolve();
     }
     /**
      * Drops database.
+     * @param database
+     * @param ifExists
      */
-    async dropDatabase(database, ifExist) {
+    async dropDatabase(database, ifExists) {
         return Promise.resolve();
     }
     /**
      * Creates a new table schema.
+     * @param schemaPath
+     * @param ifNotExists
      */
-    async createSchema(schemaPath, ifNotExist) {
+    async createSchema(schemaPath, ifNotExists) {
         const schema = schemaPath.indexOf(".") === -1
             ? schemaPath
             : schemaPath.split(".")[1];
+        const escapedSchema = this.driver.escape(schema);
         let exist = false;
-        if (ifNotExist) {
-            const result = await this.query(`SELECT * FROM "SYS"."SCHEMAS" WHERE "SCHEMA_NAME" = '${schema}'`);
+        if (ifNotExists) {
+            const result = await this.query(`SELECT * FROM "SYS"."SCHEMAS" WHERE "SCHEMA_NAME" = ?`, [schema]);
             exist = !!result.length;
         }
-        if (!ifNotExist || (ifNotExist && !exist)) {
-            const up = `CREATE SCHEMA "${schema}"`;
-            const down = `DROP SCHEMA "${schema}" CASCADE`;
+        if (!ifNotExists || (ifNotExists && !exist)) {
+            const up = `CREATE SCHEMA ${escapedSchema}`;
+            const down = `DROP SCHEMA ${escapedSchema} CASCADE`;
             await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
         }
     }
     /**
      * Drops table schema
+     * @param schemaPath
+     * @param ifExists
+     * @param isCascade
      */
-    async dropSchema(schemaPath, ifExist, isCascade) {
+    async dropSchema(schemaPath, ifExists, isCascade) {
         const schema = schemaPath.indexOf(".") === -1
             ? schemaPath
-            : schemaPath.split(".")[0];
+            : schemaPath.split(".")[1];
+        const escapedSchema = this.driver.escape(schema);
         let exist = false;
-        if (ifExist) {
-            const result = await this.query(`SELECT * FROM "SYS"."SCHEMAS" WHERE "SCHEMA_NAME" = '${schema}'`);
+        if (ifExists) {
+            const result = await this.query(`SELECT * FROM "SYS"."SCHEMAS" WHERE "SCHEMA_NAME" = ?`, [schema]);
             exist = !!result.length;
         }
-        if (!ifExist || (ifExist && exist)) {
-            const up = `DROP SCHEMA "${schema}" ${isCascade ? "CASCADE" : ""}`;
-            const down = `CREATE SCHEMA "${schema}"`;
+        if (!ifExists || (ifExists && exist)) {
+            const up = `DROP SCHEMA ${escapedSchema} ${isCascade ? "CASCADE" : ""}`;
+            const down = `CREATE SCHEMA ${escapedSchema}`;
             await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
         }
     }
     /**
      * 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();
@@ -403,7 +441,7 @@ class SapQueryRunner extends BaseQueryRunner_1.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));
             });
@@ -412,9 +450,13 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the table.
+     * @param tableOrName
+     * @param ifExists
+     * @param dropForeignKeys
+     * @param dropIndices
      */
-    async dropTable(tableOrName, ifExist, dropForeignKeys = true, dropIndices = true) {
-        if (ifExist) {
+    async dropTable(tableOrName, ifExists, dropForeignKeys = true, dropIndices = true) {
+        if (ifExists) {
             const isTableExist = await this.hasTable(tableOrName);
             if (!isTableExist)
                 return Promise.resolve();
@@ -444,6 +486,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -458,9 +502,16 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the view.
+     * @param target
+     * @param ifExists
      */
-    async dropView(target) {
+    async dropView(target, ifExists) {
         const viewName = InstanceChecker_1.InstanceChecker.isView(target) ? 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 = [];
@@ -472,6 +523,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames a table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
         const upQueries = [];
@@ -535,8 +588,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const columnNamesString = columnNames
                 .map((columnName) => `"${columnName}"`)
                 .join(", ");
-            const oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
-            const newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
+            const oldPkName = this.dataSource.namingStrategy.primaryKeyName(oldTable, columnNames);
+            const newPkName = this.dataSource.namingStrategy.primaryKeyName(newTable, columnNames);
             // drop old PK
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} DROP CONSTRAINT "${oldPkName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} ADD CONSTRAINT "${oldPkName}" PRIMARY KEY (${columnNamesString})`));
@@ -547,7 +600,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // recreate foreign keys with new constraint names
         newTable.foreignKeys.forEach((foreignKey) => {
             // replace constraint name
-            foreignKey.name = this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // create new FK's
             upQueries.push(this.createForeignKeySql(newTable, foreignKey));
             downQueries.push(this.dropForeignKeySql(newTable, foreignKey));
@@ -561,7 +614,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // rename index constraints
         newTable.indices.forEach((index) => {
             // build new constraint name
-            const newIndexName = this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
+            const newIndexName = this.dataSource.namingStrategy.indexName(newTable, index.columnNames, index.where);
             // drop old index
             upQueries.push(this.dropIndexSql(newTable, index));
             downQueries.push(this.createIndexSql(newTable, index));
@@ -578,6 +631,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new column from the column in the table.
+     * @param tableOrName
+     * @param column
      */
     async addColumn(tableOrName, column) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -634,7 +689,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         downQueries.push(this.createForeignKeySql(mapping.tableName, foreignKey));
                     });
                 }
-                const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                 const columnNames = primaryColumns
                     .map((column) => `"${column.name}"`)
                     .join(", ");
@@ -648,7 +703,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 });
             }
             primaryColumns.push(column);
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+            const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -664,7 +719,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else if (column.isUnique) {
             const uniqueIndex = new TableIndex_1.TableIndex({
-                name: this.connection.namingStrategy.indexName(table, [
+                name: this.dataSource.namingStrategy.indexName(table, [
                     column.name,
                 ]),
                 columnNames: [column.name],
@@ -684,6 +739,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     * @param tableOrName
+     * @param columns
      */
     async addColumns(tableOrName, columns) {
         for (const column of columns) {
@@ -692,6 +749,9 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newTableColumnOrName
      */
     async renameColumn(tableOrName, oldTableColumnOrName, newTableColumnOrName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -702,7 +762,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : table.columns.find((c) => c.name === oldTableColumnOrName);
         if (!oldColumn)
             throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
-        let newColumn = undefined;
+        let newColumn;
         if (InstanceChecker_1.InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName;
         }
@@ -714,6 +774,9 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldTableColumnOrName, newColumn) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -747,7 +810,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const primaryColumns = clonedTable.primaryColumns;
                     // build old primary constraint name
                     const columnNames = primaryColumns.map((column) => column.name);
-                    const oldPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const oldPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     // replace old column name with new column name
                     columnNames.splice(columnNames.indexOf(oldColumn.name), 1);
                     columnNames.push(newColumn.name);
@@ -758,7 +821,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${oldPkName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${oldPkName}" PRIMARY KEY (${columnNamesString})`));
                     // build new primary constraint name
-                    const newPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const newPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     // create new PK
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${newPkName}" PRIMARY KEY (${columnNamesString})`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${newPkName}"`));
@@ -768,7 +831,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     // build new constraint name
                     index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
                     index.columnNames.push(newColumn.name);
-                    const newIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const newIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // drop old index
                     upQueries.push(this.dropIndexSql(clonedTable, index));
                     downQueries.push(this.createIndexSql(clonedTable, index));
@@ -785,7 +848,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     // build new constraint name
                     foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
                     foreignKey.columnNames.push(newColumn.name);
-                    const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
                     upQueries.push(this.dropForeignKeySql(clonedTable, foreignKey));
                     downQueries.push(this.createForeignKeySql(clonedTable, foreignKey));
                     // replace constraint name
@@ -799,7 +862,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     // build new constraint name
                     check.columnNames.splice(check.columnNames.indexOf(oldColumn.name), 1);
                     check.columnNames.push(newColumn.name);
-                    const newCheckName = this.connection.namingStrategy.checkConstraintName(clonedTable, check.expression);
+                    const newCheckName = this.dataSource.namingStrategy.checkConstraintName(clonedTable, check.expression);
                     upQueries.push(this.dropCheckConstraintSql(clonedTable, check));
                     downQueries.push(this.createCheckConstraintSql(clonedTable, check));
                     // replace constraint name
@@ -826,7 +889,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const primaryColumns = clonedTable.primaryColumns;
                 // if primary column state changed, we must always drop existed constraint.
                 if (primaryColumns.length > 0) {
-                    const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -838,7 +901,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     // update column in table
                     const column = clonedTable.columns.find((column) => column.name === newColumn.name);
                     column.isPrimary = true;
-                    const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -853,7 +916,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     column.isPrimary = false;
                     // if we have another primary keys, we must recreate constraint.
                     if (primaryColumns.length > 0) {
-                        const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                         const columnNames = primaryColumns
                             .map((column) => `"${column.name}"`)
                             .join(", ");
@@ -865,7 +928,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique === true) {
                     const uniqueIndex = new TableIndex_1.TableIndex({
-                        name: this.connection.namingStrategy.indexName(table, [
+                        name: this.dataSource.namingStrategy.indexName(table, [
                             newColumn.name,
                         ]),
                         columnNames: [newColumn.name],
@@ -898,6 +961,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -906,8 +971,11 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     * @param tableOrName
+     * @param columnOrName
+     * @param ifExists
      */
-    async dropColumn(tableOrName, columnOrName) {
+    async dropColumn(tableOrName, columnOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
@@ -918,8 +986,11 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const column = InstanceChecker_1.InstanceChecker.isTableColumn(columnOrName)
             ? columnOrName
             : table.findColumnByName(columnOrName);
-        if (!column)
+        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 = [];
@@ -962,7 +1033,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     downQueries.push(this.createForeignKeySql(mapping.tableName, foreignKey));
                 });
             }
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+            const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
             const columnNames = clonedTable.primaryColumns
                 .map((primaryColumn) => `"${primaryColumn.name}"`)
                 .join(", ");
@@ -973,7 +1044,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             tableColumn.isPrimary = false;
             // if primary key have multiple columns, we must recreate it without dropped column
             if (clonedTable.primaryColumns.length > 0) {
-                const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
                 const columnNames = clonedTable.primaryColumns
                     .map((primaryColumn) => `"${primaryColumn.name}"`)
                     .join(", ");
@@ -997,7 +1068,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else if (column.isUnique) {
             // we splice constraints both from table uniques and indices.
-            const uniqueName = this.connection.namingStrategy.uniqueConstraintName(table, [
+            const uniqueName = this.dataSource.namingStrategy.uniqueConstraintName(table, [
                 column.name,
             ]);
             const foundUnique = clonedTable.uniques.find((unique) => unique.name === uniqueName);
@@ -1006,7 +1077,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 upQueries.push(this.dropIndexSql(table, uniqueName));
                 downQueries.push(new Query_1.Query(`CREATE UNIQUE INDEX "${uniqueName}" ON ${this.escapePath(table)} ("${column.name}")`));
             }
-            const indexName = this.connection.namingStrategy.indexName(table, [
+            const indexName = this.dataSource.namingStrategy.indexName(table, [
                 column.name,
             ]);
             const foundIndex = clonedTable.indices.find((index) => index.name === indexName);
@@ -1033,14 +1104,19 @@ class SapQueryRunner extends BaseQueryRunner_1.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.
+     * @param tableOrName
+     * @param columnNames
      */
     async createPrimaryKey(tableOrName, columnNames) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1059,6 +1135,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1112,7 +1190,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // if table already have primary columns, we must drop them.
         const primaryColumns = clonedTable.primaryColumns;
         if (primaryColumns.length > 0) {
-            const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+            const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNamesString = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -1122,8 +1200,10 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // update columns in table.
         clonedTable.columns
             .filter((column) => columnNames.indexOf(column.name) !== -1)
-            .forEach((column) => (column.isPrimary = true));
-        const pkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+            .forEach((column) => {
+            column.isPrimary = true;
+        });
+        const pkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1140,11 +1220,16 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a primary key.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      */
-    async dropPrimaryKey(tableOrName) {
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
+        if (ifExists && table.primaryColumns.length === 0)
+            return;
         const parsedTableName = this.driver.parseTableName(table);
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
@@ -1203,30 +1288,42 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
         throw new error_1.TypeORMError(`SAP HANA does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates a new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         throw new error_1.TypeORMError(`SAP HANA does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
         throw new error_1.TypeORMError(`SAP HANA does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
+     * @param ifExists
      */
-    async dropUniqueConstraints(tableOrName, uniqueConstraints) {
+    async dropUniqueConstraints(tableOrName, uniqueConstraints, ifExists) {
         throw new error_1.TypeORMError(`SAP HANA does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates a new check constraint.
+     * @param tableOrName
+     * @param checkConstraint
      */
     async createCheckConstraint(tableOrName, checkConstraint) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1235,7 +1332,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique 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);
@@ -1243,6 +1340,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         const promises = checkConstraints.map((checkConstraint) => this.createCheckConstraint(tableOrName, checkConstraint));
@@ -1250,16 +1349,22 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const checkConstraint = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName
             : table.checks.find((c) => c.name === checkOrName);
-        if (!checkConstraint)
+        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);
@@ -1267,37 +1372,52 @@ class SapQueryRunner extends BaseQueryRunner_1.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 a new exclusion constraint.
+     * @param tableOrName
+     * @param exclusionConstraint
      */
     async createExclusionConstraint(tableOrName, exclusionConstraint) {
         throw new error_1.TypeORMError(`SAP HANA does not support exclusion constraints.`);
     }
     /**
      * Creates a new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
         throw new error_1.TypeORMError(`SAP HANA does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
         throw new error_1.TypeORMError(`SAP HANA does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
         throw new error_1.TypeORMError(`SAP HANA does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1305,7 +1425,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : 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);
@@ -1313,6 +1433,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         const promises = foreignKeys.map((foreignKey) => this.createForeignKey(tableOrName, foreignKey));
@@ -1320,16 +1442,25 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
+        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);
@@ -1337,13 +1468,18 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign keys from the table.
+     * @param tableOrName
+     * @param foreignKeys
+     * @param ifExists
      */
-    async dropForeignKeys(tableOrName, foreignKeys) {
-        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey));
+    async dropForeignKeys(tableOrName, foreignKeys, ifExists) {
+        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates a new index.
+     * @param tableOrName
+     * @param index
      */
     async createIndex(tableOrName, index) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1359,6 +1495,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         const promises = indices.map((index) => this.createIndex(tableOrName, index));
@@ -1366,16 +1504,22 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an index.
+     * @param tableOrName
+     * @param indexOrName
+     * @param ifExists
      */
-    async dropIndex(tableOrName, indexOrName) {
+    async dropIndex(tableOrName, indexOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const index = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName
             : table.indices.find((i) => i.name === indexOrName);
-        if (!index)
+        if (!index) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        }
         // old index may be passed without name. In this case we generate index name manually.
         if (!index.name)
             index.name = this.generateIndexName(table, index);
@@ -1386,16 +1530,25 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an indices from the table.
+     * @param tableOrName
+     * @param indices
+     * @param ifExists
      */
-    async dropIndices(tableOrName, indices) {
-        const promises = indices.map((index) => this.dropIndex(tableOrName, index));
+    async dropIndices(tableOrName, indices, ifExists) {
+        const promises = indices.map((index) => this.dropIndex(tableOrName, index, ifExists));
         await Promise.all(promises);
     }
     /**
      * Clears all table contents.
      * Note: this operation uses SQL's TRUNCATE query which cannot be reverted in transactions.
+     * @param tablePath
+     * @param options
+     * @param options.cascade
      */
-    async clearTable(tablePath) {
+    async clearTable(tablePath, options) {
+        if (options?.cascade) {
+            throw new error_1.TypeORMError(`SAP HANA does not support clearing table with cascade option`);
+        }
         await this.query(`TRUNCATE TABLE ${this.escapePath(tablePath)}`);
     }
     /**
@@ -1403,30 +1556,27 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      */
     async clearDatabase() {
         const schemas = [];
-        this.connection.entityMetadatas
+        this.dataSource.entityMetadatas
             .filter((metadata) => metadata.schema)
             .forEach((metadata) => {
             const isSchemaExist = !!schemas.find((schema) => schema === metadata.schema);
             if (!isSchemaExist)
                 schemas.push(metadata.schema);
         });
-        schemas.push(this.driver.options.schema || "current_schema");
-        const schemaNamesString = schemas
-            .map((name) => {
-            return name === "current_schema" ? name : "'" + name + "'";
-        })
-            .join(", ");
+        if (this.driver.options.schema) {
+            schemas.push(this.driver.options.schema);
+        }
+        else {
+            const [{ currentSchema }] = await this.query(`SELECT CURRENT_SCHEMA AS "currentSchema" FROM "SYS"."DUMMY"`);
+            schemas.push(currentSchema);
+        }
+        const schemaNamesPlaceholders = schemas.map(() => "?").join(", ");
         const isAnotherTransactionActive = this.isTransactionActive;
         if (!isAnotherTransactionActive)
             await this.startTransaction();
         try {
-            // const selectViewDropsQuery = `SELECT 'DROP VIEW IF EXISTS "' || schemaname || '"."' || viewname || '" CASCADE;' as "query" ` +
-            //     `FROM "pg_views" WHERE "schemaname" IN (${schemaNamesString}) AND "viewname" NOT IN ('geography_columns', 'geometry_columns', 'raster_columns', 'raster_overviews')`;
-            // const dropViewQueries: ObjectLiteral[] = await this.query(selectViewDropsQuery);
-            // await Promise.all(dropViewQueries.map(q => this.query(q["query"])));
-            // ignore spatial_ref_sys; it's a special table supporting PostGIS
-            const selectTableDropsQuery = `SELECT 'DROP TABLE "' || schema_name || '"."' || table_name || '" CASCADE;' as "query" FROM "SYS"."TABLES" WHERE "SCHEMA_NAME" IN (${schemaNamesString}) AND "TABLE_NAME" NOT IN ('SYS_AFL_GENERATOR_PARAMETERS') AND "IS_COLUMN_TABLE" = 'TRUE'`;
-            const dropTableQueries = await this.query(selectTableDropsQuery);
+            const selectTableDropsQuery = `SELECT 'DROP TABLE "' || schema_name || '"."' || table_name || '" CASCADE;' as "query" FROM "SYS"."TABLES" WHERE "SCHEMA_NAME" IN (${schemaNamesPlaceholders}) AND "TABLE_NAME" NOT IN ('SYS_AFL_GENERATOR_PARAMETERS') AND "IS_COLUMN_TABLE" = 'TRUE'`;
+            const dropTableQueries = await this.query(selectTableDropsQuery, schemas);
             await Promise.all(dropTableQueries.map((q) => this.query(q["query"])));
             if (!isAnotherTransactionActive)
                 await this.commitTransaction();
@@ -1480,6 +1630,7 @@ class SapQueryRunner extends BaseQueryRunner_1.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) {
@@ -1489,7 +1640,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const dbTables = [];
         if (!tableNames) {
-            const tablesSql = `SELECT "SCHEMA_NAME", "TABLE_NAME" FROM "SYS"."TABLES"`;
+            const tablesSql = `SELECT "SCHEMA_NAME", "TABLE_NAME", "COMMENTS" FROM "SYS"."TABLES"`;
             dbTables.push(...(await this.query(tablesSql)));
         }
         else {
@@ -1503,7 +1654,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 return `("SCHEMA_NAME" = '${schema}' AND "TABLE_NAME" = '${name}')`;
             })
                 .join(" OR ");
-            const tablesSql = `SELECT "SCHEMA_NAME", "TABLE_NAME" FROM "SYS"."TABLES" WHERE ` +
+            const tablesSql = `SELECT "SCHEMA_NAME", "TABLE_NAME", "COMMENTS" FROM "SYS"."TABLES" WHERE ` +
                 tablesCondition;
             dbTables.push(...(await this.query(tablesSql)));
         }
@@ -1559,6 +1710,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const schema = getSchemaFromKey(dbTable, "SCHEMA_NAME");
             table.database = currentDatabase;
             table.schema = dbTable["SCHEMA_NAME"];
+            table.comment = dbTable["COMMENTS"];
             table.name = this.driver.buildTableName(dbTable["TABLE_NAME"], schema);
             // create columns from the loaded columns
             table.columns = dbColumns
@@ -1579,7 +1731,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         dbIndex["CONSTRAINT"] &&
                         dbIndex["CONSTRAINT"].indexOf("UNIQUE") !== -1);
                 });
-                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 &&
@@ -1733,6 +1885,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds and returns SQL for create table.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -1755,7 +1909,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             });
             if (!isUniqueIndexExist && !isUniqueConstraintExist)
                 table.indices.push(new TableIndex_1.TableIndex({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                     isUnique: true,
                 }));
@@ -1778,7 +1932,7 @@ class SapQueryRunner extends BaseQueryRunner_1.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(", ");
@@ -1791,7 +1945,7 @@ class SapQueryRunner extends BaseQueryRunner_1.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(", ");
@@ -1819,20 +1973,25 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         const primaryColumns = table.columns.filter((column) => column.isPrimary);
         if (primaryColumns.length > 0) {
-            const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
+            const primaryKeyName = this.dataSource.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
             sql += `, CONSTRAINT "${primaryKeyName}" PRIMARY KEY (${columnNames})`;
         }
         sql += `)`;
+        if (table.comment) {
+            sql += ` COMMENT ${this.escapeComment(table.comment)}`;
+        }
         return new Query_1.Query(sql);
     }
     /**
      * Builds drop table sql.
+     * @param tableOrName
+     * @param ifExists
      */
-    dropTableSql(tableOrName, ifExist) {
-        const query = ifExist
+    dropTableSql(tableOrName, ifExists) {
+        const query = ifExists
             ? `DROP TABLE IF EXISTS ${this.escapePath(tableOrName)}`
             : `DROP TABLE ${this.escapePath(tableOrName)}`;
         return new Query_1.Query(query);
@@ -1843,7 +2002,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else {
             return new Query_1.Query(`CREATE VIEW ${this.escapePath(view)} AS ${view
-                .expression(this.connection)
+                .expression(this.dataSource)
                 .getQuery()}`);
         }
     }
@@ -1854,7 +2013,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         return this.insertTypeormMetadataSql({
             type: MetadataTableType_1.MetadataTableType.VIEW,
             schema: schema,
@@ -1864,12 +2023,14 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param viewOrPath
      */
     dropViewSql(viewOrPath) {
         return new Query_1.Query(`DROP VIEW ${this.escapePath(viewOrPath)}`);
     }
     /**
      * Builds remove view sql.
+     * @param viewOrPath
      */
     async deleteViewDefinitionSql(viewOrPath) {
         let { schema, tableName: name } = this.driver.parseTableName(viewOrPath);
@@ -1890,6 +2051,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create index sql.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
@@ -1906,6 +2069,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
      */
     dropIndexSql(table, indexOrName) {
         const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
@@ -1921,9 +2086,11 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create primary key sql.
+     * @param table
+     * @param columnNames
      */
     createPrimaryKeySql(table, columnNames) {
-        const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+        const primaryKeyName = this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1931,20 +2098,25 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop primary key sql.
+     * @param table
      */
     dropPrimaryKeySql(table) {
         const columnNames = table.primaryColumns.map((column) => column.name);
-        const primaryKeyName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+        const primaryKeyName = this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${primaryKeyName}"`);
     }
     /**
      * Builds create check constraint sql.
+     * @param table
+     * @param checkConstraint
      */
     createCheckConstraintSql(table, checkConstraint) {
         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 = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
@@ -1954,6 +2126,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create foreign key sql.
+     * @param tableOrName
+     * @param foreignKey
      */
     createForeignKeySql(tableOrName, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -1984,6 +2158,8 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop foreign key sql.
+     * @param tableOrName
+     * @param foreignKeyOrName
      */
     dropForeignKeySql(tableOrName, foreignKeyOrName) {
         const foreignKeyName = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
@@ -1993,9 +2169,10 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes a given comment so it's safe to include in a query.
+     * @param comment
      */
     escapeComment(comment) {
-        if (!comment) {
+        if (!comment || comment.length === 0) {
             return "NULL";
         }
         comment = comment.replace(/'/g, "''").replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
@@ -2003,6 +2180,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { schema, tableName } = this.driver.parseTableName(target);
@@ -2013,9 +2191,12 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a query for create column.
+     * @param column
+     * @param explicitDefault
+     * @param explicitNullable
      */
     buildCreateColumnSql(column, explicitDefault, explicitNullable) {
-        let c = `"${column.name}" ` + this.connection.driver.createFullType(column);
+        let c = `"${column.name}" ` + this.dataSource.driver.createFullType(column);
         if (column.default !== undefined && column.default !== null) {
             c += " DEFAULT " + column.default;
         }
@@ -2040,11 +2221,28 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param newComment
      */
-    changeTableComment(tableOrName, comment) {
-        throw new error_1.TypeORMError(`spa driver does not support change table comment.`);
+    async changeTableComment(tableOrName, newComment) {
+        const upQueries = [];
+        const downQueries = [];
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
+            ? tableOrName
+            : await this.getCachedTable(tableOrName);
+        const escapedNewComment = this.escapeComment(newComment);
+        const escapedComment = this.escapeComment(table.comment);
+        if (escapedNewComment === escapedComment) {
+            return;
+        }
+        const newTable = table.clone();
+        newTable.comment = newComment;
+        upQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${escapedNewComment}`));
+        downQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${escapedComment}`));
+        await this.executeQueries(upQueries, downQueries);
+        table.comment = newTable.comment;
+        this.replaceCachedTable(table, newTable);
     }
 }
 exports.SapQueryRunner = SapQueryRunner;
-
-//# sourceMappingURL=SapQueryRunner.js.map
+//# sourceMappingURL=SapQueryRunner.js.map