typeorm 0.3.18-dev.8d0e7f9 → 0.3.18-dev.a00b1df

package/driver/sap/SapQueryRunner.js

@@ -21,6 +21,7 @@ const QueryLock_1 = require("../../query-runner/QueryLock");
 const MetadataTableType_1 = require("../types/MetadataTableType");
 const InstanceChecker_1 = require("../../util/InstanceChecker");
 const util_1 = require("util");
+const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -136,21 +137,30 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const release = await this.lock.acquire();
         let statement;
         const result = new QueryResult_1.QueryResult();
+        const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         try {
             const databaseConnection = await this.connect();
             this.driver.connection.logger.logQuery(query, parameters, this);
+            this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
             const queryStartTime = +new Date();
             const isInsertQuery = query.substr(0, 11) === "INSERT INTO";
-            statement = databaseConnection.prepare(query);
-            const raw = await new Promise((ok, fail) => {
-                statement.exec(parameters, (err, raw) => err
-                    ? fail(new error_1.QueryFailedError(query, parameters, err))
-                    : ok(raw));
-            });
+            if (parameters === null || parameters === void 0 ? void 0 : parameters.some(Array.isArray)) {
+                statement = await (0, util_1.promisify)(databaseConnection.prepare.bind(databaseConnection))(query);
+            }
+            let raw;
+            try {
+                raw = statement
+                    ? await (0, util_1.promisify)(statement.exec.bind(statement))(parameters)
+                    : await (0, util_1.promisify)(databaseConnection.exec.bind(databaseConnection))(query, parameters, {});
+            }
+            catch (err) {
+                throw new error_1.QueryFailedError(query, parameters, err);
+            }
             // log slow queries if maxQueryExecution time is set
             const maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
             const queryEndTime = +new Date();
             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);
@@ -174,15 +184,17 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 result.records = identityValueResult;
             }
         }
-        catch (e) {
-            this.driver.connection.logger.logQueryError(e, query, parameters, this);
-            throw e;
+        catch (err) {
+            this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
+            throw err;
         }
         finally {
             // Never forget to drop the statement we reserved
             if (statement === null || statement === void 0 ? void 0 : statement.drop) {
                 await new Promise((ok) => statement.drop(() => ok()));
             }
+            await broadcasterResult.wait();
             // Always release the lock.
             release();
         }
@@ -197,7 +209,19 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      * Returns raw data stream.
      */
     async stream(query, parameters, onEnd, onError) {
-        throw new error_1.TypeORMError(`Stream is not supported by SAP driver.`);
+        if (this.isReleased)
+            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+        const databaseConnection = await this.connect();
+        this.driver.connection.logger.logQuery(query, parameters, this);
+        const prepareAsync = (0, util_1.promisify)(databaseConnection.prepare).bind(databaseConnection);
+        const statement = await prepareAsync(query);
+        const resultSet = statement.executeQuery(parameters);
+        const stream = this.driver.streamClient.createObjectStream(resultSet);
+        if (onEnd)
+            stream.on("end", onEnd);
+        if (onError)
+            stream.on("error", onError);
+        return stream;
     }
     /**
      * Returns all available database names including system databases.
@@ -265,7 +289,7 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
         }
-        const sql = `SELECT * FROM "SYS"."TABLE_COLUMNS" WHERE "SCHEMA_NAME" = ${parsedTableName.schema} AND "TABLE_NAME" = ${parsedTableName.tableName} AND "COLUMN_NAME" = '${columnName}'`;
+        const sql = `SELECT * FROM "SYS"."TABLE_COLUMNS" WHERE "SCHEMA_NAME" = '${parsedTableName.schema}' AND "TABLE_NAME" = '${parsedTableName.tableName}' AND "COLUMN_NAME" = '${columnName}'`;
         const result = await this.query(sql);
         return result.length ? true : false;
     }
@@ -747,9 +771,15 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 clonedTable.columns[clonedTable.columns.indexOf(oldTableColumn)].name = newColumn.name;
                 oldColumn.name = newColumn.name;
             }
-            if (this.isColumnChanged(oldColumn, newColumn)) {
-                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER (${this.buildCreateColumnSql(newColumn)})`));
-                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER (${this.buildCreateColumnSql(oldColumn)})`));
+            if (this.isColumnChanged(oldColumn, newColumn, true)) {
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER (${this.buildCreateColumnSql(newColumn, !(oldColumn.default === null ||
+                    oldColumn.default === undefined), !oldColumn.isNullable)})`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER (${this.buildCreateColumnSql(oldColumn, !(newColumn.default === null ||
+                    newColumn.default === undefined), !newColumn.isNullable)})`));
+            }
+            else if (oldColumn.comment !== newColumn.comment) {
+                upQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${oldColumn.name}" IS ${this.escapeComment(newColumn.comment)}`));
+                downQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${newColumn.name}" IS ${this.escapeComment(oldColumn.comment)}`));
             }
             if (newColumn.isPrimary !== oldColumn.isPrimary) {
                 const primaryColumns = clonedTable.primaryColumns;
@@ -821,24 +851,6 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     downQueries.push(this.createIndexSql(table, uniqueIndex));
                 }
             }
-            if (newColumn.default !== oldColumn.default) {
-                if (newColumn.default !== null &&
-                    newColumn.default !== undefined) {
-                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER ("${newColumn.name}" ${this.connection.driver.createFullType(newColumn)} DEFAULT ${newColumn.default})`));
-                    if (oldColumn.default !== null &&
-                        oldColumn.default !== undefined) {
-                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER ("${oldColumn.name}" ${this.connection.driver.createFullType(oldColumn)} DEFAULT ${oldColumn.default})`));
-                    }
-                    else {
-                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER ("${oldColumn.name}" ${this.connection.driver.createFullType(oldColumn)} DEFAULT NULL)`));
-                    }
-                }
-                else if (oldColumn.default !== null &&
-                    oldColumn.default !== undefined) {
-                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER ("${newColumn.name}" ${this.connection.driver.createFullType(newColumn)} DEFAULT NULL)`));
-                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER ("${oldColumn.name}" ${this.connection.driver.createFullType(oldColumn)} DEFAULT ${oldColumn.default})`));
-                }
-            }
             await this.executeQueries(upQueries, downQueries);
             this.replaceCachedTable(table, clonedTable);
         }
@@ -1623,7 +1635,9 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             dbColumn["DEFAULT_VALUE"];
                     }
                 }
-                tableColumn.comment = ""; // dbColumn["COLUMN_COMMENT"];
+                if (dbColumn["COMMENTS"]) {
+                    tableColumn.comment = dbColumn["COMMENTS"];
+                }
                 if (dbColumn["character_set_name"])
                     tableColumn.charset =
                         dbColumn["character_set_name"];
@@ -1957,59 +1971,55 @@ class SapQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : foreignKeyOrName;
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(tableOrName)} DROP CONSTRAINT "${foreignKeyName}"`);
     }
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    escapeComment(comment) {
+        if (!comment) {
+            return "NULL";
+        }
+        comment = comment.replace(/'/g, "''").replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
+        return `'${comment}'`;
+    }
     /**
      * Escapes given table or view path.
      */
     escapePath(target) {
         const { schema, tableName } = this.driver.parseTableName(target);
-        if (schema) {
+        if (schema && schema !== this.driver.schema) {
             return `"${schema}"."${tableName}"`;
         }
         return `"${tableName}"`;
     }
-    /**
-     * Concat database name and schema name to the foreign key name.
-     * Needs because FK name is relevant to the schema and database.
-     */
-    buildForeignKeyName(fkName, schemaName, dbName) {
-        let joinedFkName = fkName;
-        if (schemaName)
-            joinedFkName = schemaName + "." + joinedFkName;
-        if (dbName)
-            joinedFkName = dbName + "." + joinedFkName;
-        return joinedFkName;
-    }
-    /**
-     * Removes parenthesis around default value.
-     * Sql server returns default value with parenthesis around, e.g.
-     *  ('My text') - for string
-     *  ((1)) - for number
-     *  (newsequentialId()) - for function
-     */
-    removeParenthesisFromDefault(defaultValue) {
-        if (defaultValue.substr(0, 1) !== "(")
-            return defaultValue;
-        const normalizedDefault = defaultValue.substr(1, defaultValue.lastIndexOf(")") - 1);
-        return this.removeParenthesisFromDefault(normalizedDefault);
-    }
     /**
      * Builds a query for create column.
      */
-    buildCreateColumnSql(column) {
+    buildCreateColumnSql(column, explicitDefault, explicitNullable) {
         let c = `"${column.name}" ` + this.connection.driver.createFullType(column);
         if (column.charset)
             c += " CHARACTER SET " + column.charset;
         if (column.collation)
             c += " COLLATE " + column.collation;
-        if (column.default !== undefined && column.default !== null)
-            // DEFAULT must be placed before NOT NULL
+        if (column.default !== undefined && column.default !== null) {
             c += " DEFAULT " + column.default;
-        if (column.isNullable !== true && !column.isGenerated)
+        }
+        else if (explicitDefault) {
+            c += " DEFAULT NULL";
+        }
+        if (!column.isGenerated) {
             // NOT NULL is not supported with GENERATED
-            c += " NOT NULL";
+            if (column.isNullable !== true)
+                c += " NOT NULL";
+            else if (explicitNullable)
+                c += " NULL";
+        }
         if (column.isGenerated === true &&
-            column.generationStrategy === "increment")
+            column.generationStrategy === "increment") {
             c += " GENERATED ALWAYS AS IDENTITY";
+        }
+        if (column.comment) {
+            c += ` COMMENT ${this.escapeComment(column.comment)}`;
+        }
         return c;
     }
 }