@ocoda/event-sourcing-mariadb 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @ocoda/event-sourcing-mariadb
 
+## 3.0.2
+
+### Patch Changes
+
+- [#544](https://github.com/ocoda/event-sourcing/pull/544) [`94b5f48`](https://github.com/ocoda/event-sourcing/commit/94b5f48415e54e3408f21c35858b431311c04462) Thanks [@drieshooghe](https://github.com/drieshooghe)! - `getLastSnapshots([])` and `getManyLastSnapshotEnvelopes([])` of the MariaDB snapshot store, and so `SnapshotRepository.loadMany([])`, return an empty map instead of failing with an SQL syntax error.
+
+- Updated dependencies [[`94b5f48`](https://github.com/ocoda/event-sourcing/commit/94b5f48415e54e3408f21c35858b431311c04462)]:
+  - @ocoda/event-sourcing@3.0.2
+
+## 3.0.1
+
+### Patch Changes
+
+- [#526](https://github.com/ocoda/event-sourcing/pull/526) [`b93acfa`](https://github.com/ocoda/event-sourcing/commit/b93acfaea457a6ee1e7cb2b345bd9f5ca8cb695d) Thanks [@drieshooghe](https://github.com/drieshooghe)! - Harden the MariaDB and MongoDB event and snapshot stores.
+
+  MariaDB:
+
+  - Reads no longer hide failures. A missing table, a dropped connection or an unregistered event used to end the stream silently and return a truncated history. The original error is now thrown to the consumer. Applications that relied on reading a not-yet-created pool returning nothing must create it with `ensureCollection()` first.
+  - Stopping a read early (`break` or an error in the consumer) now discards the rest of the result set and releases the connection. Before, this could leave the connection stuck and eventually exhaust the pool.
+  - A concurrent append that loses the race on the primary key now throws `EventStoreVersionConflictException` / `SnapshotStoreVersionConflictException` instead of `EventStorePersistenceException` / `SnapshotStorePersistenceException`.
+  - Table names are quoted with the connector's `escapeId`, so pool names with special characters are handled safely.
+
+  MongoDB:
+
+  - Cursors are now closed when a read ends early or fails, instead of staying open on the server until they time out.
+  - Appends no longer look up the collection on every write. Collections that are known to exist (created through `ensureCollection()` or found once) are remembered per store instance. Unknown pools are still rejected with the same exception and are checked against the server on every attempt. If you drop a collection while a store instance is running, call `ensureCollection()` again before appending to it: otherwise MongoDB re-creates it on the next write without its unique indexes.
+  - A concurrent append that loses the race on the `(streamId, version)` unique index now throws `EventStoreVersionConflictException` / `SnapshotStoreVersionConflictException` instead of `EventStorePersistenceException` / `SnapshotStorePersistenceException`. Events of the losing append that were already inserted are removed again.
+  - The batches yielded by the read methods are no longer emptied after the consumer resumes, so consumers can safely keep a reference to a batch.
+
+- Updated dependencies [[`c2f0b47`](https://github.com/ocoda/event-sourcing/commit/c2f0b479ad295d0c92b1cf3c522bac23424c8c81)]:
+  - @ocoda/event-sourcing@3.0.1
+
 ## 3.0.0
 
 ### Patch Changes

package/dist/index.d.ts

@@ -26,6 +26,10 @@ declare class MariaDBEventStore extends EventStore<MariaDBEventStoreConfig> {
     getEnvelope({ streamId }: EventStream, version: number, pool?: IEventPool): Promise<EventEnvelope>;
     getEnvelopes({ streamId }: EventStream, filter?: IEventFilter): AsyncGenerator<EventEnvelope[]>;
     getAllEnvelopes(filter: IAllEventsFilter): AsyncGenerator<EventEnvelope[]>;
+    /**
+     * Best effort lookup of the latest version of a stream, used to report a conflict.
+     */
+    private getLatestVersion;
 }
 
 interface MariaDBEventStoreConfig extends EventStoreConfig, PoolConfig {
@@ -60,6 +64,10 @@ declare class MariaDBSnapshotStore extends SnapshotStore<MariaDBSnapshotStoreCon
     getLastEnvelopesForAggregate<A extends AggregateRoot>(aggregate: Type<A>, filter?: ILatestSnapshotFilter): AsyncGenerator<SnapshotEnvelope<A>[]>;
     getManyLastSnapshotEnvelopes<A extends AggregateRoot>(streams: SnapshotStream[], pool?: ISnapshotPool): Promise<Map<SnapshotStream, SnapshotEnvelope<A>>>;
     private getLastStreamEntities;
+    /**
+     * Best effort lookup of the latest snapshot version of a stream, used to report a conflict.
+     */
+    private getLatestVersion;
 }
 
 interface MariaDBSnapshotStoreConfig extends SnapshotStoreConfig, PoolConfig {

package/dist/index.js

@@ -3,6 +3,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -54,6 +57,34 @@ var __asyncGenerator = (__this, __arguments, generator) => {
   }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
+var __yieldStar = (value) => {
+  var obj = value[__knownSymbol("asyncIterator")], isAwait = false, method, it = {};
+  if (obj == null) {
+    obj = value[__knownSymbol("iterator")]();
+    method = (k) => it[k] = (x) => obj[k](x);
+  } else {
+    obj = obj.call(value);
+    method = (k) => it[k] = (v) => {
+      if (isAwait) {
+        isAwait = false;
+        if (k === "throw") throw v;
+        return v;
+      }
+      isAwait = true;
+      return {
+        done: false,
+        value: new __await(new Promise((resolve) => {
+          var x = obj[k](v);
+          if (!(x instanceof Object)) __typeError("Object expected");
+          resolve(x);
+        }), 1)
+      };
+    };
+  }
+  return it[__knownSymbol("iterator")] = () => it, method("next"), "throw" in obj ? method("throw") : it.throw = (x) => {
+    throw x;
+  }, "return" in obj && method("return"), it;
+};
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 
 // lib/index.ts
@@ -67,6 +98,34 @@ module.exports = __toCommonJS(index_exports);
 // lib/mariadb.event-store.ts
 var import_event_sourcing = require("@ocoda/event-sourcing");
 var import_mariadb = require("mariadb");
+
+// lib/mariadb.utils.ts
+var ER_DUP_ENTRY = 1062;
+var isDuplicateEntryError = /* @__PURE__ */ __name((error) => {
+  const { errno, code } = error != null ? error : {};
+  return errno === ER_DUP_ENTRY || code === "ER_DUP_ENTRY";
+}, "isDuplicateEntryError");
+function streamRows(pool, sql, params) {
+  return __asyncGenerator(this, null, function* () {
+    var _a;
+    const connection = yield new __await(pool.getConnection());
+    let stream;
+    try {
+      stream = connection.queryStream(sql, params);
+      stream.on("error", () => void 0);
+      yield* __yieldStar(stream);
+    } finally {
+      if (stream) {
+        (_a = stream.close) == null ? void 0 : _a.call(stream);
+        stream.destroy();
+      }
+      yield new __await(connection.release());
+    }
+  });
+}
+__name(streamRows, "streamRows");
+
+// lib/mariadb.event-store.ts
 var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.EventStore {
   constructor() {
     super(...arguments);
@@ -88,7 +147,7 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
     return __async(this, null, function* () {
       const collection = import_event_sourcing.EventCollection.get(pool);
       try {
-        yield this.pool.query(`CREATE TABLE IF NOT EXISTS \`${collection}\` (
+        yield this.pool.query(`CREATE TABLE IF NOT EXISTS ${this.pool.escapeId(collection)} (
                     stream_id VARCHAR(120) NOT NULL,
                     version INT NOT NULL,
                     event VARCHAR(80) NOT NULL,
@@ -110,45 +169,35 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
   }
   listCollections(filter) {
     return __asyncGenerator(this, null, function* () {
-      const connection = this.pool.getConnection();
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing.DEFAULT_BATCH_SIZE;
       const query = "SELECT TABLE_NAME FROM information_schema.tables WHERE BINARY table_name LIKE '%events'";
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query);
+      let batchedCollections = [];
       try {
-        let batchedCollections = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { TABLE_NAME } = temp.value;
-            batchedCollections.push(TABLE_NAME);
-            if (batchedCollections.length === batch) {
-              yield batchedCollections;
-              batchedCollections = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { TABLE_NAME } = temp.value;
+          batchedCollections.push(TABLE_NAME);
+          if (batchedCollections.length === batch) {
+            yield batchedCollections;
+            batchedCollections = [];
           }
         }
-        if (batchedCollections.length > 0) {
-          yield batchedCollections;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedCollections.length > 0) {
+        yield batchedCollections;
       }
     });
   }
   getEvents(_0, _1) {
     return __asyncGenerator(this, arguments, function* ({ streamId }, filter) {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing.EventCollection.get(filter == null ? void 0 : filter.pool);
       const fromVersion = filter == null ? void 0 : filter.fromVersion;
       const direction = (filter == null ? void 0 : filter.direction) || import_event_sourcing.StreamReadingDirection.FORWARD;
@@ -156,7 +205,7 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing.DEFAULT_BATCH_SIZE;
       const query = `
             SELECT event, payload
-            FROM \`${collection}\`
+            FROM ${this.pool.escapeId(collection)}
             WHERE stream_id = ?
             ${fromVersion ? "AND version >= ?" : ""}
             ORDER BY version ${direction === import_event_sourcing.StreamReadingDirection.FORWARD ? "ASC" : "DESC"}
@@ -170,43 +219,35 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
         streamId,
         limit
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedEvents = [];
       try {
-        let batchedEvents = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { event, payload } = temp.value;
-            batchedEvents.push(this.eventMap.deserializeEvent(event, payload));
-            if (batchedEvents.length === batch) {
-              yield batchedEvents;
-              batchedEvents = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { event, payload } = temp.value;
+          batchedEvents.push(this.eventMap.deserializeEvent(event, payload));
+          if (batchedEvents.length === batch) {
+            yield batchedEvents;
+            batchedEvents = [];
           }
         }
-        if (batchedEvents.length > 0) {
-          yield batchedEvents;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedEvents.length > 0) {
+        yield batchedEvents;
       }
     });
   }
   getEvent(_0, _1, _2) {
     return __async(this, arguments, function* ({ streamId }, version, pool) {
       const collection = import_event_sourcing.EventCollection.get(pool);
-      const [entity] = yield this.pool.query(`SELECT event, payload FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
+      const [entity] = yield this.pool.query(`SELECT event, payload FROM ${this.pool.escapeId(collection)} WHERE stream_id = ? AND version = ?`, [
         streamId,
         version
       ]);
@@ -220,11 +261,13 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
     return __async(this, null, function* () {
       const connection = yield this.pool.getConnection();
       const collection = import_event_sourcing.EventCollection.get(pool);
+      let currentVersion = 0;
       try {
-        const [currentVersionResult] = yield connection.query(`SELECT MAX(version) as version FROM \`${collection}\` WHERE stream_id = ?`, [
+        const table = connection.escapeId(collection);
+        const [currentVersionResult] = yield connection.query(`SELECT MAX(version) as version FROM ${table} WHERE stream_id = ?`, [
           stream.streamId
         ]);
-        const currentVersion = (currentVersionResult == null ? void 0 : currentVersionResult.version) || 0;
+        currentVersion = (currentVersionResult == null ? void 0 : currentVersionResult.version) || 0;
         if (aggregateVersion <= currentVersion) {
           throw new import_event_sourcing.EventStoreVersionConflictException(stream, aggregateVersion, currentVersion);
         }
@@ -246,7 +289,7 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
           envelopes.push(envelope);
         }
         yield connection.beginTransaction();
-        yield connection.batch(`INSERT INTO \`${collection}\` VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, envelopes.map(({ event, payload, metadata }) => {
+        yield connection.batch(`INSERT INTO ${table} VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, envelopes.map(({ event, payload, metadata }) => {
           var _a, _b;
           return [
             stream.streamId,
@@ -264,15 +307,17 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
         yield connection.commit();
         return envelopes;
       } catch (error) {
-        yield connection.rollback();
-        switch (error.constructor) {
-          case import_event_sourcing.EventStoreVersionConflictException:
-            throw error;
-          default:
-            throw new import_event_sourcing.EventStorePersistenceException(collection, error);
+        yield connection.rollback().catch(() => void 0);
+        if (error instanceof import_event_sourcing.EventStoreVersionConflictException) {
+          throw error;
+        }
+        if (isDuplicateEntryError(error)) {
+          const latestVersion = yield this.getLatestVersion(collection, stream, connection, currentVersion);
+          throw new import_event_sourcing.EventStoreVersionConflictException(stream, aggregateVersion, latestVersion, error);
         }
+        throw new import_event_sourcing.EventStorePersistenceException(collection, error);
       } finally {
-        connection.release();
+        yield connection.release();
       }
     });
   }
@@ -280,7 +325,7 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
     return __async(this, arguments, function* ({ streamId }, version, pool) {
       var _a, _b;
       const collection = import_event_sourcing.EventCollection.get(pool);
-      const [entity] = yield this.pool.query(`SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
+      const [entity] = yield this.pool.query(`SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id FROM ${this.pool.escapeId(collection)} WHERE stream_id = ? AND version = ?`, [
         streamId,
         version
       ]);
@@ -299,7 +344,6 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
   }
   getEnvelopes(_0, _1) {
     return __asyncGenerator(this, arguments, function* ({ streamId }, filter) {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing.EventCollection.get(filter == null ? void 0 : filter.pool);
       const fromVersion = filter == null ? void 0 : filter.fromVersion;
       const direction = (filter == null ? void 0 : filter.direction) || import_event_sourcing.StreamReadingDirection.FORWARD;
@@ -307,7 +351,7 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing.DEFAULT_BATCH_SIZE;
       const query = `
             SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id
-            FROM \`${collection}\`
+            FROM ${this.pool.escapeId(collection)}
             WHERE stream_id = ?
             ${fromVersion ? "AND version >= ?" : ""}
             ORDER BY version ${direction === import_event_sourcing.StreamReadingDirection.FORWARD ? "ASC" : "DESC"}
@@ -321,98 +365,96 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
         streamId,
         limit
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedEvents = [];
       try {
-        let batchedEvents = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id } = temp.value;
-            batchedEvents.push(import_event_sourcing.EventEnvelope.from(event, payload, {
-              eventId: import_event_sourcing.EventId.from(event_id),
-              aggregateId: aggregate_id,
-              version,
-              occurredOn: occurred_on,
-              correlationId: correlation_id != null ? correlation_id : void 0,
-              causationId: causation_id != null ? causation_id : void 0
-            }));
-            if (batchedEvents.length === batch) {
-              yield batchedEvents;
-              batchedEvents = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id } = temp.value;
+          batchedEvents.push(import_event_sourcing.EventEnvelope.from(event, payload, {
+            eventId: import_event_sourcing.EventId.from(event_id),
+            aggregateId: aggregate_id,
+            version,
+            occurredOn: occurred_on,
+            correlationId: correlation_id != null ? correlation_id : void 0,
+            causationId: causation_id != null ? causation_id : void 0
+          }));
+          if (batchedEvents.length === batch) {
+            yield batchedEvents;
+            batchedEvents = [];
           }
         }
-        if (batchedEvents.length > 0) {
-          yield batchedEvents;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedEvents.length > 0) {
+        yield batchedEvents;
       }
     });
   }
   getAllEnvelopes(filter) {
     return __asyncGenerator(this, null, function* () {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing.EventCollection.get(filter == null ? void 0 : filter.pool);
       const yearMonths = this.getYearMonthRange(filter.since, filter.until);
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing.DEFAULT_BATCH_SIZE;
       const query = `
             SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id
-            FROM \`${collection}\`
+            FROM ${this.pool.escapeId(collection)}
             WHERE event_date IN (?)
             ORDER BY event_date ASC, event_id ASC
         `;
       const params = [
         yearMonths
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedEvents = [];
       try {
-        let batchedEvents = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id } = temp.value;
-            batchedEvents.push(import_event_sourcing.EventEnvelope.from(event, payload, {
-              eventId: import_event_sourcing.EventId.from(event_id),
-              aggregateId: aggregate_id,
-              version,
-              occurredOn: occurred_on,
-              correlationId: correlation_id != null ? correlation_id : void 0,
-              causationId: causation_id != null ? causation_id : void 0
-            }));
-            if (batchedEvents.length === batch) {
-              yield batchedEvents;
-              batchedEvents = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id } = temp.value;
+          batchedEvents.push(import_event_sourcing.EventEnvelope.from(event, payload, {
+            eventId: import_event_sourcing.EventId.from(event_id),
+            aggregateId: aggregate_id,
+            version,
+            occurredOn: occurred_on,
+            correlationId: correlation_id != null ? correlation_id : void 0,
+            causationId: causation_id != null ? causation_id : void 0
+          }));
+          if (batchedEvents.length === batch) {
+            yield batchedEvents;
+            batchedEvents = [];
           }
         }
-        if (batchedEvents.length > 0) {
-          yield batchedEvents;
+      } catch (temp) {
+        error = [temp];
+      } finally {
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
         }
+      }
+      if (batchedEvents.length > 0) {
+        yield batchedEvents;
+      }
+    });
+  }
+  /**
+  * Best effort lookup of the latest version of a stream, used to report a conflict.
+  */
+  getLatestVersion(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (collection, { streamId }, connection, fallback) {
+      try {
+        const [result] = yield connection.query(`SELECT MAX(version) as version FROM ${connection.escapeId(collection)} WHERE stream_id = ?`, [
+          streamId
+        ]);
+        return (result == null ? void 0 : result.version) || fallback;
       } catch (e) {
-        stream.destroy();
-      } finally {
-        yield new __await(client.release());
+        return fallback;
       }
     });
   }
@@ -422,7 +464,7 @@ var MariaDBEventStore = _MariaDBEventStore;
 
 // lib/mariadb.snapshot-store.ts
 var import_event_sourcing2 = require("@ocoda/event-sourcing");
-var import_mariadb2 = require("mariadb");
+var import_mariadb3 = require("mariadb");
 var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sourcing2.SnapshotStore {
   constructor() {
     super(...arguments);
@@ -431,7 +473,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   connect() {
     return __async(this, null, function* () {
       this.logger.log("Starting store");
-      this.pool = (0, import_mariadb2.createPool)(this.options);
+      this.pool = (0, import_mariadb3.createPool)(this.options);
     });
   }
   disconnect() {
@@ -444,7 +486,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
     return __async(this, null, function* () {
       const collection = import_event_sourcing2.SnapshotCollection.get(pool);
       try {
-        yield this.pool.query(`CREATE TABLE IF NOT EXISTS \`${collection}\` (
+        yield this.pool.query(`CREATE TABLE IF NOT EXISTS ${this.pool.escapeId(collection)} (
                     stream_id VARCHAR(90) NOT NULL,
                     version INT NOT NULL,
                     payload JSON NOT NULL,
@@ -464,45 +506,35 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   }
   listCollections(filter) {
     return __asyncGenerator(this, null, function* () {
-      const connection = this.pool.getConnection();
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing2.DEFAULT_BATCH_SIZE;
       const query = "SELECT TABLE_NAME FROM information_schema.tables WHERE BINARY table_name LIKE '%snapshots'";
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query);
+      let batchedCollections = [];
       try {
-        let batchedCollections = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { TABLE_NAME } = temp.value;
-            batchedCollections.push(TABLE_NAME);
-            if (batchedCollections.length === batch) {
-              yield batchedCollections;
-              batchedCollections = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { TABLE_NAME } = temp.value;
+          batchedCollections.push(TABLE_NAME);
+          if (batchedCollections.length === batch) {
+            yield batchedCollections;
+            batchedCollections = [];
           }
         }
-        if (batchedCollections.length > 0) {
-          yield batchedCollections;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedCollections.length > 0) {
+        yield batchedCollections;
       }
     });
   }
   getSnapshots(_0, _1) {
     return __asyncGenerator(this, arguments, function* ({ streamId }, filter) {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing2.SnapshotCollection.get(filter == null ? void 0 : filter.pool);
       const fromVersion = filter == null ? void 0 : filter.fromVersion;
       const direction = (filter == null ? void 0 : filter.direction) || import_event_sourcing2.StreamReadingDirection.FORWARD;
@@ -510,7 +542,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing2.DEFAULT_BATCH_SIZE;
       const query = `
 	        SELECT payload
-	        FROM \`${collection}\`
+	        FROM ${this.pool.escapeId(collection)}
 	        WHERE stream_id = ?
 	        ${fromVersion ? "AND version >= ?" : ""}
 	        ORDER BY version ${direction === import_event_sourcing2.StreamReadingDirection.FORWARD ? "ASC" : "DESC"}
@@ -524,43 +556,35 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
         streamId,
         limit
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedEvents = [];
       try {
-        let batchedEvents = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { payload } = temp.value;
-            batchedEvents.push(payload);
-            if (batchedEvents.length === batch) {
-              yield batchedEvents;
-              batchedEvents = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { payload } = temp.value;
+          batchedEvents.push(payload);
+          if (batchedEvents.length === batch) {
+            yield batchedEvents;
+            batchedEvents = [];
           }
         }
-        if (batchedEvents.length > 0) {
-          yield batchedEvents;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedEvents.length > 0) {
+        yield batchedEvents;
       }
     });
   }
   getSnapshot(_0, _1, _2) {
     return __async(this, arguments, function* ({ streamId }, version, pool) {
       const collection = import_event_sourcing2.SnapshotCollection.get(pool);
-      const [entity] = yield this.pool.query(`SELECT payload FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
+      const [entity] = yield this.pool.query(`SELECT payload FROM ${this.pool.escapeId(collection)} WHERE stream_id = ? AND version = ?`, [
         streamId,
         version
       ]);
@@ -572,9 +596,12 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   }
   appendSnapshot(stream, aggregateVersion, snapshot, pool) {
     return __async(this, null, function* () {
+      var _a;
       const connection = yield this.pool.getConnection();
       const collection = import_event_sourcing2.SnapshotCollection.get(pool);
+      let latestVersion = 0;
       try {
+        const table = connection.escapeId(collection);
         const envelope = import_event_sourcing2.SnapshotEnvelope.create(snapshot, {
           aggregateId: stream.aggregateId,
           version: aggregateVersion
@@ -585,17 +612,18 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
           "stream_id",
           "version"
         ], connection);
+        latestVersion = (_a = lastStreamEntity == null ? void 0 : lastStreamEntity.version) != null ? _a : 0;
         if (aggregateVersion <= (lastStreamEntity == null ? void 0 : lastStreamEntity.version)) {
           throw new import_event_sourcing2.SnapshotStoreVersionConflictException(stream, aggregateVersion, lastStreamEntity.version);
         }
         yield connection.beginTransaction();
         if (lastStreamEntity) {
-          yield connection.query(`UPDATE \`${collection}\` SET latest = null WHERE stream_id = ? AND version = ?`, [
+          yield connection.query(`UPDATE ${table} SET latest = null WHERE stream_id = ? AND version = ?`, [
             lastStreamEntity.stream_id,
             lastStreamEntity.version
           ]);
         }
-        yield connection.query(`INSERT INTO \`${collection}\` VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
+        yield connection.query(`INSERT INTO ${table} VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
           stream.streamId,
           envelope.metadata.version,
           JSON.stringify(envelope.payload),
@@ -608,15 +636,17 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
         yield connection.commit();
         return envelope;
       } catch (error) {
-        yield connection.rollback();
-        switch (error.constructor) {
-          case import_event_sourcing2.SnapshotStoreVersionConflictException:
-            throw error;
-          default:
-            throw new import_event_sourcing2.SnapshotStorePersistenceException(collection, error);
+        yield connection.rollback().catch(() => void 0);
+        if (error instanceof import_event_sourcing2.SnapshotStoreVersionConflictException) {
+          throw error;
         }
+        if (isDuplicateEntryError(error)) {
+          latestVersion = yield this.getLatestVersion(collection, stream, connection, latestVersion);
+          throw new import_event_sourcing2.SnapshotStoreVersionConflictException(stream, aggregateVersion, latestVersion, error);
+        }
+        throw new import_event_sourcing2.SnapshotStorePersistenceException(collection, error);
       } finally {
-        connection.release();
+        yield connection.release();
       }
     });
   }
@@ -673,7 +703,6 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   }
   getEnvelopes(_0, _1) {
     return __asyncGenerator(this, arguments, function* ({ streamId }, filter) {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing2.SnapshotCollection.get(filter == null ? void 0 : filter.pool);
       const fromVersion = filter == null ? void 0 : filter.fromVersion;
       const direction = (filter == null ? void 0 : filter.direction) || import_event_sourcing2.StreamReadingDirection.FORWARD;
@@ -681,7 +710,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing2.DEFAULT_BATCH_SIZE;
       const query = `
 	        SELECT payload, aggregate_id, registered_on, snapshot_id, version
-	        FROM \`${collection}\`
+	        FROM ${this.pool.escapeId(collection)}
 	        WHERE stream_id = ?
 	        ${fromVersion ? "AND version >= ?" : ""}
 	        ORDER BY version ${direction === import_event_sourcing2.StreamReadingDirection.FORWARD ? "ASC" : "DESC"}
@@ -695,48 +724,40 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
         streamId,
         limit
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedSnapshots = [];
       try {
-        let batchedSnapshots = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { payload, aggregate_id, registered_on, snapshot_id, version } = temp.value;
-            batchedSnapshots.push(import_event_sourcing2.SnapshotEnvelope.from(payload, {
-              aggregateId: aggregate_id,
-              registeredOn: registered_on,
-              snapshotId: snapshot_id,
-              version
-            }));
-            if (batchedSnapshots.length === batch) {
-              yield batchedSnapshots;
-              batchedSnapshots = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { payload, aggregate_id, registered_on, snapshot_id, version } = temp.value;
+          batchedSnapshots.push(import_event_sourcing2.SnapshotEnvelope.from(payload, {
+            aggregateId: aggregate_id,
+            registeredOn: registered_on,
+            snapshotId: snapshot_id,
+            version
+          }));
+          if (batchedSnapshots.length === batch) {
+            yield batchedSnapshots;
+            batchedSnapshots = [];
           }
         }
-        if (batchedSnapshots.length > 0) {
-          yield batchedSnapshots;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedSnapshots.length > 0) {
+        yield batchedSnapshots;
       }
     });
   }
   getEnvelope(_0, _1, _2) {
     return __async(this, arguments, function* ({ streamId }, version, pool) {
       const collection = import_event_sourcing2.SnapshotCollection.get(pool);
-      const [entity] = yield this.pool.query(`SELECT payload, aggregate_id, registered_on, snapshot_id, version FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
+      const [entity] = yield this.pool.query(`SELECT payload, aggregate_id, registered_on, snapshot_id, version FROM ${this.pool.escapeId(collection)} WHERE stream_id = ? AND version = ?`, [
         streamId,
         version
       ]);
@@ -753,7 +774,6 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   }
   getLastEnvelopesForAggregate(aggregate, filter) {
     return __asyncGenerator(this, null, function* () {
-      const connection = this.pool.getConnection();
       const collection = import_event_sourcing2.SnapshotCollection.get(filter == null ? void 0 : filter.pool);
       const { streamName } = (0, import_event_sourcing2.getAggregateMetadata)(aggregate);
       const aggregateId = filter == null ? void 0 : filter.aggregateId;
@@ -761,7 +781,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing2.DEFAULT_BATCH_SIZE;
       const query = `
 	        SELECT payload, aggregate_id, registered_on, snapshot_id, version
-	        FROM \`${collection}\`
+	        FROM ${this.pool.escapeId(collection)}
 	        WHERE aggregate_name = ?
 	        AND ${aggregateId ? "latest >= ?" : "latest LIKE 'latest%'"}
 	        LIMIT ?
@@ -774,41 +794,33 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
         streamName,
         limit
       ];
-      const client = yield new __await(connection);
-      const stream = client.queryStream(query, params);
+      let batchedSnapshots = [];
       try {
-        let batchedSnapshots = [];
-        try {
-          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-            const { payload, aggregate_id, registered_on, snapshot_id, version } = temp.value;
-            batchedSnapshots.push(import_event_sourcing2.SnapshotEnvelope.from(payload, {
-              aggregateId: aggregate_id,
-              registeredOn: registered_on,
-              snapshotId: snapshot_id,
-              version
-            }));
-            if (batchedSnapshots.length === batch) {
-              yield batchedSnapshots;
-              batchedSnapshots = [];
-            }
-          }
-        } catch (temp) {
-          error = [temp];
-        } finally {
-          try {
-            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-          } finally {
-            if (error)
-              throw error[0];
+        for (var iter = __forAwait(streamRows(this.pool, query, params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          const { payload, aggregate_id, registered_on, snapshot_id, version } = temp.value;
+          batchedSnapshots.push(import_event_sourcing2.SnapshotEnvelope.from(payload, {
+            aggregateId: aggregate_id,
+            registeredOn: registered_on,
+            snapshotId: snapshot_id,
+            version
+          }));
+          if (batchedSnapshots.length === batch) {
+            yield batchedSnapshots;
+            batchedSnapshots = [];
           }
         }
-        if (batchedSnapshots.length > 0) {
-          yield batchedSnapshots;
-        }
-      } catch (e) {
-        stream.destroy();
+      } catch (temp) {
+        error = [temp];
       } finally {
-        yield new __await(client.release());
+        try {
+          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+        } finally {
+          if (error)
+            throw error[0];
+        }
+      }
+      if (batchedSnapshots.length > 0) {
+        yield batchedSnapshots;
       }
     });
   }
@@ -839,15 +851,33 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
   }
   getLastStreamEntities(collection, streams, fields, connection) {
     return __async(this, null, function* () {
+      if (streams.length === 0) {
+        return [];
+      }
       const latestIds = streams.map(({ streamId }) => `latest#${streamId}`);
       return (connection || this.pool).query(`SELECT ${fields.join(", ")} 
-                FROM \`${collection}\` 
+                FROM ${this.pool.escapeId(collection)} 
                 WHERE latest IN (?)
             `, [
         latestIds
       ]);
     });
   }
+  /**
+  * Best effort lookup of the latest snapshot version of a stream, used to report a conflict.
+  */
+  getLatestVersion(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (collection, { streamId }, connection, fallback) {
+      try {
+        const [result] = yield connection.query(`SELECT MAX(version) as version FROM ${connection.escapeId(collection)} WHERE stream_id = ?`, [
+          streamId
+        ]);
+        return (result == null ? void 0 : result.version) || fallback;
+      } catch (e) {
+        return fallback;
+      }
+    });
+  }
 };
 __name(_MariaDBSnapshotStore, "MariaDBSnapshotStore");
 var MariaDBSnapshotStore = _MariaDBSnapshotStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocoda/event-sourcing-mariadb",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "NestJS Event Sourcing Library (@mariadb)",
   "author": "Dries Hooghe <dries@drieshooghe.com>",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@nestjs/core": "^11.0.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.2.0",
-    "@ocoda/event-sourcing": "3.0.0"
+    "@ocoda/event-sourcing": "3.0.2"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",