archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

minor fixes;

Browse Source
This commit is contained in:
Zotov Dmitry 2017-05-20 13:57:06 +05:00
parent 20ebb08f2c
commit 7f192b6b5d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/metadata-builder/RelationJoinColumnBuilder.ts
View File

@ -120,12 +120,12 @@ export class RelationJoinColumnBuilder {
}
}
});
relationalColumn.build(this.connection.driver.namingStrategy);
relation.entityMetadata.registerColumn(relationalColumn);
}
relationalColumn.referencedColumn = referencedColumn; // its important to set it here because we need to set referenced column for user defined join column
relationalColumn.type = referencedColumn.type; // also since types of relational column and join column must be equal we override user defined column type
relationalColumn.relationMetadata = relation;
relationalColumn.build(this.connection.driver.namingStrategy);
return relationalColumn;
});
}

10
src/metadata/ColumnMetadata.ts
View File

@ -411,10 +411,14 @@ export class ColumnMetadata {
// ---------------------------------------------------------------------
protected buildPropertyPath(): string {
if (!this.embeddedMetadata || !this.embeddedMetadata.parentPropertyNames.length)
return this.propertyName;
let path = "";
if (this.embeddedMetadata && this.embeddedMetadata.parentPropertyNames.length)
path = this.embeddedMetadata.parentPropertyNames.join(".") + ".";
return this.embeddedMetadata.parentPropertyNames.join(".") + "." + this.propertyName;
if (this.referencedColumn)
path += this.referencedColumn.propertyName + ".";
return path + this.propertyName;
}
protected buildDatabaseName(namingStrategy: NamingStrategyInterface): string {