Home Original page

fix: HANA - SSL options, column delta detection mechanism (#5938) · typeorm/typeorm@2fd0a8a

@@ -220,7 +220,7 @@ export class SapDriver implements Driver {

220220221221

if (this.options.database) dbParams.databaseName = this.options.database;

222222

if (this.options.encrypt) dbParams.encrypt = this.options.encrypt;

223-

if (this.options.validateCertificate) dbParams.validateCertificate = this.options.validateCertificate;

223+

if (this.options.sslValidateCertificate) dbParams.validateCertificate = this.options.sslValidateCertificate;

224224

if (this.options.key) dbParams.key = this.options.key;

225225

if (this.options.cert) dbParams.cert = this.options.cert;

226226

if (this.options.ca) dbParams.ca = this.options.ca;

@@ -573,33 +573,33 @@ export class SapDriver implements Driver {

573573574574

// console.log("table:", columnMetadata.entityMetadata.tableName);

575575

// console.log("name:", tableColumn.name, columnMetadata.databaseName);

576-

// console.log("type:", tableColumn.type, this.normalizeType(columnMetadata));

577-

// console.log("length:", tableColumn.length, columnMetadata.length);

576+

// console.log("type:", tableColumn.type, _this.normalizeType(columnMetadata));

577+

// console.log("length:", tableColumn.length, _this.getColumnLength(columnMetadata));

578578

// console.log("width:", tableColumn.width, columnMetadata.width);

579579

// console.log("precision:", tableColumn.precision, columnMetadata.precision);

580580

// console.log("scale:", tableColumn.scale, columnMetadata.scale);

581581

// console.log("default:", tableColumn.default, columnMetadata.default);

582582

// console.log("isPrimary:", tableColumn.isPrimary, columnMetadata.isPrimary);

583583

// console.log("isNullable:", tableColumn.isNullable, columnMetadata.isNullable);

584-

// console.log("isUnique:", tableColumn.isUnique, this.normalizeIsUnique(columnMetadata));

584+

// console.log("isUnique:", tableColumn.isUnique, _this.normalizeIsUnique(columnMetadata));

585585

// console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);

586586

// console.log((columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated));

587587

// console.log("==========================================");

588588589589

const normalizeDefault = this.normalizeDefault(columnMetadata);

590590

const hanaNullComapatibleDefault = normalizeDefault == null ? undefined : normalizeDefault;

591591592-

return tableColumn.name !== columnMetadata.databaseName

592+

return tableColumn.name !== columnMetadata.databaseName

593593

|| tableColumn.type !== this.normalizeType(columnMetadata)

594-

|| tableColumn.length !== columnMetadata.length

594+

|| columnMetadata.length && tableColumn.length !== this.getColumnLength(columnMetadata)

595595

|| tableColumn.precision !== columnMetadata.precision

596596

|| tableColumn.scale !== columnMetadata.scale

597597

// || tableColumn.comment !== columnMetadata.comment || // todo

598598

|| (!tableColumn.isGenerated && (hanaNullComapatibleDefault !== tableColumn.default)) // we included check for generated here, because generated columns already can have default values

599599

|| tableColumn.isPrimary !== columnMetadata.isPrimary

600600

|| tableColumn.isNullable !== columnMetadata.isNullable

601601

|| tableColumn.isUnique !== this.normalizeIsUnique(columnMetadata)

602-

|| tableColumn.isGenerated !== columnMetadata.isGenerated;

602+

|| (columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated);

603603

});

604604

}

605605