@nymphjs/driver-sqlite3 1.0.0-beta.106 → 1.0.0-beta.108

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.108](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.107...v1.0.0-beta.108) (2026-02-15)
+
+### Bug Fixes
+
+- add column syntax in sqlite ([c1fa882](https://github.com/sciactive/nymphjs/commit/c1fa882b8ed9ee11f72ae3a9a902627186403de5))
+
+# [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/SQLite3Driver.d.ts

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

@@ -179,10 +179,32 @@ export default class SQLite3Driver extends NymphDriver {
     }
     createEntitiesTable(etype) {
         // Create the entity table.
-        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid" CHARACTER(24) PRIMARY KEY, "tags" TEXT, "cdate" REAL NOT NULL, "mdate" REAL NOT NULL);`);
+        this.queryRun(`CREATE TABLE IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid" CHARACTER(24) PRIMARY KEY, "tags" TEXT, "cdate" REAL NOT NULL, "mdate" REAL NOT NULL, "user" CHARACTER(24), "group" CHARACTER(24), "acUser" INT(1), "acGroup" INT(1), "acOther" INT(1), "acRead" TEXT, "acWrite" TEXT, "acFull" TEXT);`);
         this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_cdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("cdate");`);
         this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_mdate`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("mdate");`);
         this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_tags`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("tags");`);
+        this.createEntitiesTilmeldIndexes(etype);
+    }
+    addTilmeldColumnsAndIndexes(etype) {
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "user" CHARACTER(24);`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "group" CHARACTER(24);`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acUser" INT(1);`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acGroup" INT(1);`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acOther" INT(1);`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acRead" TEXT;`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acWrite" TEXT;`);
+        this.queryRun(`ALTER TABLE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ADD COLUMN "acFull" TEXT;`);
+        this.createEntitiesTilmeldIndexes(etype);
+    }
+    createEntitiesTilmeldIndexes(etype) {
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_user_acUser`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("user", "acUser");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_group_acGroup`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("group", "acGroup");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acUser`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acUser");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acGroup`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acGroup");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acOther`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acOther");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acRead`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acRead");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acWrite`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acWrite");`);
+        this.queryRun(`CREATE INDEX IF NOT EXISTS ${SQLite3Driver.escape(`${this.prefix}entities_${etype}_id_acFull`)} ON ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("acFull");`);
     }
     createDataTable(etype) {
         // Create the data table.
@@ -1651,14 +1673,17 @@ export default class SQLite3Driver 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 {
-            if (!onlyTokens) {
+            if (only == null) {
                 this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} WHERE "guid"=@guid;`, {
                     etypes: [etype],
                     params: {
@@ -1678,13 +1703,15 @@ export default class SQLite3Driver extends NymphDriver {
                     },
                 });
             }
-            this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=@guid;`, {
-                etypes: [etype],
-                params: {
-                    guid,
-                },
-            });
-            if (!onlyTokens) {
+            if (only == null || only === 'tokens') {
+                this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} WHERE "guid"=@guid;`, {
+                    etypes: [etype],
+                    params: {
+                        guid,
+                    },
+                });
+            }
+            if (only == null) {
                 this.queryRun(`DELETE FROM ${SQLite3Driver.escape(`${this.prefix}uniques_${etype}`)} WHERE "guid"=@guid;`, {
                     etypes: [etype],
                     params: {
@@ -1692,14 +1719,23 @@ export default class SQLite3Driver extends NymphDriver {
                     },
                 });
             }
-            if (!onlyTokens) {
-                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @mdate);`, {
+            if (only == null) {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (@guid, @tags, @cdate, @mdate, @user, @group, @acUser, @acGroup, @acOther, @acRead, @acWrite, @acFull);`, {
                     etypes: [etype],
                     params: {
                         guid,
                         tags: ',' + tags.join(',') + ',',
                         cdate,
                         mdate,
+                        user,
+                        group,
+                        acUser,
+                        acGroup,
+                        acOther,
+                        acRead: acRead && ',' + acRead.join(',') + ',',
+                        acWrite: acWrite && ',' + acWrite.join(',') + ',',
+                        acFull: acFull && ',' + acFull.join(',') + ',',
                     },
                 });
                 for (const name in sdata) {
@@ -1739,45 +1775,64 @@ export default class SQLite3Driver extends NymphDriver {
                     }
                 }
             }
+            if (only === 'tilmeldAC') {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull } = this.removeAndReturnACValues(etype, {}, sdata);
+                this.queryRun(`UPDATE OR IGNORE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} SET "user"=@user, "group"=@group, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=@acRead, "acWrite"=@acWrite, "acFull"=@acFull WHERE "guid"=@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 ? 1 : 0;
-                            values.push('(@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 ? 1 : 0;
+                                values.push('(@guid, @name, @token' +
+                                    i +
+                                    ', @position' +
+                                    i +
+                                    ', @stem' +
+                                    i +
+                                    ')');
+                            }
+                            this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}tokens_${etype}`)} ("guid", "name", "token", "position", "stem") VALUES ${values.join(', ')};`, {
+                                etypes: [etype],
+                                params,
+                            });
                         }
-                        this.queryRun(`INSERT INTO ${SQLite3Driver.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,
@@ -2007,12 +2062,21 @@ export default class SQLite3Driver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
-                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate") VALUES (@guid, @tags, @cdate, @cdate);`, {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
+                this.queryRun(`INSERT INTO ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} ("guid", "tags", "cdate", "mdate", "user", "group", "acUser", "acGroup", "acOther", "acRead", "acWrite", "acFull") VALUES (@guid, @tags, @cdate, @cdate, @user, @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(',') + ',',
                     },
                 });
                 insertData(guid, data, sdata, uniques, etype);
@@ -2022,11 +2086,20 @@ export default class SQLite3Driver extends NymphDriver {
                     Object.keys(sdata).length === 0) {
                     return false;
                 }
-                const info = this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate WHERE "guid"=@guid AND "mdate" <= @emdate;`, {
+                let { user, group, acUser, acGroup, acOther, acRead, acWrite, acFull, } = this.removeAndReturnACValues(etype, data, sdata);
+                const info = this.queryRun(`UPDATE ${SQLite3Driver.escape(`${this.prefix}entities_${etype}`)} SET "tags"=@tags, "mdate"=@mdate, "user"=@user, "group"=@group, "acUser"=@acUser, "acGroup"=@acGroup, "acOther"=@acOther, "acRead"=@acRead, "acWrite"=@acWrite, "acFull"=@acFull WHERE "guid"=@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: Number(entity.mdate),
                     },
@@ -2142,12 +2215,35 @@ export default class SQLite3Driver extends NymphDriver {
         if (!table2 || !table2.name) {
             return 'tokens';
         }
+        const table3 = this.queryGet("SELECT `name` FROM `sqlite_master` WHERE `type`='table' AND `name` LIKE @prefix LIMIT 1;", {
+            params: {
+                prefix: this.prefix + 'entities_' + '%',
+            },
+        });
+        if (table3?.name) {
+            const result = this.queryGet("SELECT 1 AS `exists` FROM pragma_table_info(@table) WHERE `name`='user';", {
+                params: {
+                    table: table3.name,
+                },
+            });
+            if (!result?.exists) {
+                return 'tilmeldColumns';
+            }
+        }
         return false;
     }
-    async liveMigration(_migrationType) {
-        const etypes = await this.getEtypes();
-        for (let etype of etypes) {
-            this.createTokensTable(etype);
+    async liveMigration(migrationType) {
+        if (migrationType === 'tokenTables') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                this.createTokensTable(etype);
+            }
+        }
+        else if (migrationType === 'tilmeldColumns') {
+            const etypes = await this.getEtypes();
+            for (let etype of etypes) {
+                this.addTilmeldColumnsAndIndexes(etype);
+            }
         }
     }
 }