@nymphjs/driver-mysql 1.0.0-beta.105 → 1.0.0-beta.107

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 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
+
+- don't sort qref queries unless explicitly told to ([e92c413](https://github.com/sciactive/nymphjs/commit/e92c413800032a9347a06f965281263a55c9547b))
+
 # [1.0.0-beta.105](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.104...v1.0.0-beta.105) (2025-12-04)
 
 ### Features

package/dist/MySQLDriver.d.ts

@@ -45,6 +45,8 @@ export default class MySQLDriver extends NymphDriver {
      */
     isConnected(): boolean;
     private createEntitiesTable;
+    private addTilmeldColumnsAndIndexes;
+    private createEntitiesTilmeldIndexes;
     private createDataTable;
     private createReferencesTable;
     private createTokensTable;
@@ -121,6 +123,14 @@ export default class MySQLDriver 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;
@@ -133,7 +143,7 @@ export default class MySQLDriver extends NymphDriver {
     setUID(name: string, curUid: number): Promise<boolean>;
     protected internalTransaction(name: string): Promise<MySQLDriverTransaction>;
     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/MySQLDriver.js

@@ -129,14 +129,51 @@ export default class MySQLDriver extends NymphDriver {
           \`tags\` LONGTEXT,
           \`cdate\` DOUBLE PRECISION NOT NULL,
           \`mdate\` DOUBLE PRECISION NOT NULL,
+          \`user\` BINARY(12),
+          \`group\` BINARY(12),
+          \`acUser\` TINYINT UNSIGNED,
+          \`acGroup\` TINYINT UNSIGNED,
+          \`acOther\` TINYINT UNSIGNED,
+          \`acRead\` LONGTEXT,
+          \`acWrite\` LONGTEXT,
+          \`acFull\` LONGTEXT,
           PRIMARY KEY (\`guid\`),
           INDEX \`id_guid\` USING HASH (\`guid\`),
           INDEX \`id_cdate\` USING BTREE (\`cdate\`),
           INDEX \`id_mdate\` USING BTREE (\`mdate\`),
-          FULLTEXT \`id_tags\` (\`tags\`)
+          FULLTEXT \`id_tags\` (\`tags\`),
+          INDEX \`id_user_acUser\` USING BTREE (\`user\`, \`acUser\`),
+          INDEX \`id_group_acGroup\` USING BTREE (\`group\`, \`acGroup\`),
+          INDEX \`id_acUser\` USING BTREE (\`acUser\`),
+          INDEX \`id_acGroup\` USING BTREE (\`acGroup\`),
+          INDEX \`id_acOther\` USING BTREE (\`acOther\`),
+          FULLTEXT \`id_acRead\` (\`acRead\`),
+          FULLTEXT \`id_acWrite\` (\`acWrite\`),
+          FULLTEXT \`id_acFull\` (\`acFull\`)
         ) ENGINE ${this.config.engine}
         CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;`);
     }
+    async addTilmeldColumnsAndIndexes(etype) {
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`user\` BINARY(12);`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`group\` BINARY(12);`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acUser\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acGroup\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acOther\` TINYINT UNSIGNED;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acRead\` LONGTEXT;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acWrite\` LONGTEXT;`);
+        await this.queryRun(`ALTER TABLE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN \`acFull\` LONGTEXT;`);
+        await this.createEntitiesTilmeldIndexes(etype);
+    }
+    async createEntitiesTilmeldIndexes(etype) {
+        await this.queryRun(`CREATE INDEX \`id_user_acUser\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`user\`, \`acUser\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_group_acGroup\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`group\`, \`acGroup\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acUser\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acUser\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acGroup\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acGroup\`) USING BTREE;`);
+        await this.queryRun(`CREATE INDEX \`id_acOther\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acOther\`) USING BTREE;`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acRead\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acRead\`);`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acWrite\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acWrite\`);`);
+        await this.queryRun(`CREATE FULLTEXT INDEX \`id_acFull\` ON ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`acFull\`);`);
+    }
     async createDataTable(etype) {
         let foreignKey = '';
         if (this.config.foreignKeys) {
@@ -1523,14 +1560,14 @@ export default class MySQLDriver extends NymphDriver {
                         break;
                     case 'selector':
                     case '!selector':
-                        const subquery = this.makeEntityQuery(options, [curValue], etype, count, params, true, tableSuffix, etypes);
+                        const innerquery = this.makeEntityQuery({ ...options, sort: null, limit: undefined }, [curValue], etype, count, params, true, tableSuffix, etypes);
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
                         curQuery +=
                             (xor(typeIsNot, clauseNot) ? 'NOT ' : '') +
                                 '(' +
-                                subquery.query +
+                                innerquery.query +
                                 ')';
                         break;
                     case 'qref':
@@ -1539,7 +1576,12 @@ export default class MySQLDriver extends NymphDriver {
                         const [qrefOptions, ...qrefSelectors] = curValue[1];
                         const QrefEntityClass = qrefOptions.class;
                         etypes.push(QrefEntityClass.ETYPE);
-                        const qrefQuery = this.makeEntityQuery({ ...qrefOptions, return: 'guid', class: QrefEntityClass }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, makeTableSuffix(), etypes, 'r' + referenceTableSuffix + '.`reference`');
+                        const qrefQuery = this.makeEntityQuery({
+                            ...qrefOptions,
+                            sort: qrefOptions.sort ?? null,
+                            return: 'guid',
+                            class: QrefEntityClass,
+                        }, qrefSelectors, QrefEntityClass.ETYPE, count, params, false, makeTableSuffix(), etypes, 'r' + referenceTableSuffix + '.`reference`');
                         if (curQuery) {
                             curQuery += typeIsOr ? ' OR ' : ' AND ';
                         }
@@ -1815,15 +1857,18 @@ export default class MySQLDriver extends NymphDriver {
         return result?.cur_uid ?? null;
     }
     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 ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
@@ -1843,13 +1888,15 @@ export default class MySQLDriver extends NymphDriver {
                     },
                 }));
             }
-            promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
-                etypes: [etype],
-                params: {
-                    guid,
-                },
-            }));
-            if (!onlyTokens) {
+            if (only == null || only === 'tokens') {
+                promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                    },
+                }));
+            }
+            if (only == null) {
                 promises.push(this.queryRun(`DELETE FROM ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WHERE \`guid\`=UNHEX(@guid);`, {
                     etypes: [etype],
                     params: {
@@ -1859,14 +1906,23 @@ export default class MySQLDriver extends NymphDriver {
             }
             await Promise.all(promises);
             promises = [];
-            if (!onlyTokens) {
-                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`) VALUES (UNHEX(@guid), @tags, @cdate, @mdate);`, {
+            if (only == null) {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`, \`user\`, \`group\`, \`acUser\`, \`acGroup\`, \`acOther\`, \`acRead\`, \`acWrite\`, \`acFull\`) VALUES (UNHEX(@guid), @tags, @cdate, @mdate, ${user == null ? '@user' : 'UNHEX(@user)'}, ${group == null ? '@group' : 'UNHEX(@group)'}, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags: ' ' + tags.join(' ') + ' ',
                         cdate: isNaN(cdate) ? null : cdate,
                         mdate: isNaN(mdate) ? null : mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead: acRead && ' ' + acRead.join(' ') + ' ',
+                        acWrite: acWrite && ' ' + acWrite.join(' ') + ' ',
+                        acFull: acFull && ' ' + acFull.join(' ') + ' ',
                     },
                 });
                 for (const name in sdata) {
@@ -1906,45 +1962,64 @@ export default class MySQLDriver extends NymphDriver {
                     }
                 }
             }
+            if (only === 'tilmeldAC') {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                promises.push(this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`user\`=${user == null ? '@user' : 'UNHEX(@user)'}, \`group\`=${group == null ? '@group' : 'UNHEX(@group)'}, \`acUser\`=@acUser, \`acGroup\`=@acGroup, \`acOther\`=@acOther, \`acRead\`=@acRead, \`acWrite\`=@acWrite, \`acFull\`=@acFull WHERE \`guid\`=UNHEX(@guid);`, {
+                    etypes: [etype],
+                    params: {
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead: acRead && ' ' + acRead.join(' ') + ' ',
+                        acWrite: acWrite && ' ' + acWrite.join(' ') + ' ',
+                        acFull: acFull && ' ' + acFull.join(' ') + ' ',
+                        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('(UNHEX(@guid), @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('(UNHEX(@guid), @name, @token' +
+                                    i +
+                                    ', @position' +
+                                    i +
+                                    ', @stem' +
+                                    i +
+                                    ')');
+                            }
+                            promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} (\`guid\`, \`name\`, \`token\`, \`position\`, \`stem\`) VALUES ${values.join(', ')};`, {
+                                etypes: [etype],
+                                params,
+                            }));
                         }
-                        promises.push(this.queryRun(`INSERT INTO ${MySQLDriver.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,
@@ -2164,12 +2239,21 @@ export default class MySQLDriver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
-                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`) VALUES (UNHEX(@guid), @tags, @cdate, @cdate);`, {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
+                await this.queryRun(`INSERT INTO ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} (\`guid\`, \`tags\`, \`cdate\`, \`mdate\`, \`user\`, \`group\`, \`acUser\`, \`acGroup\`, \`acOther\`, \`acRead\`, \`acWrite\`, \`acFull\`) VALUES (UNHEX(@guid), @tags, @cdate, @cdate, ${user == null ? '@user' : 'UNHEX(@user)'}, ${group == null ? '@group' : 'UNHEX(@group)'}, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags: ' ' + tags.join(' ') + ' ',
                         cdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead: acRead && ' ' + acRead.join(' ') + ' ',
+                        acWrite: acWrite && ' ' + acWrite.join(' ') + ' ',
+                        acFull: acFull && ' ' + acFull.join(' ') + ' ',
                     },
                 });
                 await insertData(guid, data, sdata, uniques, etype);
@@ -2179,6 +2263,7 @@ export default class MySQLDriver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
                 if (this.config.rowLocking) {
                     const promises = [];
                     promises.push(this.queryRun(`SELECT 1 FROM ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WHERE \`guid\`=UNHEX(@guid) GROUP BY 1 FOR UPDATE;`, {
@@ -2216,11 +2301,19 @@ export default class MySQLDriver extends NymphDriver {
                 if (this.config.tableLocking) {
                     await this.queryRun(`LOCK TABLES ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}data_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}references_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}tokens_${etype}`)} WRITE, ${MySQLDriver.escape(`${this.prefix}uniques_${etype}`)} WRITE;`);
                 }
-                const info = await this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`tags\`=@tags, \`mdate\`=@mdate WHERE \`guid\`=UNHEX(@guid) AND \`mdate\` <= @emdate;`, {
+                const info = await this.queryRun(`UPDATE ${MySQLDriver.escape(`${this.prefix}entities_${etype}`)} SET \`tags\`=@tags, \`mdate\`=@mdate, \`user\`=${user == null ? '@user' : 'UNHEX(@user)'}, \`group\`=${group == null ? '@group' : 'UNHEX(@group)'}, \`acUser\`=@acUser, \`acGroup\`=@acGroup, \`acOther\`=@acOther, \`acRead\`=@acRead, \`acWrite\`=@acWrite, \`acFull\`=@acFull WHERE \`guid\`=UNHEX(@guid) AND \`mdate\` <= @emdate;`, {
                     etypes: [etype],
                     params: {
                         tags: ' ' + tags.join(' ') + ' ',
                         mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead: acRead && ' ' + acRead.join(' ') + ' ',
+                        acWrite: acWrite && ' ' + acWrite.join(' ') + ' ',
+                        acFull: acFull && ' ' + acFull.join(' ') + ' ',
                         guid,
                         emdate: isNaN(Number(entity.mdate)) ? 0 : Number(entity.mdate),
                     },
@@ -2355,12 +2448,37 @@ export default class MySQLDriver 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_schema`=@db 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_schema`=@db 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();
-        for (let etype of etypes) {
-            await this.createTokensTable(etype);
+    async liveMigration(migrationType) {
+        if (migrationType === 'tokenTables') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                await this.createTokensTable(etype);
+            }
+        }
+        else if (migrationType === 'tilmeldColumns') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                await this.addTilmeldColumnsAndIndexes(etype);
+            }
         }
     }
 }