Comparing version 0.0.2-alpha.29 to 0.0.2-alpha.30
{ | ||
"name": "typeorm", | ||
"private": false, | ||
"version": "0.0.2-alpha.29", | ||
"version": "0.0.2-alpha.30", | ||
"description": "Data-mapper ORM for Typescript", | ||
@@ -6,0 +6,0 @@ "license": "Apache-2.0", |
@@ -62,2 +62,4 @@ "use strict"; | ||
var parentEntityMetadata = this.getEntityMetadataByAlias(parentAlias); | ||
if (!parentEntityMetadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + alias.name); | ||
if (!parentEntityMetadata.hasRelationWithPropertyName(alias.parentPropertyName)) | ||
@@ -68,3 +70,3 @@ throw new Error("Relation metadata for " + alias.parentAliasName + "#" + alias.parentPropertyName + " was not found."); | ||
} | ||
throw new Error("Cannot get entity metadata for the given alias " + alias.name); | ||
return undefined; | ||
}; | ||
@@ -71,0 +73,0 @@ // ------------------------------------------------------------------------- |
@@ -452,2 +452,4 @@ "use strict"; | ||
var metadata = this.aliasMap.getEntityMetadataByAlias(this.fromEntity.alias); | ||
if (!metadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + this.fromEntity.alias.name); | ||
tableName = metadata.table.name; | ||
@@ -470,2 +472,4 @@ alias = this.fromEntity.alias.name; | ||
var joinMetadata = _this.aliasMap.getEntityMetadataByAlias(join.alias); | ||
if (!joinMetadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + join.alias.name); | ||
joinMetadata.columns.forEach(function (column) { | ||
@@ -522,2 +526,4 @@ allSelects.push(join.alias.name + "." + column.name + " AS " + join.alias.name + "_" + column.propertyName); | ||
var metadata = _this.aliasMap.getEntityMetadataByAlias(alias); | ||
if (!metadata) | ||
return; | ||
metadata.columns.forEach(function (column) { | ||
@@ -536,3 +542,9 @@ statement = statement.replace(new RegExp(alias.name + "." + column.propertyName, 'g'), alias.name + "." + column.name); | ||
var joinType = join.type; // === "INNER" ? "INNER" : "LEFT"; | ||
var joinTableName = join.tableName ? join.tableName : _this.aliasMap.getEntityMetadataByAlias(join.alias).table.name; | ||
var joinTableName = join.tableName; | ||
if (!joinTableName) { | ||
var metadata = _this.aliasMap.getEntityMetadataByAlias(join.alias); | ||
if (!metadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + join.alias.name); | ||
joinTableName = metadata.table.name; | ||
} | ||
var parentAlias = join.alias.parentAliasName; | ||
@@ -546,2 +558,4 @@ if (!parentAlias) { | ||
var parentMetadata = _this.aliasMap.getEntityMetadataByAlias(foundAlias); | ||
if (!parentMetadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + foundAlias.name); | ||
var relation = parentMetadata.findRelationWithPropertyName(join.alias.parentPropertyName); | ||
@@ -548,0 +562,0 @@ var junctionMetadata = relation.junctionEntityMetadata; |
@@ -34,5 +34,15 @@ "use strict"; | ||
var metadata = this.aliasMap.getEntityMetadataByAlias(alias); | ||
var groupedResults = OrmUtils_1.OrmUtils.groupBy(rawSqlResults, function (result) { return alias.getPrimaryKeyValue(result, metadata.primaryColumn); }); | ||
if (metadata) | ||
throw new Error("Cannot get entity metadata for the given alias " + alias.name); | ||
var groupedResults = OrmUtils_1.OrmUtils.groupBy(rawSqlResults, function (result) { | ||
if (!metadata) | ||
return; | ||
return alias.getPrimaryKeyValue(result, metadata.primaryColumn); | ||
}); | ||
return groupedResults | ||
.map(function (group) { return _this.transformIntoSingleResult(group.items, alias, metadata); }) | ||
.map(function (group) { | ||
if (!metadata) | ||
return; | ||
return _this.transformIntoSingleResult(group.items, alias, metadata); | ||
}) | ||
.filter(function (res) { return !!res; }); | ||
@@ -39,0 +49,0 @@ }; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
765020
10509