edinburgh 0.1.3 → 0.4.1

package/src/indexes.ts

@@ -1,13 +1,11 @@
-import * as olmdb from "olmdb";
-import { DatabaseError } from "olmdb";
-import { Bytes } from "./bytes.js";
-import { getMockModel, Model, modelRegistry } from "./models.js";
-import { assert, logLevel } from "./utils.js";
+import * as lowlevel from "olmdb/lowlevel";
+import { DatabaseError } from "olmdb/lowlevel";
+import DataPack from "./datapack.js";
+import { FieldConfig, getMockModel, Model, Transaction, currentTxn } from "./models.js";
+import { scheduleInit, transact } from "./edinburgh.js";
+import { assert, logLevel, dbGet, dbPut, dbDel, hashBytes, toBuffer } from "./utils.js";
 import { deserializeType, serializeType, TypeWrapper } from "./types.js";
 
-/** @internal Symbol used to access the underlying model from a proxy */
-export const TARGET_SYMBOL = Symbol('target');
-
 // Index system types and utilities
 type IndexArgTypes<M extends typeof Model<any>, F extends readonly (keyof InstanceType<M> & string)[]> = {
     [I in keyof F]: InstanceType<M>[F[I]]
@@ -15,43 +13,56 @@ type IndexArgTypes<M extends typeof Model<any>, F extends readonly (keyof Instan
 
 const MAX_INDEX_ID_PREFIX = -1;
 const INDEX_ID_PREFIX = -2;
+const VERSION_INFO_PREFIX = -3;
+
+const MAX_INDEX_ID_BUFFER = new DataPack().write(MAX_INDEX_ID_PREFIX).toUint8Array();
+
+/** Cached information about a specific version of a primary index's value format. */
+interface VersionInfo {
+    migrateHash: number;
+    /** Non-key field names → TypeWrappers for deserialization of this version's data. */
+    nonKeyFields: Map<string, TypeWrapper<any>>;
+    /** Set of serialized secondary index signatures that existed in this version. */
+    secondaryKeys: Set<string>;
+}
+
+function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
+    if (a.length !== b.length) return false;
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) return false;
+    }
+    return true;
+}
 
 /**
  * Iterator for range queries on indexes.
  * Handles common iteration logic for both primary and unique indexes.
  * Implements both Iterator and Iterable interfaces for efficiency.
  */
-class IndexRangeIterator<M extends typeof Model, F extends readonly (keyof InstanceType<M> & string)[]> implements Iterator<InstanceType<M>>, Iterable<InstanceType<M>> {
+export class IndexRangeIterator<M extends typeof Model> implements Iterator<InstanceType<M>>, Iterable<InstanceType<M>> {
     constructor(
-        private iterator: olmdb.DbIterator<any,any> | undefined,
+        private txn: Transaction,
+        private iteratorId: number,
         private indexId: number,
-        private parentIndex: BaseIndex<M, F>
-    ) {}
+        private parentIndex: BaseIndex<M, any>
+    ) {
+    }
 
     [Symbol.iterator](): Iterator<InstanceType<M>> {
         return this;
     }
 
     next(): IteratorResult<InstanceType<M>> {
-        if (!this.iterator) return { done: true, value: undefined };
-        const entry = this.iterator.next();
-        if (entry.done) {
-            this.iterator.close();
+        if (this.iteratorId < 0) return { done: true, value: undefined };
+        const raw = lowlevel.readIterator(this.iteratorId);
+        if (!raw) {
+            lowlevel.closeIterator(this.iteratorId);
+            this.iteratorId = -1;
             return { done: true, value: undefined };
         }
         
-        // Extract the key without the index ID
-        const keyBytes = new Bytes(entry.value.key);
-        const entryIndexId = keyBytes.readNumber();
-        assert(entryIndexId === this.indexId);
-
-        // Use polymorphism to get the model from the entry
-        const model = this.parentIndex._getModelFromEntry(keyBytes, new Bytes(entry.value.value));
-
-        if (!model) {
-            // This shouldn't happen, but skip if it does
-            return this.next();
-        }
+        // Dispatches to the _pairToInstance specific to the index type
+        const model = this.parentIndex._pairToInstance(this.txn, raw.key, raw.value);
 
         return { done: false, value: model };
     }
@@ -109,160 +120,150 @@ type FindOptions<ARG_TYPES extends readonly any[]> = (
  */
 export abstract class BaseIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> {
     public _MyModel: M;
+    public _fieldTypes: Map<keyof InstanceType<M> & string, TypeWrapper<any>> = new Map();
+    public _fieldCount!: number;
+    _resetIndexFieldDescriptors: Record<string | symbol | number, PropertyDescriptor> = {};
     
     /**
      * Create a new index.
      * @param MyModel - The model class this index belongs to.
      * @param _fieldNames - Array of field names that make up this index.
      */
-    constructor(MyModel: M, public _fieldNames: F, isPrimary: boolean=false) {
-        this._MyModel = MyModel = getMockModel(MyModel);
-        // The primary key should be [0] in _indexes
-        (MyModel._indexes ||= [])[isPrimary ? 'unshift' : 'push'](this);
+    constructor(MyModel: M, public _fieldNames: F) {
+        this._MyModel = getMockModel(MyModel);
     }
 
-    _cachedIndexId?: number;
-
-    /**
-     * Deserialize index key bytes back to field values.
-     * @param bytes - Bytes to read from.
-     * @returns Array of field values.
-     */
-    _deserializeKey(bytes: Bytes): IndexArgTypes<M, F> {
-        const result: IndexArgTypes<M, F> = [] as any;
-        for (let i = 0; i < this._fieldNames.length; i++) {
-            const fieldName = this._fieldNames[i];
-            const fieldConfig = (this._MyModel.fields as any)[fieldName] as any;
-            fieldConfig.type.deserialize(result, i, bytes);
+    async _delayedInit() {
+        if (this._indexId != null) return; // Already initialized
+        for(const fieldName of this._fieldNames) {
+            assert(typeof fieldName === 'string', 'Field names must be strings');
+            this._fieldTypes.set(fieldName, this._MyModel.fields[fieldName].type);
+        }
+        this._fieldCount = this._fieldNames.length;
+        await this._retrieveIndexId();
+
+        // Human-readable signature for version tracking, e.g. "secondary category:string"
+        this._signature = this._getTypeName() + ' ' +
+            Array.from(this._fieldTypes.entries()).map(([n, t]) => n + ':' + t).join(' ');
+
+        for(const fieldName of this._fieldTypes.keys()) {
+            this._resetIndexFieldDescriptors[fieldName] = {
+                writable: true,
+                configurable: true,
+                enumerable: true
+            };
         }
-        return result;
     }
 
-    /**
-     * Extract model from iterator entry - implemented differently by each index type.
-     * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
-     * @returns Model instance or undefined.
-     * @internal
-     */
-    abstract _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined;
+    _indexId?: number;
+
+    /** Human-readable signature for version tracking, e.g. "secondary category:string" */
+    _signature?: string;
 
     /**
-     * Serialize field values to bytes for index key.
+     * Serialize array of key values to a (index-id prefixed) Bytes instance that can be used as a key.
      * @param args - Field values to serialize (can be partial for range queries).
-     * @param bytes - Bytes to write to.
+     * @returns A Bytes instance containing the index id and serialized key parts.
      * @internal
      */
-    _serializeArgs(args: Partial<IndexArgTypes<M, F>> | readonly any[], bytes: Bytes) {
-        const argsArray = Array.isArray(args) ? args : Object.values(args);
-        assert(argsArray.length <= this._fieldNames.length);
-        for (let i = 0; i < argsArray.length; i++) {
-            const fieldName = this._fieldNames[i];
-            const fieldConfig = this._MyModel.fields[fieldName];
-            fieldConfig.type.validateAndSerialize(argsArray, i, bytes);
+    _argsToKeyBytes(args: [], allowPartial: boolean): DataPack;
+    _argsToKeyBytes(args: Partial<IndexArgTypes<M, F>>, allowPartial: boolean): DataPack;
+
+    _argsToKeyBytes(args: any, allowPartial: boolean) {
+        assert(allowPartial ? args.length <= this._fieldCount : args.length === this._fieldCount);
+        const bytes = new DataPack();
+        bytes.write(this._indexId!);
+        let index = 0;
+        for(const fieldType of this._fieldTypes.values()) {
+            // For partial keys, undefined values are acceptable and represent open range suffixes
+            if (index >= args.length) break;
+            fieldType.serialize(args[index++], bytes);
         }
+        return bytes;
     }
 
     /**
-     * Create database key from field values.
-     * @param args - Field values.
-     * @returns Database key bytes.
+     * Extract model from iterator entry - implemented differently by each index type.
+     * @param keyBuffer - Key bytes (including index id).
+     * @param valueBuffer - Value bytes from the entry.
+     * @returns Model instance or undefined.
+     * @internal
      */
-    _getKeyFromArgs(args: IndexArgTypes<M, F>): Uint8Array {
-        assert(args.length === this._fieldNames.length);
-        let indexId = this._getIndexId();
-        let keyBytes = new Bytes().writeNumber(indexId);
-        this._serializeArgs(args, keyBytes);
-        return keyBytes.getBuffer();
-    }
+    abstract _pairToInstance(txn: Transaction, keyBuffer: ArrayBuffer, valueBuffer: ArrayBuffer): InstanceType<M>;
 
-    /**
-     * Serialize model fields to bytes for index key.
-     * @param model - Model instance.
-     * @param bytes - Bytes to write to.
-     */
-    _serializeModel(model: InstanceType<M>, bytes: Bytes) {
-        for (let i = 0; i < this._fieldNames.length; i++) {
-            const fieldName = this._fieldNames[i];
-            const fieldConfig = this._MyModel.fields[fieldName];
-            fieldConfig.type.validateAndSerialize(model, fieldName, bytes, model);
+    _hasNullIndexValues(data: Record<string, any>) {
+        for(const fieldName of this._fieldTypes.keys()) {
+            if (data[fieldName] == null) return true;
         }
+        return false;
     }
 
-    /**
-     * Create database key from model instance.
-     * @param model - Model instance.
-     * @param includeIndexId - Whether to include index ID in key.
-     * @returns Database key bytes or undefined if skipped.
-     * @internal
-     */
-    _getKeyFromModel(model: InstanceType<M>, includeIndexId: boolean): Uint8Array {
-        const bytes = new Bytes();
-        if (includeIndexId) bytes.writeNumber(this._getIndexId());
-        this._serializeModel(model, bytes);
-        return bytes.getBuffer();
-    }
+    // Must return the exact key that will be used to write to the K/V store
+    abstract _serializeKey(primaryKey: Uint8Array, data: Record<string, any>): Uint8Array;
 
-    /**
-     * Extract field values from model for this index.
-     * @param model - Model instance.
-     * @returns Field values or undefined if should be skipped.
-     * @internal
-     */
-    _modelToArgs(model: InstanceType<M>): IndexArgTypes<M, F> | undefined {
-        return this._checkSkip(model) ? undefined: this._fieldNames.map((fieldName) => model[fieldName]) as unknown as IndexArgTypes<M, F>;
+    // Returns the indexId + serialized key fields. Used in some _serializeKey implementations
+    // and for calculating _primaryKey.
+    _serializeKeyFields(data: Record<string, any>): DataPack {
+        const bytes = new DataPack();
+        bytes.write(this._indexId!);
+        for(const [fieldName, fieldType] of this._fieldTypes.entries()) {
+            fieldType.serialize(data[fieldName], bytes);
+        }
+        return bytes;
     }
 
     /**
-     * Get or create unique index ID for this index.
-     * @returns Numeric index ID.
+     * Retrieve (or create) a stable index ID from the DB, with retry on transaction races.
+     * Sets `this._indexId` on success.
      */
-    _getIndexId(): number {
-        // Resolve an index to a number
-        let indexId = this._cachedIndexId;
-        if (indexId == null) {
-            const indexNameBytes = new Bytes().writeNumber(INDEX_ID_PREFIX).writeString(this._MyModel.tableName).writeString(this._getTypeName());
-            for(let name of this._fieldNames) {
-                indexNameBytes.writeString(name);
+    async _retrieveIndexId(): Promise<void> {
+        const indexNameBytes = new DataPack().write(INDEX_ID_PREFIX).write(this._MyModel.tableName).write(this._getTypeName());
+        for(let name of this._fieldNames) {
+            indexNameBytes.write(name);
+            serializeType(this._MyModel.fields[name].type, indexNameBytes);
+        }
+        // For non-primary indexes, include primary key field info to avoid misinterpreting
+        // values when the primary key schema changes.
+        if (this._MyModel._primary !== (this as any)) {
+            indexNameBytes.write(undefined); // separator
+            for (const name of this._MyModel._primary._fieldNames) {
+                indexNameBytes.write(name);
                 serializeType(this._MyModel.fields[name].type, indexNameBytes);
             }
-            const indexNameBuf = indexNameBytes.getBuffer();
-
-            let result = olmdb.get(indexNameBuf);
-            if (result) {
-                indexId = this._cachedIndexId = new Bytes(result).readNumber();
-            } else {
-                const maxIndexIdBuf = new Bytes().writeNumber(MAX_INDEX_ID_PREFIX).getBuffer();
-                result = olmdb.get(maxIndexIdBuf);
-                indexId = result ? new Bytes(result).readNumber() + 1 : 1;
-                olmdb.onCommit(() => {
-                    // Only if the transaction succeeds can we cache this id
-                    this._cachedIndexId = indexId;
-                });
-
-                const idBuf = new Bytes().writeNumber(indexId).getBuffer();
-                olmdb.put(indexNameBuf, idBuf);
-                olmdb.put(maxIndexIdBuf, idBuf); // This will also cause the transaction to rerun if we were raced
-                if (logLevel >= 1) {
-                    console.log(`Created index ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] with id ${indexId}`);
+        }
+        const indexNameBuf = indexNameBytes.toUint8Array();
+
+        while (true) {
+            const txnId = lowlevel.startTransaction();
+            try {
+                let result = dbGet(txnId, indexNameBuf);
+                let id: number;
+                if (result) {
+                    id = new DataPack(result).readNumber();
+                } else {
+                    result = dbGet(txnId, MAX_INDEX_ID_BUFFER);
+                    id = result ? new DataPack(result).readNumber() + 1 : 1;
+                    const idBuf = new DataPack().write(id).toUint8Array();
+                    dbPut(txnId, indexNameBuf, idBuf);
+                    dbPut(txnId, MAX_INDEX_ID_BUFFER, idBuf);
+                    if (logLevel >= 1) console.log(`[edinburgh] Create index ${this}`);
+                }
+                const commitResult = lowlevel.commitTransaction(txnId);
+                const commitSeq = typeof commitResult === 'number' ? commitResult : await commitResult;
+                if (commitSeq > 0) {
+                    this._indexId = id;
+                    return;
                 }
+            } catch (e) {
+                try { lowlevel.abortTransaction(txnId); } catch {}
+                throw e;
             }
         }
-        return indexId;
     }
 
-    /**
-     * Check if indexing should be skipped for a model instance.
-     * @param model - Model instance.
-     * @returns true if indexing should be skipped.
-     */
-    _checkSkip(model: InstanceType<M>): boolean {
-        for (const fieldName of this._fieldNames) {
-            const fieldConfig = this._MyModel.fields[fieldName] as any;
-            if (fieldConfig.type.checkSkipIndex(model, fieldName)) return true;
-        }
-        return false;
-    }
+
+    abstract _delete(txn: Transaction, primaryKey: Uint8Array, model: InstanceType<M>): void;
+    abstract _write(txn: Transaction, primaryKey: Uint8Array, model: InstanceType<M>): void;
 
     /**
      * Find model instances using flexible range query options.
@@ -322,64 +323,135 @@ export abstract class BaseIndex<M extends typeof Model, const F extends readonly
      * }
      * ```
      */
-    public find(opts: FindOptions<IndexArgTypes<M, F>> = {}): IndexRangeIterator<M,F> {
-        const indexId = this._getIndexId();
-        
-        let startKey: Bytes | undefined = new Bytes().writeNumber(indexId);
-        let endKey: Bytes | undefined = startKey.copy();
-
+    _computeKeyBounds(opts: FindOptions<IndexArgTypes<M, F>>): [DataPack | undefined, DataPack | undefined] | null {
+        let startKey: DataPack | undefined;
+        let endKey: DataPack | undefined;
         if ('is' in opts) {
-            // Exact match - set both start and end to the same value
-            this._serializeArgs(toArray(opts.is), startKey);
-            endKey = startKey.copy().increment();
+            startKey = this._argsToKeyBytes(toArray(opts.is), true);
+            endKey = startKey.clone(true).increment();
         } else {
-            // Range query
             if ('from' in opts) {
-                this._serializeArgs(toArray(opts.from), startKey);
+                startKey = this._argsToKeyBytes(toArray(opts.from), true);
             } else if ('after' in opts) {
-                this._serializeArgs(toArray(opts.after), startKey);
-                if (!startKey.increment()) {
-                    // There can be nothing 'after' - return an empty iterator
-                    return new IndexRangeIterator(undefined, indexId, this);
-                }
+                startKey = this._argsToKeyBytes(toArray(opts.after), true);
+                if (!startKey.increment()) return null;
+            } else {
+                startKey = this._argsToKeyBytes([], true);
             }
-            
             if ('to' in opts) {
-                this._serializeArgs(toArray(opts.to), endKey);
-                endKey.increment();
+                endKey = this._argsToKeyBytes(toArray(opts.to), true).increment();
             } else if ('before' in opts) {
-                this._serializeArgs(toArray(opts.before), endKey);
+                endKey = this._argsToKeyBytes(toArray(opts.before), true);
             } else {
-                endKey = endKey.increment(); // Next indexId
+                endKey = this._argsToKeyBytes([], true).increment();
             }
         }
+        return [startKey, endKey];
+    }
+
+    public find(opts: FindOptions<IndexArgTypes<M, F>> = {}): IndexRangeIterator<M> {
+        const txn = currentTxn();
+        const indexId = this._indexId!;
+
+        const bounds = this._computeKeyBounds(opts);
+        if (!bounds) return new IndexRangeIterator(txn, -1, indexId, this);
+        const [startKey, endKey] = bounds;
 
         // For reverse scans, swap start/end keys since OLMDB expects it
         const scanStart = opts.reverse ? endKey : startKey;
         const scanEnd = opts.reverse ? startKey : endKey;
 
-        const iterator = olmdb.scan({
-            start: scanStart?.getBuffer(),
-            end: scanEnd?.getBuffer(),
-            reverse: opts.reverse || false,
-        });
+        if (logLevel >= 3) {
+            console.log(`[edinburgh] Scan ${this} start=${scanStart} end=${scanEnd} reverse=${opts.reverse||false}`);
+        }
+        const startBuf = scanStart?.toUint8Array();
+        const endBuf = scanEnd?.toUint8Array();
+        const iteratorId = lowlevel.createIterator(
+            txn.id,
+            startBuf ? toBuffer(startBuf) : undefined,
+            endBuf ? toBuffer(endBuf) : undefined,
+            opts.reverse || false,
+        );
         
-        return new IndexRangeIterator(iterator, indexId, this);
+        return new IndexRangeIterator(txn, iteratorId, indexId, this);
     }
 
     /**
-     * Save index entry for a model instance.
-     * @param model - Model instance to save.
-     * @param originalKey - Original key if updating.
+     * Process all matching rows in batched transactions.
+     *
+     * Uses the same query options as {@link find}. The batch is committed and a new
+     * transaction started once either `limitSeconds` or `limitRows` is exceeded.
+     *
+     * @param opts - Query options (same as `find()`), plus:
+     * @param opts.limitSeconds - Max seconds per transaction batch (default: 1)
+     * @param opts.limitRows - Max rows per transaction batch (default: 4096)
+     * @param callback - Called for each matching row within a transaction
      */
-    abstract _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined;
+    public async batchProcess(
+        opts: FindOptions<IndexArgTypes<M, F>> & { limitSeconds?: number; limitRows?: number } = {} as any,
+        callback: (row: InstanceType<M>) => void | Promise<void>
+    ): Promise<void> {
+        const limitMs = (opts.limitSeconds ?? 1) * 1000;
+        const limitRows = opts.limitRows ?? 4096;
+        const reverse = opts.reverse ?? false;
+
+        const bounds = this._computeKeyBounds(opts);
+        if (!bounds) return;
+        const startKey = bounds[0]?.toUint8Array();
+        const endKey = bounds[1]?.toUint8Array();
+        let cursor: Uint8Array | undefined;
+
+        while (true) {
+            const next = await transact(async (): Promise<Uint8Array | null> => {
+                const txn = currentTxn();
+                const batchStart = cursor && !reverse ? cursor : startKey;
+                const batchEnd = cursor && reverse ? cursor : endKey;
+                const scanStart = reverse ? batchEnd : batchStart;
+                const scanEnd = reverse ? batchStart : batchEnd;
+
+                const iteratorId = lowlevel.createIterator(
+                    txn.id,
+                    scanStart ? toBuffer(scanStart) : undefined,
+                    scanEnd ? toBuffer(scanEnd) : undefined,
+                    reverse,
+                );
+
+                const t0 = Date.now();
+                let count = 0;
+                let lastRawKey: Uint8Array | undefined;
+                try {
+                    while (true) {
+                        const raw = lowlevel.readIterator(iteratorId);
+                        if (!raw) return null;
+                        lastRawKey = new Uint8Array(raw.key);
+                        await callback(this._pairToInstance(txn, raw.key, raw.value));
+                        if (++count >= limitRows || Date.now() - t0 >= limitMs) break;
+                    }
+                } finally {
+                    lowlevel.closeIterator(iteratorId);
+                }
+
+                lastRawKey = lastRawKey.slice(); // Copy, as lastRawKey points at OLMDB's internal read-only mmap
+                if (reverse) return lastRawKey!;
+                const nk = new DataPack(lastRawKey!);
+                return nk.increment() ? nk.toUint8Array() : null;
+            });
+
+            if (next === null) break;
+            cursor = next;
+        }
+    }
 
     abstract _getTypeName(): string;
+
+    toString() {
+        return `${this._indexId}:${this._MyModel.tableName}:${this._getTypeName()}[${Array.from(this._fieldTypes.keys()).join(',')}]`;
+    }
 }
 
-function toArray<T>(args: T): T extends readonly any[] ? T : [T] {
-    // Use type assertion to satisfy TypeScript while maintaining runtime correctness
-    return (Array.isArray(args) ? args : [args]) as T extends readonly any[] ? T : [T];
+function toArray<ARG_TYPES extends readonly any[]>(args: ArrayOrOnlyItem<ARG_TYPES>): Partial<ARG_TYPES> {
+    // Convert single value or array to array format compatible with Partial<ARG_TYPES>
+    return (Array.isArray(args) ? args : [args]) as Partial<ARG_TYPES>;
 }
 
 /**
@@ -389,13 +461,149 @@ function toArray<T>(args: T): T extends readonly any[] ? T : [T] {
  * @template F - The field names that make up this index.
  */
 export class PrimaryIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
-    
+
+    _nonKeyFields!: (keyof InstanceType<M> & string)[];
+    _lazyDescriptors: Record<string | symbol | number, PropertyDescriptor> = {};
+    _resetDescriptors: Record<string | symbol | number, PropertyDescriptor> = {};
+    _freezePrimaryKeyDescriptors: Record<string | symbol | number, PropertyDescriptor> = {};
+
+    /** Current version number for this primary index's value format. */
+    _currentVersion!: number;
+    /** Hash of the current migrate() function source, or 0 if none. */
+    _currentMigrateHash!: number;
+    /** Cached version info for old versions (loaded on demand). */
+    _versions: Map<number, VersionInfo> = new Map();
+
     constructor(MyModel: M, fieldNames: F) {
-        super(MyModel, fieldNames, true);
-        if (MyModel._pk && MyModel._pk !== this) {
-            throw new DatabaseError(`Model ${MyModel.tableName} already has a primary key defined`, 'INIT_ERROR');
+        super(MyModel, fieldNames);
+        if (MyModel._primary) {
+            throw new DatabaseError(`There's already a primary index defined: ${MyModel._primary}. This error may also indicate that your tsconfig.json needs to have "target": "ES2022" set.`, 'INIT_ERROR');
+        }
+        MyModel._primary = this;
+    }
+
+    async _delayedInit() {
+        if (this._indexId != null) return; // Already initialized
+        await super._delayedInit();
+        const MyModel = this._MyModel;
+        this._nonKeyFields = Object.keys(MyModel.fields).filter(fieldName => !this._fieldNames.includes(fieldName as any)) as any;
+
+        for(const fieldName of this._nonKeyFields) {
+            this._lazyDescriptors[fieldName] = {
+                configurable: true,
+                enumerable: true,
+                get(this: InstanceType<M>) {
+                    this.constructor._primary._lazyNow(this);
+                    return this[fieldName];
+                },
+                set(this: InstanceType<M>, value: any) {
+                    this.constructor._primary._lazyNow(this);
+                    this[fieldName] = value;
+                }
+            };
+            this._resetDescriptors[fieldName] = {
+                writable: true,
+                enumerable: true
+            };
+        }
+
+        for(const fieldName of this._fieldNames) {
+            this._freezePrimaryKeyDescriptors[fieldName] = {
+                writable: false,
+                enumerable: true
+            };
+        }
+
+    }
+
+    /** Serialize the current version fingerprint as a DataPack object. */
+    _serializeVersionValue(): Uint8Array {
+        const fields: [string, Uint8Array][] = [];
+        for (const fieldName of this._nonKeyFields) {
+            const tp = new DataPack();
+            serializeType(this._MyModel.fields[fieldName].type, tp);
+            fields.push([fieldName, tp.toUint8Array()]);
+        }
+        return new DataPack().write({
+            migrateHash: this._currentMigrateHash,
+            fields,
+            secondaryKeys: new Set((this._MyModel._secondaries || []).map(sec => sec._signature!)),
+        }).toUint8Array();
+    }
+
+    /** Look up or create the current version number for this primary index. */
+    async _initVersioning(): Promise<void> {
+        // Compute migrate hash from function source
+        const migrateFn = (this._MyModel as any)._original?.migrate ?? (this._MyModel as any).migrate;
+        this._currentMigrateHash = migrateFn ? hashBytes(new TextEncoder().encode(migrateFn.toString().replace(/\s\s+/g, ' ').trim())) : 0;
+
+        const currentValueBytes = this._serializeVersionValue();
+
+        // Scan last 20 version info rows for this primary index
+        const scanStart = new DataPack().write(VERSION_INFO_PREFIX).write(this._indexId!);
+        const scanEnd = scanStart.clone(true).increment();
+
+        while (true) {
+            const txnId = lowlevel.startTransaction();
+            try {
+                const iteratorId = lowlevel.createIterator(
+                    txnId,
+                    scanEnd ? toBuffer(scanEnd.toUint8Array()) : undefined,
+                    toBuffer(scanStart.toUint8Array()),
+                    true // reverse - scan newest versions first
+                );
+
+                let count = 0;
+                let maxVersion = 0;
+                let found = false;
+
+                try {
+                    while (count < 20) {
+                        const raw = lowlevel.readIterator(iteratorId);
+                        if (!raw) break;
+                        count++;
+
+                        const keyPack = new DataPack(new Uint8Array(raw.key));
+                        keyPack.readNumber(); // skip VERSION_INFO_PREFIX
+                        keyPack.readNumber(); // skip indexId
+                        const versionNum = keyPack.readNumber();
+                        maxVersion = Math.max(maxVersion, versionNum);
+
+                        const valueBytes = new Uint8Array(raw.value);
+                        if (bytesEqual(valueBytes, currentValueBytes)) {
+                            this._currentVersion = versionNum;
+                            found = true;
+                            break;
+                        }
+                    }
+                } finally {
+                    lowlevel.closeIterator(iteratorId);
+                }
+
+                if (found) {
+                    lowlevel.abortTransaction(txnId);
+                    return;
+                }
+
+                // No match found - create new version
+                this._currentVersion = maxVersion + 1;
+                const versionKey = new DataPack()
+                    .write(VERSION_INFO_PREFIX)
+                    .write(this._indexId!)
+                    .write(this._currentVersion)
+                    .toUint8Array();
+                dbPut(txnId, versionKey, currentValueBytes);
+                if (logLevel >= 1) console.log(`[edinburgh] Create version ${this._currentVersion} for ${this}`);
+
+                const commitResult = lowlevel.commitTransaction(txnId);
+                const commitSeq = typeof commitResult === 'number' ? commitResult : await commitResult;
+                if (commitSeq > 0) return;
+                // Race - retry
+            } catch (e) {
+                try { lowlevel.abortTransaction(txnId); } catch {}
+                throw e;
+            }
         }
-        MyModel._pk = this;
     }
 
     /**
@@ -409,97 +617,215 @@ export class PrimaryIndex<M extends typeof Model, const F extends readonly (keyo
      * ```
      */
     get(...args: IndexArgTypes<M, F>): InstanceType<M> | undefined {
-        let keyBuffer = this._getKeyFromArgs(args as IndexArgTypes<M, F>);
-        if (logLevel >= 3) {
-            console.log(`Getting primary ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] (id=${this._getIndexId()}) with key`, args, keyBuffer);
+        return this._get(currentTxn(), args, true);
+    }
+
+    /**
+     * Does the same as as `get()`, but will delay loading the instance from disk until the first
+     * property access. In case it turns out the instance doesn't exist, an error will be thrown
+     * at that time.
+     * @param args Primary key field values. (Or a single Uint8Array containing the key.)
+     * @returns The (lazily loaded) model instance.
+     */
+    getLazy(...args: IndexArgTypes<M, F>): InstanceType<M> {
+        return this._get(currentTxn(), args, false);
+    }
+
+    _get(txn: Transaction, args: IndexArgTypes<M, F> | Uint8Array, loadNow: false | Uint8Array): InstanceType<M>;
+    _get(txn: Transaction, args: IndexArgTypes<M, F> | Uint8Array, loadNow: true): InstanceType<M> | undefined;
+    _get(txn: Transaction, args: IndexArgTypes<M, F> | Uint8Array, loadNow: boolean | Uint8Array) {
+        let key: Uint8Array, keyParts;
+        if (args instanceof Uint8Array) {
+            key = args;
+        } else {
+            key = this._argsToKeyBytes(args as IndexArgTypes<M, F>, false).toUint8Array();
+            keyParts = args;
         }
 
-        let valueBuffer = olmdb.get(keyBuffer);
-        if (!valueBuffer) return;
+        const keyHash = hashBytes(key);
+        const cached = txn.instancesByPk.get(keyHash) as InstanceType<M>;
+        if (cached) {
+            if (loadNow && loadNow !== true) {
+                // The object already exists, but it may still be lazy-loaded
+                Object.defineProperties(cached, this._resetDescriptors);
+                this._setNonKeyValues(cached, loadNow);
+            }
+            return cached;
+        }
         
-        // This is a primary index. So we can now deserialize all primary and non-primary fields into instance values.
-        const model = new (this._MyModel as any)() as InstanceType<M>;
-        // We'll want to set all loaded values on the unproxied target object.
-        const unproxied = (model as any)[TARGET_SYMBOL];
-        unproxied._state = 2; // Loaded from disk, unmodified
-
-        const valueBytes = new Bytes(valueBuffer);
-        let primaryKeyIndex = 0;
-        for (const [fieldName, fieldConfig] of Object.entries(this._MyModel.fields)) {
-            if (this._fieldNames.includes(fieldName as any)) { // Value is part of primary key
-                unproxied[fieldName as string] = args[primaryKeyIndex];
-                primaryKeyIndex++;
+        let valueBuffer: Uint8Array | undefined;
+        if (loadNow) {
+            if (loadNow === true) {
+                valueBuffer = dbGet(txn.id, key);
+                if (logLevel >= 3) {
+                    console.log(`[edinburgh] Get ${this} key=${new DataPack(key)} result=${valueBuffer && new DataPack(valueBuffer)}`);
+                }
+                if (!valueBuffer) return;
             } else {
-                // We're passing in the proxied model
-                fieldConfig.type.deserialize(unproxied, fieldName, valueBytes, model);
+                valueBuffer = loadNow; // Uint8Array
             }
         }
+        
+        // This is a primary index. So we can now deserialize all primary and non-primary fields into instance values.
+        const model = new (this._MyModel as any)(undefined, txn) as InstanceType<M>;
+
+        // Set to the original value for all fields that are loaded by _setLoadedField
+        model._oldValues = {};
 
+        // Set the primary key fields on the model
+        if (keyParts) {
+            let index = 0;
+            for(const fieldName of this._fieldTypes.keys()) {
+                model._setLoadedField(fieldName, keyParts[index++] as any);
+            }
+        } else {
+            const bytes = new DataPack(key);
+            assert(bytes.readNumber() === this._MyModel._primary._indexId); // Skip index id
+            for(const [fieldName, fieldType] of this._fieldTypes.entries()) {
+                model._setLoadedField(fieldName, fieldType.deserialize(bytes));
+            }
+        }
+
+        // Store the canonical primary key on the model, set the hash, and freeze the primary key fields.
+        model._setPrimaryKey(key, keyHash);
+
+        if (valueBuffer) {
+            // Non-lazy load. Set other fields
+            this._setNonKeyValues(model, valueBuffer);
+        } else {
+            // Lazy - set getters for other fields
+            Object.defineProperties(model, this._lazyDescriptors);
+            // When creating a lazy instance, we don't need to add it to txn.instances yet, as only the
+            // primary key fields are loaded, and they cannot be modified (so we don't need to check).
+            // When any other field is set, that will trigger a lazy-load, adding the instance to
+            // txn.instances.
+        }
+
+        txn.instancesByPk.set(keyHash, model);
         return model;
     }
 
-    /**
-     * Extract model from iterator entry for primary index.
-     * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
-     * @returns Model instance or undefined.
-     * @internal
-     */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined {
-        const model = new (this._MyModel as any)() as InstanceType<M>;
-        // We'll want to set all loaded values on the unproxied target object.
-        const unproxied = (model as any)[TARGET_SYMBOL];
-        unproxied._state = 2; // Loaded from disk, unmodified
+    _serializeKey(primaryKey: Uint8Array, _data: Record<string, any>): Uint8Array {
+        return primaryKey;
+    }
 
-        for (let i = 0; i < this._fieldNames.length; i++) {
-            const fieldName = this._fieldNames[i];
-            const fieldConfig = (this._MyModel.fields as any)[fieldName] as any;
-            fieldConfig.type.deserialize(unproxied, fieldName, keyBytes);
+    _lazyNow(model: InstanceType<M>) {
+        let valueBuffer = dbGet(model._txn.id, model._primaryKey!);
+        if (logLevel >= 3) {
+            console.log(`[edinburgh] Lazy retrieve ${this} key=${new DataPack(model._primaryKey)} result=${valueBuffer && new DataPack(valueBuffer)}`);
         }
+        if (!valueBuffer) throw new DatabaseError(`Lazy-loaded ${model.constructor.name}#${model._primaryKey} does not exist`, 'LAZY_FAIL');
+        Object.defineProperties(model, this._resetDescriptors);
+        this._setNonKeyValues(model, valueBuffer);
+    }
+
+    _setNonKeyValues(model: InstanceType<M>, valueArray: Uint8Array) {
+        const fieldConfigs = this._MyModel.fields;
+        const valuePack = new DataPack(valueArray);
+        const version = valuePack.readNumber();
 
-        for (const [fieldName, fieldConfig] of Object.entries(this._MyModel.fields)) {
-            if (this._fieldNames.includes(fieldName as any)) continue; // Value is part of primary key
-            // We're passing in the proxied model
-            fieldConfig.type.deserialize(unproxied, fieldName, valueBytes, model);
+        if (version === this._currentVersion) {
+            for (const fieldName of this._nonKeyFields) {
+                model._setLoadedField(fieldName, fieldConfigs[fieldName].type.deserialize(valuePack));
+            }
+        } else {
+            this._migrateFromVersion(model, version, valuePack);
         }
+    }
 
-        return model;
+    /** Load a version's info from DB, caching the result. */
+    _loadVersionInfo(txnId: number, version: number): VersionInfo {
+        let info = this._versions.get(version);
+        if (info) return info;
+
+        const key = new DataPack()
+            .write(VERSION_INFO_PREFIX)
+            .write(this._indexId!)
+            .write(version)
+            .toUint8Array();
+        const raw = dbGet(txnId, key);
+        if (!raw) throw new DatabaseError(`Version ${version} info not found for index ${this}`, 'CONSISTENCY_ERROR');
+
+        const obj = new DataPack(raw).read() as any;
+        if (!obj || typeof obj.migrateHash !== 'number' || !Array.isArray(obj.fields) || !(obj.secondaryKeys instanceof Set))
+            throw new DatabaseError(`Version ${version} info is corrupted for index ${this}`, 'CONSISTENCY_ERROR');
+
+        const nonKeyFields = new Map<string, TypeWrapper<any>>();
+        for (const [name, typeBytes] of obj.fields) {
+            nonKeyFields.set(name, deserializeType(new DataPack(typeBytes), 0));
+        }
+
+        info = { migrateHash: obj.migrateHash, nonKeyFields, secondaryKeys: obj.secondaryKeys as Set<string> };
+        this._versions.set(version, info);
+        return info;
     }
 
-    /**
-     * Save primary index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
-     */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array {
-        // Note: this can (and usually will) be called on the non-proxied model instance.
-        assert(this._MyModel.prototype === model.constructor.prototype);
-        
-        let newKey = this._getKeyFromModel(model, true);
-        if (originalKey && Buffer.compare(newKey, originalKey)) throw new DatabaseError(`Cannot change primary key for ${this._MyModel.tableName}[${this._fieldNames.join(', ')}]: ${originalKey} -> ${newKey}`, 'PRIMARY_CHANGE');
-
-        // Serialize all non-primary key fields
-        let valBytes = new Bytes();
-        for (const [fieldName, fieldConfig] of Object.entries(model._fields)) {
-            if (!this._fieldNames.includes(fieldName as any)) {
-                fieldConfig.type.validateAndSerialize(model, fieldName, valBytes, model);
+    /** Deserialize and migrate a row from an old version. */
+    _migrateFromVersion(model: InstanceType<M>, version: number, valuePack: DataPack) {
+        const versionInfo = this._loadVersionInfo(model._txn.id, version);
+
+        // Deserialize using old field types into a plain record
+        const record: Record<string, any> = {};
+        for (const [name] of this._fieldTypes.entries()) record[name] = (model as any)[name]; // pk fields
+        for (const [name, type] of versionInfo.nonKeyFields.entries()) {
+            record[name] = type.deserialize(valuePack);
+        }
+
+        // Run migrate() if it exists
+        const migrateFn = (this._MyModel as any).migrate;
+        if (migrateFn) migrateFn(record);
+
+        // Set non-key fields on model from the (possibly migrated) record
+        for (const fieldName of this._nonKeyFields) {
+            if (fieldName in record) {
+                model._setLoadedField(fieldName, record[fieldName]);
+            } else if (fieldName in model) {
+                // Instantiate the default value
+                model._setLoadedField(fieldName, (model as any)[fieldName]);
+            } else {
+                throw new DatabaseError(`Field ${fieldName} is missing in migrated data for ${model}`, 'MIGRATION_ERROR');
             }
         }
-        
-        olmdb.put(newKey, valBytes.getBuffer());
+    }
 
-        if (logLevel >= 2) {
-            const keyBytes = new Bytes(newKey);
-            let indexId = keyBytes.readNumber();
-            console.log(`Saved primary ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] (id=${indexId}) with key`, this._deserializeKey(keyBytes), keyBytes.getBuffer());
+    _keyToArray(key: Uint8Array): IndexArgTypes<M, F> {
+        const bytes = new DataPack(key);
+        assert(bytes.readNumber() === this._indexId);
+        const result = [] as any[];
+        for (const fieldType of this._fieldTypes.values()) {
+            result.push(fieldType.deserialize(bytes));
         }
-        
-        return newKey;
+        return result as any;
+    }
+
+    _pairToInstance(txn: Transaction, keyBuffer: ArrayBuffer, valueBuffer: ArrayBuffer): InstanceType<M> {
+        return this._get(txn, new Uint8Array(keyBuffer), new Uint8Array(valueBuffer));
     }
 
     _getTypeName(): string {
         return 'primary';
     }
+
+    _write(txn: Transaction, primaryKey: Uint8Array, data: Record<string, any>) {
+        let valueBytes = new DataPack();
+        valueBytes.write(this._currentVersion);
+        const fieldConfigs = this._MyModel.fields as any;
+        for (const fieldName of this._nonKeyFields) {
+            const fieldConfig = fieldConfigs[fieldName] as FieldConfig<unknown>;
+            fieldConfig.type.serialize(data[fieldName], valueBytes);
+        }
+        if (logLevel >= 2) {
+            console.log(`[edinburgh] Write ${this} key=${new DataPack(primaryKey)} value=${valueBytes}`);
+        }
+        dbPut(txn.id, primaryKey, valueBytes.toUint8Array());
+    }
+
+    _delete(txn: Transaction, primaryKey: Uint8Array, _data: Record<string, any>) {
+        if (logLevel >= 2) {
+            console.log(`[edinburgh] Delete ${this} key=${new DataPack(primaryKey)}`);
+        }
+        dbDel(txn.id, primaryKey);
+    }
 }
 
 /**
@@ -509,6 +835,13 @@ export class PrimaryIndex<M extends typeof Model, const F extends readonly (keyo
  * @template F - The field names that make up this index.
  */
 export class UniqueIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
+
+    constructor(MyModel: M, fieldNames: F) {
+        super(MyModel, fieldNames);
+        (this._MyModel._secondaries ||= []).push(this);
+        scheduleInit();
+    }
+
     /**
      * Get a model instance by unique index key values.
      * @param args - The unique index key values.
@@ -520,72 +853,67 @@ export class UniqueIndex<M extends typeof Model, const F extends readonly (keyof
      * ```
      */
     get(...args: IndexArgTypes<M, F>): InstanceType<M> | undefined {
-        let keyBuffer = this._getKeyFromArgs(args as IndexArgTypes<M, F>);
+        const txn = currentTxn();
+        let keyBuffer = this._argsToKeyBytes(args, false).toUint8Array();
+
+        let valueBuffer = dbGet(txn.id, keyBuffer);
         if (logLevel >= 3) {
-            console.log(`Getting unique ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] (id=${this._getIndexId()}) with key`, args, keyBuffer);
+            console.log(`[edinburgh] Get ${this} key=${new DataPack(keyBuffer)} result=${valueBuffer}`);
         }
-
-        let valueBuffer = olmdb.get(keyBuffer);
         if (!valueBuffer) return;
 
-        const pk = this._MyModel._pk!;
-        const valueArgs = pk._deserializeKey(new Bytes(valueBuffer))
-        const result = pk.get(...valueArgs);
-        if (!result) throw new DatabaseError(`Unique index ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] points at non-existing primary for key: ${args.join(', ')}`, 'CONSISTENCY_ERROR');
+        const pk = this._MyModel._primary!;
+        const result = pk._get(txn, valueBuffer, true);
+        if (!result) throw new DatabaseError(`Unique index ${this} points at non-existing primary for key: ${args.join(', ')}`, 'CONSISTENCY_ERROR');
         return result;
     }
 
-    /**
-     * Extract model from iterator entry for unique index.
-     * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
-     * @returns Model instance or undefined.
-     * @internal
-     */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined {
-        // For unique indexes, the value contains the primary key
-        const pk = this._MyModel._pk!;
-        const primaryKeyArgs = pk._deserializeKey(valueBytes);
-        return pk.get(...primaryKeyArgs);
+    _serializeKey(primaryKey: Uint8Array, data: Record<string, any>): Uint8Array {
+        return this._serializeKeyFields(data).toUint8Array();
     }
 
-    /**
-     * Save unique index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
-     */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined {
-        // Note: this can (and usually will) be called on the non-proxied model instance.
-        assert(this._MyModel.prototype === model.constructor.prototype);
-
-        let newKey = this._checkSkip(model) ? undefined : this._getKeyFromModel(model, true);
-
-        if (originalKey) {
-            if (newKey && Buffer.compare(newKey, originalKey) === 0) {
-                // No change in index key, nothing to do
-                return newKey;
+    _delete(txn: Transaction, primaryKey: Uint8Array, data: Record<string, any>) {
+        if (!this._hasNullIndexValues(data)) {
+            const key = this._serializeKey(primaryKey, data);
+            if (logLevel >= 2) {
+                console.log(`[edinburgh] Delete ${this} key=${key}`);
             }
-            olmdb.del(originalKey);
-        }
-        
-        if (!newKey) {
-            // No new key, nothing to do
-            return;
+            dbDel(txn.id, key);
         }
+    }
 
-        // Check that this is not a duplicate key
-        if (olmdb.get(newKey)) {
-            throw new DatabaseError(`Unique constraint violation for ${(model.constructor as any).tableName}[${this._fieldNames.join('+')}]`, 'UNIQUE_CONSTRAINT');
+    _write(txn: Transaction, primaryKey: Uint8Array, data: Record<string, any>) {
+        if (!this._hasNullIndexValues(data)) {
+            const key = this._serializeKey(primaryKey, data);
+            if (logLevel >= 2) {
+                console.log(`[edinburgh] Write ${this} key=${key} value=${new DataPack(primaryKey)}`);
+            }
+            if (dbGet(txn.id, key)) {
+                throw new DatabaseError(`Unique constraint violation for ${this} key ${key}`, 'UNIQUE_CONSTRAINT');
+            }
+            dbPut(txn.id, key, primaryKey);
         }
-        
-        let linkKey = (model.constructor as any)._pk!._getKeyFromModel(model, false);
-        olmdb.put(newKey, linkKey);
+    }
 
-        if (logLevel >= 2) {
-            console.log(`Saved unique index ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] with key ${newKey}`);
+    _pairToInstance(txn: Transaction, keyBuffer: ArrayBuffer, valueBuffer: ArrayBuffer): InstanceType<M> {
+        // For unique indexes, the value contains the primary key
+
+        const keyPack = new DataPack(new Uint8Array(keyBuffer));
+        keyPack.readNumber(); // discard index id
+
+        const pk = this._MyModel._primary!;
+        const model = pk._get(txn, new Uint8Array(valueBuffer), false);
+
+        // _get will have created lazy-load getters for our indexed fields. Let's turn them back into
+        // regular properties:
+        Object.defineProperties(model, this._resetIndexFieldDescriptors);
+
+        // Set the values for our indexed fields
+        for(const [name, fieldType] of this._fieldTypes.entries()) {
+            model._setLoadedField(name, fieldType.deserialize(keyPack));
         }
-        
-        return newKey;
+
+        return model;
     }
 
     _getTypeName(): string {
@@ -594,7 +922,7 @@ export class UniqueIndex<M extends typeof Model, const F extends readonly (keyof
 }
 
 // OLMDB does not support storing empty values, so we use a single byte value for secondary indexes.
-const SECONDARY_VALUE = new Uint8Array([1]); // Single byte value for secondary indexes
+const SECONDARY_VALUE = new DataPack().write(undefined).toUint8Array(); // Single byte value for secondary indexes
 
 /**
  * Secondary index for non-unique lookups.
@@ -603,81 +931,64 @@ const SECONDARY_VALUE = new Uint8Array([1]); // Single byte value for secondary
  * @template F - The field names that make up this index.
  */
 export class SecondaryIndex<M extends typeof Model, const F extends readonly (keyof InstanceType<M> & string)[]> extends BaseIndex<M, F> {
-    /**
-     * Save secondary index entry.
-     * @param model - Model instance.
-     * @param originalKey - Original key if updating.
-     */
-    _save(model: InstanceType<M>, originalKey?: Uint8Array): Uint8Array | undefined {
-        // Note: this can (and usually will) be called on the non-proxied model instance.
-        assert(this._MyModel.prototype === model.constructor.prototype);
 
-        let newKey = this._getKeyFromModel(model, true);
+    constructor(MyModel: M, fieldNames: F) {
+        super(MyModel, fieldNames);
+        (this._MyModel._secondaries ||= []).push(this);
+        scheduleInit();
+    }
 
-        if (originalKey) {
-            if (newKey && Buffer.compare(newKey, originalKey) === 0) {
-                // No change in index key, nothing to do
-                return;
-            }
-            olmdb.del(originalKey);
-        }
+    _pairToInstance(txn: Transaction, keyBuffer: ArrayBuffer, _valueBuffer: ArrayBuffer): InstanceType<M> {
+        // For secondary indexes, the primary key is stored after the index fields in the key
+
+        const keyPack = new DataPack(new Uint8Array(keyBuffer));
+        keyPack.readNumber(); // discard index id
         
-        if (!newKey) {
-            // No new key, nothing to do (index should be skipped)
-            return;
+        // Read the index fields, saving them for later
+        const indexFields = new Map();
+        for(const [name, type] of this._fieldTypes.entries()) {
+            indexFields.set(name, type.deserialize(keyPack));
         }
 
-        // For secondary indexes, we store a single byte value
-        olmdb.put(newKey, SECONDARY_VALUE);
+        const primaryKey = keyPack.readUint8Array();
+        const model = this._MyModel._primary!._get(txn, primaryKey, false);
 
-        if (logLevel >= 2) {
-            console.log(`Saved secondary index ${this._MyModel.tableName}[${this._fieldNames.join(', ')}] with key ${newKey}`);
+
+        // _get will have created lazy-load getters for our indexed fields. Let's turn them back into
+        // regular properties:
+        Object.defineProperties(model, this._resetIndexFieldDescriptors);
+
+        // Set the values for our indexed fields
+        for(const [name, value] of indexFields) {
+            model._setLoadedField(name, value);
         }
 
-        return newKey;
+        return model;
     }
 
-    /**
-     * Extract model from iterator entry for secondary index.
-     * @param keyBytes - Key bytes with index ID already read.
-     * @param valueBytes - Value bytes from the entry.
-     * @returns Model instance or undefined.
-     * @internal
-     */
-    _getModelFromEntry(keyBytes: Bytes, valueBytes: Bytes): InstanceType<M> | undefined {
-        // For secondary indexes, the primary key is stored after the index fields in the key
-        
-        // First skip past the index fields
-        const temp = [] as any[];
-        for (let i = 0; i < this._fieldNames.length; i++) {
-            const fieldName = this._fieldNames[i];
-            const fieldConfig = this._MyModel.fields[fieldName];
-            fieldConfig.type.deserialize(temp, 0, keyBytes);
+    _serializeKey(primaryKey: Uint8Array, model: InstanceType<M>): Uint8Array {
+        // index id + index fields + primary key
+        const bytes = super._serializeKeyFields(model);
+        bytes.write(primaryKey);
+        return bytes.toUint8Array();
+    }
+
+    _write(txn: Transaction, primaryKey: Uint8Array, model: InstanceType<M>) {
+        if (this._hasNullIndexValues(model)) return;
+        const key = this._serializeKey(primaryKey, model);
+        if (logLevel >= 2) {
+            console.log(`[edinburgh] Write ${this} key=${key}`);
         }
-        
-        // Now deserialize the primary key from the remaining bytes
-        const pk = this._MyModel._pk!;
-        const primaryKeyArgs = pk._deserializeKey(keyBytes);
-        return pk.get(...primaryKeyArgs);
+        dbPut(txn.id, key, SECONDARY_VALUE);
     }
 
-    /**
-     * Create secondary index key that includes both index fields and primary key.
-     * @param model - Model instance.
-     * @returns Database key bytes or undefined if skipped.
-     */
-    _getKeyFromModel(model: InstanceType<M>, includeIndexId: boolean): Uint8Array {
-        const bytes = new Bytes();
-        if (includeIndexId) bytes.writeNumber(this._getIndexId());
-        
-        // Write the index fields
-        this._serializeModel(model, bytes);
-        
-        // Write the primary key fields
-        const pk = this._MyModel._pk!;
-        pk._serializeModel(model, bytes);
-        
-        return bytes.getBuffer();
+    _delete(txn: Transaction, primaryKey: Uint8Array, model: InstanceType<M>): void {
+        if (this._hasNullIndexValues(model)) return;
+        const key = this._serializeKey(primaryKey, model);
+        if (logLevel >= 2) {
+            console.log(`[edinburgh] Delete ${this} key=${key}`);
+        }
+        dbDel(txn.id, key);
     }
 
     _getTypeName(): string {
@@ -771,40 +1082,71 @@ export function index(MyModel: typeof Model, fields: any): SecondaryIndex<any, a
  * This is primarily useful for development and debugging purposes.
  */
 export function dump() {
+    const txn = currentTxn();
     let indexesById = new Map<number, {name: string, type: string, fields: Record<string, TypeWrapper<any>>}>();
-    console.log("--- Database dump ---")
-    for(const {key,value} of olmdb.scan()) {
-        const kb = new Bytes(key);
-        const vb = new Bytes(value);
+    let versions = new Map<number, Map<number, Map<string, TypeWrapper<any>>>>();
+    console.log("--- edinburgh database dump ---")
+    const iteratorId = lowlevel.createIterator(txn.id, undefined, undefined, false);
+    try {
+    while (true) {
+        const raw = lowlevel.readIterator(iteratorId);
+        if (!raw) break;
+        const kb = new DataPack(new Uint8Array(raw.key));
+        const vb = new DataPack(new Uint8Array(raw.value));
         const indexId = kb.readNumber();
         if (indexId === MAX_INDEX_ID_PREFIX) {
             console.log("* Max index id", vb.readNumber());
+        } else if (indexId === VERSION_INFO_PREFIX) {
+            const idxId = kb.readNumber();
+            const version = kb.readNumber();
+            const obj = vb.read() as any;
+            const nonKeyFields = new Map<string, TypeWrapper<any>>();
+            for (const [name, typeBytes] of obj.fields) {
+                nonKeyFields.set(name, deserializeType(new DataPack(typeBytes), 0));
+            }
+            if (!versions.has(idxId)) versions.set(idxId, new Map());
+            versions.get(idxId)!.set(version, nonKeyFields);
+            console.log(`* Version ${version} for index ${idxId}: fields=[${[...nonKeyFields.keys()].join(',')}]`);
         } else if (indexId === INDEX_ID_PREFIX) {
             const name = kb.readString();
             const type = kb.readString();
             const fields: Record<string, TypeWrapper<any>> = {};
             while(kb.readAvailable()) {
-                const name = kb.readString();
+                const name = kb.read();
+                if (name === undefined) break; // what follows are primary key fields (when this is a secondary index)
                 fields[name] = deserializeType(kb, 0);
             }
-            const fieldDescription = Object.entries(fields).map(([name, type]) => `${name}:${type}`);
+
             const indexId = vb.readNumber();
-            console.log(`* Definition for ${type} ${indexId} for ${name}[${fieldDescription.join(',')}]`);
+            console.log(`* Index definition ${indexId}:${name}:${type}[${Object.keys(fields).join(',')}]`);
             indexesById.set(indexId, {name, type, fields});
         } else if (indexId > 0 && indexesById.has(indexId)) {
             const index = indexesById.get(indexId)!;
-            const {name, type, fields} = index;
-            const rowKey: any = {};
-            for(const [fieldName, fieldType] of Object.entries(fields)) {
-                fieldType.deserialize(rowKey, fieldName, kb);
+            let name, type, rowKey: any, rowValue: any;
+            if (index) {
+                name = index.name;
+                type = index.type;
+                const fields = index.fields;
+                rowKey = {};
+                for(const [fieldName, fieldType] of Object.entries(fields)) {
+                    rowKey[fieldName] = fieldType.deserialize(kb);
+                }
+                if (type === 'primary') {
+                    const version = vb.readNumber();
+                    const vFields = versions.get(indexId)?.get(version);
+                    if (vFields) {
+                        rowValue = {};
+                        for (const [fieldName, fieldType] of vFields) {
+                            rowValue[fieldName] = fieldType.deserialize(vb);
+                        }
+                    }
+                }
             }
-            const Model = modelRegistry[name]!;
-            // TODO: once we're storing schemas (serializeType) in the db, we can deserialize here
-            let displayValue = (type === 'secondary') ? Model._pk!._deserializeKey(kb) : vb;
-            console.log(`* Row for ${type} ${indexId} with key ${JSON.stringify(rowKey)}`, displayValue);
+            console.log(`* Row for ${indexId}:${name}:${type}`, rowKey ?? kb, rowValue ?? vb);
         } else {
-            console.log(`* Unhandled ${indexId} index key=${kb} value=${vb}`);
+            console.log(`* Unhandled '${indexId}' key=${kb} value=${vb}`);
         }
     }
-    console.log("--- End of database dump ---")
+    } finally { lowlevel.closeIterator(iteratorId); }
+    console.log("--- end ---")
 }