fix: column name with empty spaces causes bug in Index/Unique decorat…

…ors #7534
typeorm · Apr 10, 2021 · a3a6e06 · a3a6e06
1 parent bc29597
commit a3a6e06
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/src/metadata/IndexMetadata.ts b/src/metadata/IndexMetadata.ts
@@ -164,7 +164,7 @@ export class IndexMetadata {
                     if (this.embeddedMetadata)
                         return this.embeddedMetadata.propertyPath + "." + columnName;
 
-                    return columnName;
+                    return columnName.trim();
                 });
                 columnPropertyPaths.forEach(propertyPath => map[propertyPath] = 1);
             } else { // todo: indices in embeds are not implemented in this syntax. deprecate this syntax?

diff --git a/src/metadata/UniqueMetadata.ts b/src/metadata/UniqueMetadata.ts
@@ -98,7 +98,7 @@ export class UniqueMetadata {
                     if (this.embeddedMetadata)
                         return this.embeddedMetadata.propertyPath + "." + columnName;
 
-                    return columnName;
+                    return columnName.trim();
                 });
                 columnPropertyPaths.forEach(propertyPath => map[propertyPath] = 1);
             } else {

diff --git a/test/github-issues/6752/entity/Block.ts b/test/github-issues/6752/entity/Block.ts
@@ -1,9 +1,6 @@
-import {
-    Column, Entity, Index, OneToMany, PrimaryGeneratedColumn,
-} from "../../../../src";
-import { PlanOfRecord } from "./PlanOfRecord";
+import {Column, Entity, Index, OneToMany, PrimaryGeneratedColumn} from "../../../../src";
+import {PlanOfRecord} from "./PlanOfRecord";
 
-// @Entity({ synchronize: false })
 @Entity({ synchronize: true })
 @Index(["chip_name", "manual", "frequency", "mode"], { unique: true })
 export class Block {
@@ -30,7 +27,6 @@ export class Block {
     @Index()
     public mode: string;
 
-    @OneToMany((type) => PlanOfRecord, (por) => por.block)
+    @OneToMany(() => PlanOfRecord, (por) => por.block)
     public plan_of_records: PlanOfRecord[];
 }
-
diff --git a/test/github-issues/6752/entity/PlanOfRecord.ts b/test/github-issues/6752/entity/PlanOfRecord.ts
@@ -1,12 +1,11 @@
 import {
-    Check, Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn,
+    Check, Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, Unique,
 } from "../../../../src";
 import { Block } from "./Block";
 
-// @Entity({ synchronize: false })
 @Entity({ synchronize: true })
 @Index(["block", "softwareComponent", "module", "module_sku ", "isSafety"], { unique: true })
-// Enable sync will sometimes cause planOfRecord column become null
+@Unique(["block", "softwareComponent", "module", "module_sku ", "isSafety"])
 @Check(`"planOfRecord" IN ('NOT_POR', 'POR_BUT_PROD_VAL', 'POR_BUT_RESET_VAL')`)
 export class PlanOfRecord {
     @PrimaryGeneratedColumn()

diff --git a/test/github-issues/6752/issue-6752.ts b/test/github-issues/6752/issue-6752.ts
@@ -1,15 +1,11 @@
 import "reflect-metadata";
-import {
-    createTestingConnections,
-    closeTestingConnections,
-    reloadTestingDatabases,
-} from "../../utils/test-utils";
-import { Connection } from "../../../src/connection/Connection";
-import { expect } from "chai";
-import { Block } from "./entity/Block";
-import { PlanOfRecord } from "./entity/PlanOfRecord";
+import {closeTestingConnections, createTestingConnections, reloadTestingDatabases,} from "../../utils/test-utils";
+import {Connection} from "../../../src";
+import {expect} from "chai";
+import {Block} from "./entity/Block";
+import {PlanOfRecord} from "./entity/PlanOfRecord";
 
-describe.skip("github issues > #6752 column name not been find on unique index decorator", () => {
+describe("github issues > #6752 column name not been find on unique index decorator", () => {
     it("dont change anything", async () => {
         let connections: Connection[];
         connections = await createTestingConnections({