Merge 5e21208b77 into 5000983a36

npm/migration/mariadb/1714417013715-md_namespace.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MdNamespace1714417013715 implements MigrationInterface {
+    name = 'MdNamespace1714417013715'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(256) NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(64) NULL`);
+    }
+
+}

npm/migration/mssql/1714421718208-mss_namespace.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MssNamespace1714421718208 implements MigrationInterface {
+    name = 'MssNamespace1714421718208'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "jackson_store" ALTER COLUMN "namespace" varchar(256)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "jackson_store" ALTER COLUMN "namespace" varchar(64)`);
+    }
+
+}

npm/migration/mysql/1714419315556-ms_namespace.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MsNamespace1714419315556 implements MigrationInterface {
+    name = 'MsNamespace1714419315556'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(256) NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(64) NULL`);
+    }
+
+}

npm/migration/planetscale/1714457285484-ms_namespace.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MsNamespace1714457285484 implements MigrationInterface {
+    name = 'MsNamespace1714457285484'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(256) NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`jackson_store\` MODIFY \`namespace\` varchar(64) NULL`);
+    }
+
+}

npm/migration/postgres/1714452929542-pg_namespace.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class PgNamespace1714452929542 implements MigrationInterface {
+    name = 'PgNamespace1714452929542'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "jackson_store" ALTER COLUMN "namespace" TYPE VARCHAR(256)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "jackson_store" ALTER COLUMN "namespace" TYPE VARCHAR(64)`);
+    }
+
+}

npm/src/db/planetscale/entity/JacksonStore.ts

@@ -46,7 +46,7 @@ export class JacksonStore {
   @Index('_jackson_store_namespace')
   @Column({
     type: 'varchar',
-    length: 64,
+    length: 256,
     nullable: true,
   })
   namespace?: string;

npm/src/db/sql/entity/JacksonStore.ts

@@ -44,7 +44,7 @@ export class JacksonStore {
   @Index('_jackson_store_namespace')
   @Column({
     type: 'varchar',
-    length: 64,
+    length: 256,
     nullable: true,
   })
   namespace?: string;

npm/src/db/sql/mariadb/entity/JacksonStore.ts

@@ -46,7 +46,7 @@ export class JacksonStore {
   @Index('_jackson_store_namespace')
   @Column({
     type: 'varchar',
-    length: 64,
+    length: 256,
     nullable: true,
   })
   namespace?: string;

npm/src/db/sql/mssql/entity/JacksonStore.ts

@@ -44,7 +44,7 @@ export class JacksonStore {
   @Index('_jackson_store_namespace')
   @Column({
     type: 'varchar',
-    length: 64,
+    length: 256,
     nullable: true,
   })
   namespace?: string;

npm/src/db/sql/sql.ts

@@ -131,19 +131,22 @@ class Sql implements DatabaseDriver {
   }
 
   async indexNamespace() {
-    const res = await this.storeRepository.find({
-      where: {
-        namespace: IsNull(),
-      },
-      select: ['key'],
-    });
-    const searchTerm = ':';
+    try {
+      const res = await this.storeRepository.find({
+        where: {
+          namespace: IsNull(),
+        },
+        select: ['key'],
+      });
+      const searchTerm = ':';
 
-    for (const r of res) {
-      const key = r.key;
-      const tokens2 = key.split(searchTerm).slice(0, 2);
-      const value = tokens2.join(searchTerm);
-      await this.storeRepository.update({ key }, { namespace: value });
+      for (const r of res) {
+        const key = r.key;
+        const lastIndex = r.key.lastIndexOf(searchTerm);
+        await this.storeRepository.update({ key }, { namespace: r.key.substring(0, lastIndex) });
+      }
+    } catch (err) {
+      console.error('Error running indexNamespace:', err);
     }
   }