fix: defaults type cast filtering in Cockroachdb (#8144)

* fix: defaults type cast filtering This fixes column default value in cockroachdb continuously producing schema changes when there should be none Refs: #7110 * fix: defaults type cast filtering Remove debugging code Refs: #7110
typeorm · Nov 4, 2021 · 28c183e · 28c183e
1 parent 4638dea
commit 28c183e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/src/driver/cockroachdb/CockroachQueryRunner.ts b/src/driver/cockroachdb/CockroachQueryRunner.ts
@@ -1577,7 +1577,7 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
                             tableColumn.generationStrategy = "uuid";
 
                         } else  {
-                            tableColumn.default = dbColumn["column_default"].replace(/:::.*/, "");
+                            tableColumn.default = dbColumn["column_default"].replace(/:::[\w\s\[\]\"]+/g, "");
                             tableColumn.default = tableColumn.default.replace(/^(-?[\d\.]+)$/, "($1)");
                         }
                     }

diff --git a/test/github-issues/5132/issue-5132.ts b/test/github-issues/5132/issue-5132.ts
@@ -5,30 +5,25 @@ import { createTestingConnections, closeTestingConnections } from "../../utils/t
 
 import { Foo } from "./entity/foo.entity";
 
-describe("github issues > #5132 postgres: Default of -1 (minus 1) generates useless migrations`", () => {
+describe("github issues > #5132: Default of -1 (minus 1) generates useless migrations`", () => {
     describe("-1 (minus 1) in default value", () => {
         let connections: Connection[];
         before(async () => connections = await createTestingConnections({
             schemaCreate: false,
             dropSchema: true,
             entities: [Foo],
+            enabledDrivers: ["postgres", "cockroachdb"],
         }));
         after(() => closeTestingConnections(connections));
 
         it("can recognize model changes", () => Promise.all(connections.map(async connection => {
-            if (connection.driver.options.type !== "postgres") {
-                return;
-            }
             const sqlInMemory = await connection.driver.createSchemaBuilder().log();
 
             sqlInMemory.upQueries.length.should.be.greaterThan(0);
             sqlInMemory.downQueries.length.should.be.greaterThan(0);
         })));
 
         it("does not generate when no model changes", () => Promise.all(connections.map(async connection => {
-            if (connection.driver.options.type !== "postgres") {
-                return;
-            }
             await connection.driver.createSchemaBuilder().build();
 
             const sqlInMemory = await connection.driver.createSchemaBuilder().log();

diff --git a/test/github-issues/7110/entity/foo.entity.ts b/test/github-issues/7110/entity/foo.entity.ts
@@ -9,7 +9,7 @@ export class Foo extends BaseEntity {
     @Column({
         nullable: false,
         type: "varchar",
-        default: () => "TO_CHAR(100, 'FMU000')",
+        default: () => "concat(chr(65), 'FMU000')",
     })
     displayId: string;
 }
diff --git a/test/github-issues/7110/issue-7110.ts b/test/github-issues/7110/issue-7110.ts
@@ -5,34 +5,30 @@ import { createTestingConnections, closeTestingConnections } from "../../utils/t
 
 import { Foo } from "./entity/foo.entity";
 
-describe("github issues > #7110 postgres: Typeorm Migrations ignore existing default value on column`", () => {
+describe("github issues > #7110: Typeorm Migrations ignore existing default value on column`", () => {
+
     describe("double type conversion in default value", () => {
         let connections: Connection[];
         before(async () => connections = await createTestingConnections({
             schemaCreate: false,
             dropSchema: true,
             entities: [Foo],
+            enabledDrivers: ["postgres", "cockroachdb"],
         }));
         after(() => closeTestingConnections(connections));
 
         it("can recognize model changes", () => Promise.all(connections.map(async connection => {
-            if (connection.driver.options.type !== "postgres") {
-                return;
-            }
             const sqlInMemory = await connection.driver.createSchemaBuilder().log();
             sqlInMemory.upQueries.length.should.be.greaterThan(0);
             sqlInMemory.downQueries.length.should.be.greaterThan(0);
         })));
 
         it("does not generate when no model changes", () => Promise.all(connections.map(async connection => {
-            if (connection.driver.options.type !== "postgres") {
-                return;
-            }
             await connection.driver.createSchemaBuilder().build();
 
             const sqlInMemory = await connection.driver.createSchemaBuilder().log();
 
-            sqlInMemory.upQueries.length.should.be.equal(0);
+            sqlInMemory.upQueries.length.should.be.equal(0, sqlInMemory.downQueries.map(q => q.query).join("\n"));
             sqlInMemory.downQueries.length.should.be.equal(0);
         })));
     });