Skip to content

Commit d74e3fa

Browse files
charlesBochetcharlesBochet
authored
chore(server): bump current version to 2.2.0 (#20040)
## Summary We are releasing Twenty v2.2.0. This PR sets up the upgrade-version-command machinery for the new release line: - Promote `2.1.0` into `TWENTY_PREVIOUS_VERSIONS` (it just shipped) - Set `TWENTY_CURRENT_VERSION` to `2.2.0` - Reset `TWENTY_NEXT_VERSIONS` to `[]` - Refresh the `InstanceCommandGenerationService` snapshots to reflect the new current version (`2.2.0` / `2-2-` slug) - Update the failing-sequence-runner snapshot to include `2.2.0` in the covered versions list The `2-2/` upgrade-version-command module is already in place and wired into `WorkspaceCommandProviderModule`, so future upgrade commands targeting `2.2.0` can land directly under `2-2/` (or be generated against `--version 2.2.0`).
1 parent aad77b5 commit d74e3fa

5 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎packages/twenty-server/src/database/commands/__tests__/__snapshots__/instance-command-generation.service.spec.ts.snap‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ export class TestFastInstanceCommand implements FastInstanceCommand {
2626
exports[`InstanceCommandGenerationService should escape backslashes in SQL queries 1`] = `
2727
{
2828
"className": "UpdatePathFastInstanceCommand",
29-
"fileName": "2-1-instance-command-fast-1775000000000-update-path.ts",
29+
"fileName": "2-2-instance-command-fast-1775000000000-update-path.ts",
3030
"fileTemplate": "import { QueryRunner } from 'typeorm';
3131
3232
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
3333
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
3434
35-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
35+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
3636
export class UpdatePathFastInstanceCommand implements FastInstanceCommand {
3737
public async up(queryRunner: QueryRunner): Promise<void> {
3838
await queryRunner.query('UPDATE "core"."config" SET "value" = E\\'path\\\\\\\\to\\\\\\\\file\\'');
@@ -49,13 +49,13 @@ export class UpdatePathFastInstanceCommand implements FastInstanceCommand {
4949
exports[`InstanceCommandGenerationService should escape single quotes in SQL queries 1`] = `
5050
{
5151
"className": "UpdateConfigFastInstanceCommand",
52-
"fileName": "2-1-instance-command-fast-1775000000000-update-config.ts",
52+
"fileName": "2-2-instance-command-fast-1775000000000-update-config.ts",
5353
"fileTemplate": "import { QueryRunner } from 'typeorm';
5454
5555
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
5656
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
5757
58-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
58+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
5959
export class UpdateConfigFastInstanceCommand implements FastInstanceCommand {
6060
public async up(queryRunner: QueryRunner): Promise<void> {
6161
await queryRunner.query('UPDATE "core"."config" SET "value" = \\'it\\'\\'s done\\'');
@@ -72,13 +72,13 @@ export class UpdateConfigFastInstanceCommand implements FastInstanceCommand {
7272
exports[`InstanceCommandGenerationService should generate a migration with a single up/down query 1`] = `
7373
{
7474
"className": "AddFooColumnFastInstanceCommand",
75-
"fileName": "2-1-instance-command-fast-1775000000000-add-foo-column.ts",
75+
"fileName": "2-2-instance-command-fast-1775000000000-add-foo-column.ts",
7676
"fileTemplate": "import { QueryRunner } from 'typeorm';
7777
7878
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
7979
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
8080
81-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
81+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
8282
export class AddFooColumnFastInstanceCommand implements FastInstanceCommand {
8383
public async up(queryRunner: QueryRunner): Promise<void> {
8484
await queryRunner.query('ALTER TABLE "core"."user" ADD "foo" varchar');
@@ -95,13 +95,13 @@ export class AddFooColumnFastInstanceCommand implements FastInstanceCommand {
9595
exports[`InstanceCommandGenerationService should generate a migration with multiple queries 1`] = `
9696
{
9797
"className": "CreateTaskTableFastInstanceCommand",
98-
"fileName": "2-1-instance-command-fast-1775000000000-create-task-table.ts",
98+
"fileName": "2-2-instance-command-fast-1775000000000-create-task-table.ts",
9999
"fileTemplate": "import { QueryRunner } from 'typeorm';
100100
101101
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
102102
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
103103
104-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
104+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
105105
export class CreateTaskTableFastInstanceCommand implements FastInstanceCommand {
106106
public async up(queryRunner: QueryRunner): Promise<void> {
107107
await queryRunner.query('CREATE TABLE "core"."task" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" varchar NOT NULL)');
@@ -120,13 +120,13 @@ export class CreateTaskTableFastInstanceCommand implements FastInstanceCommand {
120120
exports[`InstanceCommandGenerationService should generate a migration with query parameters 1`] = `
121121
{
122122
"className": "SeedSettingFastInstanceCommand",
123-
"fileName": "2-1-instance-command-fast-1775000000000-seed-setting.ts",
123+
"fileName": "2-2-instance-command-fast-1775000000000-seed-setting.ts",
124124
"fileTemplate": "import { QueryRunner } from 'typeorm';
125125
126126
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
127127
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
128128
129-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
129+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
130130
export class SeedSettingFastInstanceCommand implements FastInstanceCommand {
131131
public async up(queryRunner: QueryRunner): Promise<void> {
132132
await queryRunner.query('INSERT INTO "core"."setting" ("key", "value") VALUES ($1, $2)', ["theme","dark"]);
@@ -143,13 +143,13 @@ export class SeedSettingFastInstanceCommand implements FastInstanceCommand {
143143
exports[`InstanceCommandGenerationService should generate a slow instance command with populated up/down 1`] = `
144144
{
145145
"className": "MakeColumnNotNullableSlowInstanceCommand",
146-
"fileName": "2-1-instance-command-slow-1775000000000-make-column-not-nullable.ts",
146+
"fileName": "2-2-instance-command-slow-1775000000000-make-column-not-nullable.ts",
147147
"fileTemplate": "import { DataSource, QueryRunner } from 'typeorm';
148148
149149
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
150150
import { SlowInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/slow-instance-command.interface';
151151
152-
@RegisteredInstanceCommand('2.1.0', 1775000000000, { type: 'slow' })
152+
@RegisteredInstanceCommand('2.2.0', 1775000000000, { type: 'slow' })
153153
export class MakeColumnNotNullableSlowInstanceCommand implements SlowInstanceCommand {
154154
async runDataMigration(dataSource: DataSource): Promise<void> {
155155
// TODO: implement data backfill before the DDL migration
@@ -170,13 +170,13 @@ export class MakeColumnNotNullableSlowInstanceCommand implements SlowInstanceCom
170170
exports[`InstanceCommandGenerationService should use default migration name in class and file names 1`] = `
171171
{
172172
"className": "AutoGeneratedFastInstanceCommand",
173-
"fileName": "2-1-instance-command-fast-1775000000000-auto-generated.ts",
173+
"fileName": "2-2-instance-command-fast-1775000000000-auto-generated.ts",
174174
"fileTemplate": "import { QueryRunner } from 'typeorm';
175175
176176
import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
177177
import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
178178
179-
@RegisteredInstanceCommand('2.1.0', 1775000000000)
179+
@RegisteredInstanceCommand('2.2.0', 1775000000000)
180180
export class AutoGeneratedFastInstanceCommand implements FastInstanceCommand {
181181
public async up(queryRunner: QueryRunner): Promise<void> {
182182
await queryRunner.query('ALTER TABLE "core"."user" ADD "bar" integer');

‎packages/twenty-server/src/engine/core-modules/upgrade/constants/twenty-current-version.constant.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const TWENTY_CURRENT_VERSION = '2.1.0' as const;
1+
export const TWENTY_CURRENT_VERSION = '2.2.0' as const;

‎packages/twenty-server/src/engine/core-modules/upgrade/constants/twenty-next-versions.constant.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const TWENTY_NEXT_VERSIONS = ['2.2.0'] as const;
1+
export const TWENTY_NEXT_VERSIONS = [] as const;

‎packages/twenty-server/src/engine/core-modules/upgrade/constants/twenty-previous-versions.constant.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export const TWENTY_PREVIOUS_VERSIONS = [
33
'1.22.0',
44
'1.23.0',
55
'2.0.0',
6+
'2.1.0',
67
] as const;

‎packages/twenty-server/test/integration/upgrade/suites/sequence-runner/__snapshots__/failing-sequence-runner.integration-spec.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

3-
exports[`UpgradeSequenceRunnerService — failing sequence (integration) should throw when cursor command is not found in the sequence 1`] = `"Step "RemovedCommand" not found in upgrade sequence. The sequence only covers versions [1.21.0, 1.22.0, 1.23.0, 2.0.0, 2.1.0]. Please upgrade to 1.21.0 first."`;
3+
exports[`UpgradeSequenceRunnerService — failing sequence (integration) should throw when cursor command is not found in the sequence 1`] = `"Step "RemovedCommand" not found in upgrade sequence. The sequence only covers versions [1.21.0, 1.22.0, 1.23.0, 2.0.0, 2.1.0, 2.2.0]. Please upgrade to 1.21.0 first."`;

0 commit comments

Comments
 (0)