Skip to content

Commit

Permalink
removed shorten usages
Browse files Browse the repository at this point in the history
  • Loading branch information
pleerock committed Feb 11, 2022
1 parent 8b843a5 commit 76cee41
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/find-options/FindOptionsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export class FindOptionsUtils {
matchedBaseRelations.forEach(relation => {

// generate a relation alias
let relationAlias: string = DriverUtils.buildAlias(qb.connection.driver, { shorten: true, joiner: "__" }, alias, relation);
let relationAlias: string = DriverUtils.buildAlias(qb.connection.driver, { joiner: "__" }, alias, relation);

// add a join for the found relation
const selection = alias + "." + relation;
Expand All @@ -297,7 +297,7 @@ export class FindOptionsUtils {
metadata.eagerRelations.forEach(relation => {

// generate a relation alias
let relationAlias = DriverUtils.buildAlias(qb.connection.driver, { shorten: true }, qb.connection.namingStrategy.eagerJoinRelationAlias(alias, relation.propertyPath));
let relationAlias = DriverUtils.buildAlias(qb.connection.driver, qb.connection.namingStrategy.eagerJoinRelationAlias(alias, relation.propertyPath));

// add a join for the relation
// Checking whether the relation wasn't joined yet.
Expand Down
10 changes: 5 additions & 5 deletions src/query-builder/SelectQueryBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2553,7 +2553,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
);
} else if (relation) {
let joinAlias = alias + "_" + propertyPath.replace("\.", "_");
joinAlias = DriverUtils.buildAlias(this.connection.driver, { shorten: true, joiner: "__" }, alias, joinAlias);
joinAlias = DriverUtils.buildAlias(this.connection.driver, { joiner: "__" }, alias, joinAlias);
if (relationValue === true || typeof relationValue === "object") {
if (this.expressionMap.relationLoadStrategy === "query") {
this.relationMetadatas.push(relation);
Expand Down Expand Up @@ -2619,12 +2619,12 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
);
} else if (relation) {
let joinAlias = alias + "_" + propertyPath.replace("\.", "_");
joinAlias = DriverUtils.buildAlias(this.connection.driver, { shorten: true, joiner: "__" }, alias, joinAlias);
joinAlias = DriverUtils.buildAlias(this.connection.driver, { joiner: "__" }, alias, joinAlias);

if (relationValue === true || typeof relationValue === "object") {
relation.inverseEntityMetadata.eagerRelations.forEach(eagerRelation => {
let eagerRelationJoinAlias = joinAlias + "_" + eagerRelation.propertyPath.replace("\.", "_");
eagerRelationJoinAlias = DriverUtils.buildAlias(this.connection.driver, { shorten: true, joiner: "__" }, joinAlias, eagerRelationJoinAlias);
eagerRelationJoinAlias = DriverUtils.buildAlias(this.connection.driver, { joiner: "__" }, joinAlias, eagerRelationJoinAlias);

const existJoin = this.joins.find(join => join.alias === eagerRelationJoinAlias);
if (!existJoin) {
Expand Down Expand Up @@ -2688,7 +2688,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements

} else if (relation) {
let joinAlias = alias + "_" + propertyPath.replace("\.", "_");
joinAlias = DriverUtils.buildAlias(this.connection.driver, { shorten: true, joiner: "__" }, alias, joinAlias);
joinAlias = DriverUtils.buildAlias(this.connection.driver, { joiner: "__" }, alias, joinAlias);
// console.log("joinAlias", joinAlias, joinAlias.length, this.connection.driver.maxAliasLength)
// todo: use expressionMap.joinAttributes, and create a new one using
// const joinAttribute = new JoinAttribute(this.connection, this.expressionMap);
Expand Down Expand Up @@ -2840,7 +2840,7 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements

// const joinAlias = alias + "_" + relation.propertyName;
let joinAlias = alias + "_" + relation.propertyPath.replace("\.", "_");
joinAlias = DriverUtils.buildAlias(this.connection.driver, { shorten: true, joiner: "__" }, alias, joinAlias);
joinAlias = DriverUtils.buildAlias(this.connection.driver, { joiner: "__" }, alias, joinAlias);

const existJoin = this.joins.find(join => join.alias === joinAlias);
if (!existJoin) {
Expand Down

0 comments on commit 76cee41

Please sign in to comment.