typeorm 0.2.41-dev.c895680 → 0.2.42-dev.1446e02

package/driver/sqlserver/SqlServerQueryRunner.js

@@ -21,6 +21,7 @@ var Query_1 = require("../Query");
 var MssqlParameter_1 = require("./MssqlParameter");
 var error_1 = require("../../error");
 var QueryLock_1 = require("../../query-runner/QueryLock");
+var MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -2141,7 +2142,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                         }).join(" OR ");
                         query = dbNames.map(function (dbName) {
                             return "SELECT \"T\".*, \"V\".\"CHECK_OPTION\" FROM " + _this.escapePath(_this.getTypeormMetadataTableName()) + " \"t\" " +
-                                ("INNER JOIN \"" + dbName + "\".\"INFORMATION_SCHEMA\".\"VIEWS\" \"V\" ON \"V\".\"TABLE_SCHEMA\" = \"T\".\"SCHEMA\" AND \"v\".\"TABLE_NAME\" = \"T\".\"NAME\" WHERE \"T\".\"TYPE\" = 'VIEW' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
+                                ("INNER JOIN \"" + dbName + "\".\"INFORMATION_SCHEMA\".\"VIEWS\" \"V\" ON \"V\".\"TABLE_SCHEMA\" = \"T\".\"SCHEMA\" AND \"v\".\"TABLE_NAME\" = \"T\".\"NAME\" WHERE \"T\".\"TYPE\" = '" + MetadataTableType_1.MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
                         }).join(" UNION ALL ");
                         return [4 /*yield*/, this.query(query)];
                     case 4:
@@ -2294,7 +2295,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             return "SELECT \"TABLE_CATALOG\", \"TABLE_SCHEMA\", \"COLUMN_NAME\", \"TABLE_NAME\" " +
                                 ("FROM \"" + TABLE_CATALOG + "\".\"INFORMATION_SCHEMA\".\"COLUMNS\" ") +
                                 "WHERE " +
-                                ("EXISTS(SELECT 1 FROM \"" + TABLE_CATALOG + "\".\"SYS\".\"COLUMNS\" \"S\" WHERE OBJECT_ID(\"TABLE_CATALOG\" + '.' + \"TABLE_SCHEMA\" + '.' + \"TABLE_NAME\") = \"S\".\"OBJECT_ID\" AND \"COLUMN_NAME\" = \"S\".\"NAME\" AND \"S\".\"is_identity\" = 1) AND ") +
+                                ("EXISTS(SELECT 1 FROM \"" + TABLE_CATALOG + "\".\"sys\".\"columns\" \"S\" WHERE OBJECT_ID(\"TABLE_CATALOG\" + '.' + \"TABLE_SCHEMA\" + '.' + \"TABLE_NAME\") = \"S\".\"OBJECT_ID\" AND \"COLUMN_NAME\" = \"S\".\"NAME\" AND \"S\".\"is_identity\" = 1) AND ") +
                                 ("(" + conditions + ")");
                         }).join(" UNION ALL ");
                         dbCollationsSql = "SELECT \"NAME\", \"COLLATION_NAME\" FROM \"sys\".\"databases\"";
@@ -2352,14 +2353,14 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                             dbConstraint["TABLE_SCHEMA"] === dbColumn["TABLE_SCHEMA"] &&
                                             dbConstraint["TABLE_CATALOG"] === dbColumn["TABLE_CATALOG"] &&
                                             dbConstraint["COLUMN_NAME"] === dbColumn["COLUMN_NAME"]); });
-                                        var uniqueConstraint = columnConstraints.find(function (constraint) { return constraint["CONSTRAINT_TYPE"] === "UNIQUE"; });
-                                        var isConstraintComposite = uniqueConstraint
-                                            ? !!dbConstraints.find(function (dbConstraint) { return dbConstraint["CONSTRAINT_TYPE"] === "UNIQUE"
+                                        var uniqueConstraints = columnConstraints.filter(function (constraint) { return constraint["CONSTRAINT_TYPE"] === "UNIQUE"; });
+                                        var isConstraintComposite = uniqueConstraints.every(function (uniqueConstraint) {
+                                            return dbConstraints.some(function (dbConstraint) { return dbConstraint["CONSTRAINT_TYPE"] === "UNIQUE"
                                                 && dbConstraint["CONSTRAINT_NAME"] === uniqueConstraint["CONSTRAINT_NAME"]
                                                 && dbConstraint["TABLE_SCHEMA"] === dbColumn["TABLE_SCHEMA"]
                                                 && dbConstraint["TABLE_CATALOG"] === dbColumn["TABLE_CATALOG"]
-                                                && dbConstraint["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; })
-                                            : false;
+                                                && dbConstraint["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; });
+                                        });
                                         var isPrimary = !!columnConstraints.find(function (constraint) { return constraint["CONSTRAINT_TYPE"] === "PRIMARY KEY"; });
                                         var isGenerated = !!dbIdentityColumns.find(function (column) { return (column["TABLE_NAME"] === dbColumn["TABLE_NAME"] &&
                                             column["TABLE_SCHEMA"] === dbColumn["TABLE_SCHEMA"] &&
@@ -2419,7 +2420,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                                             : undefined;
                                         tableColumn.isNullable = dbColumn["IS_NULLABLE"] === "YES";
                                         tableColumn.isPrimary = isPrimary;
-                                        tableColumn.isUnique = !!uniqueConstraint && !isConstraintComposite;
+                                        tableColumn.isUnique = uniqueConstraints.length > 0 && !isConstraintComposite;
                                         tableColumn.isGenerated = isGenerated;
                                         if (isGenerated)
                                             tableColumn.generationStrategy = "increment";
@@ -2586,25 +2587,26 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
     };
     SqlServerQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var parsedTableName, _a, expression, _b, query, parameters;
-            return (0, tslib_1.__generator)(this, function (_c) {
-                switch (_c.label) {
+            var parsedTableName, _a, expression;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         parsedTableName = this.driver.parseTableName(view);
                         if (!!parsedTableName.schema) return [3 /*break*/, 2];
                         _a = parsedTableName;
                         return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        _a.schema = _c.sent();
-                        _c.label = 2;
+                        _a.schema = _b.sent();
+                        _b.label = 2;
                     case 2:
                         expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-                        _b = (0, tslib_1.__read)(this.connection.createQueryBuilder()
-                            .insert()
-                            .into(this.getTypeormMetadataTableName())
-                            .values({ type: "VIEW", database: parsedTableName.database, schema: parsedTableName.schema, name: parsedTableName.tableName, value: expression })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query_1.Query(query, parameters)];
+                        return [2 /*return*/, this.insertTypeormMetadataSql({
+                                type: MetadataTableType_1.MetadataTableType.VIEW,
+                                database: parsedTableName.database,
+                                schema: parsedTableName.schema,
+                                name: parsedTableName.tableName,
+                                value: expression
+                            })];
                 }
             });
         });
@@ -2620,27 +2622,23 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var parsedTableName, _a, qb, _b, query, parameters;
-            return (0, tslib_1.__generator)(this, function (_c) {
-                switch (_c.label) {
+            var parsedTableName, _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         parsedTableName = this.driver.parseTableName(viewOrPath);
                         if (!!parsedTableName.schema) return [3 /*break*/, 2];
                         _a = parsedTableName;
                         return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        _a.schema = _c.sent();
-                        _c.label = 2;
-                    case 2:
-                        qb = this.connection.createQueryBuilder();
-                        _b = (0, tslib_1.__read)(qb.delete()
-                            .from(this.getTypeormMetadataTableName())
-                            .where(qb.escape("type") + " = 'VIEW'")
-                            .andWhere(qb.escape("database") + " = :database", { database: parsedTableName.database })
-                            .andWhere(qb.escape("schema") + " = :schema", { schema: parsedTableName.schema })
-                            .andWhere(qb.escape("name") + " = :name", { name: parsedTableName.tableName })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query_1.Query(query, parameters)];
+                        _a.schema = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, this.deleteTypeormMetadataSql({
+                            type: MetadataTableType_1.MetadataTableType.VIEW,
+                            database: parsedTableName.database,
+                            schema: parsedTableName.schema,
+                            name: parsedTableName.tableName
+                        })];
                 }
             });
         });