@nymphjs/driver-postgresql 1.0.0-beta.106 → 1.0.0-beta.107

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.107](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.106...v1.0.0-beta.107) (2026-02-13)
+
+### Features
+
+- move tilmeld fields into columns in entities tables ([5f46048](https://github.com/sciactive/nymphjs/commit/5f46048c3e04839ca9a8b81f71a950b9086d0a41))
+- update packages and fix all new issues ([0e9d17c](https://github.com/sciactive/nymphjs/commit/0e9d17c6e2db12c11bdfb559031719c1b52b5fa1))
+
 # [1.0.0-beta.106](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.105...v1.0.0-beta.106) (2025-12-05)
 
 ### Bug Fixes

package/dist/PostgreSQLDriver.d.ts

@@ -53,6 +53,8 @@ export default class PostgreSQLDriver extends NymphDriver {
      */
     isConnected(): boolean;
     private createEntitiesTable;
+    private addTilmeldColumnsAndIndexes;
+    private createEntitiesTilmeldIndexes;
     private createDataTable;
     private createReferencesTable;
     private createTokensTable;
@@ -130,6 +132,14 @@ export default class PostgreSQLDriver extends NymphDriver {
         sdata: SerializedEntityData;
         etype: string;
     }): Promise<void>;
+    importEntityTilmeldAC(entity: {
+        guid: string;
+        cdate: number;
+        mdate: number;
+        tags: string[];
+        sdata: SerializedEntityData;
+        etype: string;
+    }): Promise<void>;
     private importEntityInternal;
     importUID({ name, value }: {
         name: string;
@@ -142,7 +152,7 @@ export default class PostgreSQLDriver extends NymphDriver {
     setUID(name: string, curUid: number): Promise<boolean>;
     protected internalTransaction(name: string): Promise<PostgreSQLDriverTransaction>;
     startTransaction(name: string): Promise<import("@nymphjs/nymph").Nymph>;
-    needsMigration(): Promise<'json' | 'tokens' | false>;
-    liveMigration(_migrationType: 'tokenTables'): Promise<void>;
+    needsMigration(): Promise<'json' | 'tokens' | 'tilmeldColumns' | false>;
+    liveMigration(migrationType: 'tokenTables' | 'tilmeldColumns'): Promise<void>;
 }
 export {};

package/dist/PostgreSQLDriver.js

@@ -171,6 +171,14 @@ export default class PostgreSQLDriver extends NymphDriver {
           "tags" TEXT[],
           "cdate" DOUBLE PRECISION NOT NULL,
           "mdate" DOUBLE PRECISION NOT NULL,
+          "user" BYTEA,
+          "group" BYTEA,
+          "acUser" SMALLINT,
+          "acGroup" SMALLINT,
+          "acOther" SMALLINT,
+          "acRead" BYTEA[],
+          "acWrite" BYTEA[],
+          "acFull" BYTEA[],
           PRIMARY KEY ("guid")
         ) WITH ( OIDS=FALSE );`, { connection });
         await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} OWNER TO ${PostgreSQLDriver.escape(this.config.user)};`, { connection });
@@ -180,8 +188,38 @@ export default class PostgreSQLDriver extends NymphDriver {
         await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("mdate");`, { connection });
         await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)};`, { connection });
         await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("tags");`, { connection });
+        await this.createEntitiesTilmeldIndexes(etype, connection);
         await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET ( autovacuum_vacuum_scale_factor = 0.05, autovacuum_analyze_scale_factor = 0.05 );`, { connection });
     }
+    async addTilmeldColumnsAndIndexes(etype, connection) {
+        await this.queryRun(`ALTER TABLE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN IF NOT EXISTS "user" BYTEA,
+        ADD COLUMN IF NOT EXISTS "group" BYTEA,
+        ADD COLUMN IF NOT EXISTS "acUser" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acGroup" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acOther" SMALLINT,
+        ADD COLUMN IF NOT EXISTS "acRead" BYTEA[],
+        ADD COLUMN IF NOT EXISTS "acWrite" BYTEA[],
+        ADD COLUMN IF NOT EXISTS "acFull" BYTEA[];`);
+        await this.createEntitiesTilmeldIndexes(etype, connection);
+    }
+    async createEntitiesTilmeldIndexes(etype, connection) {
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_user_acUser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_user_acUser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("user", "acUser");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_group_acGroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_group_acGroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("group", "acGroup");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acUser`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acUser`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acUser");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acGroup`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acGroup`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acGroup");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acOther`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acOther`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING btree ("acOther");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acRead`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acRead`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acRead");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acWrite`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acWrite`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acWrite");`, { connection });
+        await this.queryRun(`DROP INDEX IF EXISTS ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acFull`)};`, { connection });
+        await this.queryRun(`CREATE INDEX ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}_id_acFull`)} ON ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} USING gin ("acFull");`, { connection });
+    }
     async createDataTable(etype, connection) {
         // Create the data table.
         await this.queryRun(`CREATE TABLE IF NOT EXISTS ${PostgreSQLDriver.escape(`${this.prefix}data_${etype}`)} (
@@ -1850,15 +1888,18 @@ export default class PostgreSQLDriver extends NymphDriver {
         return result?.cur_uid == null ? null : Number(result.cur_uid);
     }
     async importEntity(entity) {
-        return await this.importEntityInternal(entity, false);
+        return await this.importEntityInternal(entity);
     }
     async importEntityTokens(entity) {
-        return await this.importEntityInternal(entity, true);
+        return await this.importEntityInternal(entity, { only: 'tokens' });
+    }
+    async importEntityTilmeldAC(entity) {
+        return await this.importEntityInternal(entity, { only: 'tilmeldAC' });
     }
-    async importEntityInternal({ guid, cdate, mdate, tags, sdata, etype, }, onlyTokens) {
+    async importEntityInternal({ guid, cdate, mdate, tags, sdata, etype, }, { only = undefined } = {}) {
         try {
             let promises = [];
-            if (!onlyTokens) {
+            if (only == null) {
                 promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
@@ -1878,13 +1919,15 @@ export default class PostgreSQLDriver extends NymphDriver {
                     },
                 }));
             }
-            promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
-                etypes: [etype],
-                params: {
-                    guid,
-                },
-            }));
-            if (!onlyTokens) {
+            if (only == null || only === 'tokens') {
+                promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                    },
+                }));
+            }
+            if (only == null) {
                 promises.push(this.queryRun(`DELETE FROM ${PostgreSQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=decode(@guid, 'hex');`, {
                     etypes: [etype],
                     params: {
@@ -1894,14 +1937,23 @@ export default class PostgreSQLDriver extends NymphDriver {
             }
             await Promise.all(promises);
             promises = [];
-            if (!onlyTokens) {
-                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate);`, {
+            if (only == null) {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (decode(@guid, 'hex'), @tags, @cdate, @mdate, ${user == null ? '@user' : "decode(@user, 'hex')"}, ${group == null ? '@group' : "decode(@group, 'hex')"}, @acUser, @acGroup, @acOther, ${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, ${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, ${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"});`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags,
                         cdate: isNaN(cdate) ? null : cdate,
                         mdate: isNaN(mdate) ? null : mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
                     },
                 });
                 for (const name in sdata) {
@@ -1945,45 +1997,64 @@ export default class PostgreSQLDriver extends NymphDriver {
                     }
                 }
             }
+            if (only === 'tilmeldAC') {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                promises.push(this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "user"=${user == null ? '@user' : "decode(@user, 'hex')"}, "group"=${group == null ? '@group' : "decode(@group, 'hex')"}, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, "acWrite"=${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, "acFull"=${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"} WHERE "guid"=decode(@guid, 'hex');`, {
+                    etypes: [etype],
+                    params: {
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
+                        guid,
+                    },
+                }));
+            }
             const EntityClass = this.nymph.getEntityClassByEtype(etype);
-            for (let name in sdata) {
-                let tokenString = null;
-                try {
-                    tokenString = EntityClass.getFTSText(name, JSON.parse(sdata[name]));
-                }
-                catch (e) {
-                    // Ignore error.
-                }
-                if (tokenString != null) {
-                    const tokens = this.tokenizer.tokenize(tokenString);
-                    while (tokens.length) {
-                        const currentTokens = tokens.splice(0, 100);
-                        const params = {
-                            guid,
-                            name,
-                        };
-                        const values = [];
-                        for (let i = 0; i < currentTokens.length; i++) {
-                            const token = currentTokens[i];
-                            params['token' + i] = token.token;
-                            params['position' + i] = token.position;
-                            params['stem' + i] = token.stem;
-                            values.push("(decode(@guid, 'hex'), @name, @token" +
-                                i +
-                                ', @position' +
-                                i +
-                                ', @stem' +
-                                i +
-                                ')');
+            if (only == null || only === 'tokens') {
+                for (let name in sdata) {
+                    let tokenString = null;
+                    try {
+                        tokenString = EntityClass.getFTSText(name, JSON.parse(sdata[name]));
+                    }
+                    catch (e) {
+                        // Ignore error.
+                    }
+                    if (tokenString != null) {
+                        const tokens = this.tokenizer.tokenize(tokenString);
+                        while (tokens.length) {
+                            const currentTokens = tokens.splice(0, 100);
+                            const params = {
+                                guid,
+                                name,
+                            };
+                            const values = [];
+                            for (let i = 0; i < currentTokens.length; i++) {
+                                const token = currentTokens[i];
+                                params['token' + i] = token.token;
+                                params['position' + i] = token.position;
+                                params['stem' + i] = token.stem;
+                                values.push("(decode(@guid, 'hex'), @name, @token" +
+                                    i +
+                                    ', @position' +
+                                    i +
+                                    ', @stem' +
+                                    i +
+                                    ')');
+                            }
+                            promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} ("guid", "name", "token", "position", "stem") VALUES ${values.join(', ')};`, {
+                                etypes: [etype],
+                                params,
+                            }));
                         }
-                        promises.push(this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}tokens_${etype}`)} ("guid", "name", "token", "position", "stem") VALUES ${values.join(', ')};`, {
-                            etypes: [etype],
-                            params,
-                        }));
                     }
                 }
             }
-            if (!onlyTokens) {
+            if (only == null) {
                 const uniques = await EntityClass.getUniques({
                     guid,
                     cdate,
@@ -2215,12 +2286,21 @@ export default class PostgreSQLDriver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
-                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (decode(@guid, 'hex'), @tags, @cdate, @cdate);`, {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
+                await this.queryRun(`INSERT INTO ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (decode(@guid, 'hex'), @tags, @cdate, @cdate, ${user == null ? '@user' : "decode(@user, 'hex')"}, ${group == null ? '@group' : "decode(@group, 'hex')"}, @acUser, @acGroup, @acOther, ${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, ${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, ${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"});`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags,
                         cdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
                     },
                 });
                 await insertData(guid, data, sdata, uniques, etype);
@@ -2230,6 +2310,7 @@ export default class PostgreSQLDriver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
                 const promises = [];
                 promises.push(this.queryRun(`SELECT 1 FROM ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=decode(@guid, 'hex') FOR UPDATE;`, {
                     etypes: [etype],
@@ -2262,11 +2343,19 @@ export default class PostgreSQLDriver extends NymphDriver {
                     },
                 }));
                 await Promise.all(promises);
-                const info = await this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=decode(@guid, 'hex') AND "mdate" <= @emdate;`, {
+                const info = await this.queryRun(`UPDATE ${PostgreSQLDriver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate, "user"=${user == null ? '@user' : "decode(@user, 'hex')"}, "group"=${group == null ? '@group' : "decode(@group, 'hex')"}, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=${!acRead?.length ? '@acRead' : "array(SELECT decode(n, 'hex') FROM unnest(@acRead::text[]) AS n)"}, "acWrite"=${!acWrite?.length ? '@acWrite' : "array(SELECT decode(n, 'hex') FROM unnest(@acWrite::text[]) AS n)"}, "acFull"=${!acFull?.length ? '@acFull' : "array(SELECT decode(n, 'hex') FROM unnest(@acFull::text[]) AS n)"} WHERE "guid"=decode(@guid, 'hex') AND "mdate" <= @emdate;`, {
                     etypes: [etype],
                     params: {
                         tags,
                         mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead,
+                        acWrite,
+                        acFull,
                         guid,
                         emdate: isNaN(Number(entity.mdate)) ? 0 : Number(entity.mdate),
                     },
@@ -2408,15 +2497,42 @@ export default class PostgreSQLDriver extends NymphDriver {
         if (!table2 || !table2.table_name) {
             return 'tokens';
         }
+        const table3 = await this.queryGet('SELECT "table_name" AS "table_name" FROM "information_schema"."tables" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name" LIKE @prefix LIMIT 1;', {
+            params: {
+                db: this.config.database,
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
+        if (table3?.name) {
+            const result = await this.queryGet('SELECT 1 AS "exists" FROM "information_schema"."columns" WHERE "table_catalog"=@db AND "table_schema"=\'public\' AND "table_name"=@table AND "column_name"=\'user\';', {
+                params: {
+                    db: this.config.database,
+                    table: table3.table_name,
+                },
+            });
+            if (!result?.exists) {
+                return 'tilmeldColumns';
+            }
+        }
         return false;
     }
-    async liveMigration(_migrationType) {
-        const etypes = await this.getEtypes();
-        const connection = await this.getConnection(true);
-        for (let etype of etypes) {
-            await this.createTokensTable(etype, connection);
+    async liveMigration(migrationType) {
+        if (migrationType === 'tokenTables') {
+            const etypes = await this.getEtypes();
+            const connection = await this.getConnection(true);
+            for (let etype of etypes) {
+                await this.createTokensTable(etype, connection);
+            }
+            connection.done();
+        }
+        else if (migrationType === 'tilmeldColumns') {
+            const etypes = await this.getEtypes();
+            const connection = await this.getConnection(true);
+            for (let etype of etypes) {
+                await this.addTilmeldColumnsAndIndexes(etype, connection);
+            }
+            connection.done();
         }
-        connection.done();
     }
 }
 //# sourceMappingURL=PostgreSQLDriver.js.map