@event-driven-io/emmett-postgresql 0.31.0 → 0.32.0

package/dist/index.cjs

@@ -318,8 +318,8 @@ var streamTransformations = {
 };
 var { retry: retry2 } = streamTransformations;
 var AssertionError = class extends Error {
-  constructor(message) {
-    super(message);
+  constructor(message2) {
+    super(message2);
   }
 };
 var isSubset = (superObj, subObj) => {
@@ -334,37 +334,37 @@ var isSubset = (superObj, subObj) => {
     return sub[ele] === sup[ele];
   });
 };
-var assertFails = (message) => {
-  throw new AssertionError(_nullishCoalesce(message, () => ( "That should not ever happened, right?")));
+var assertFails = (message2) => {
+  throw new AssertionError(_nullishCoalesce(message2, () => ( "That should not ever happened, right?")));
 };
-var assertDeepEqual = (actual, expected, message) => {
+var assertDeepEqual = (actual, expected, message2) => {
   if (!deepEquals(actual, expected))
     throw new AssertionError(
-      _nullishCoalesce(message, () => ( `subObj:
+      _nullishCoalesce(message2, () => ( `subObj:
 ${JSONParser.stringify(expected)}
 is not equal to
 ${JSONParser.stringify(actual)}`))
     );
 };
-function assertTrue(condition, message) {
+function assertTrue(condition, message2) {
   if (condition !== true)
-    throw new AssertionError(_nullishCoalesce(message, () => ( `Condition is false`)));
+    throw new AssertionError(_nullishCoalesce(message2, () => ( `Condition is false`)));
 }
-function assertOk(obj, message) {
-  if (!obj) throw new AssertionError(_nullishCoalesce(message, () => ( `Condition is not truthy`)));
+function assertOk(obj, message2) {
+  if (!obj) throw new AssertionError(_nullishCoalesce(message2, () => ( `Condition is not truthy`)));
 }
-function assertEqual(expected, actual, message) {
+function assertEqual(expected, actual, message2) {
   if (expected !== actual)
     throw new AssertionError(
-      `${_nullishCoalesce(message, () => ( "Objects are not equal"))}:
+      `${_nullishCoalesce(message2, () => ( "Objects are not equal"))}:
 Expected: ${JSONParser.stringify(expected)}
 Actual: ${JSONParser.stringify(actual)}`
     );
 }
-function assertNotEqual(obj, other, message) {
+function assertNotEqual(obj, other, message2) {
   if (obj === other)
     throw new AssertionError(
-      _nullishCoalesce(message, () => ( `Objects are equal: ${JSONParser.stringify(obj)}`))
+      _nullishCoalesce(message2, () => ( `Objects are equal: ${JSONParser.stringify(obj)}`))
     );
 }
 function assertIsNotNull(result) {
@@ -463,8 +463,8 @@ var streamsTable = {
     isArchived: columns.isArchived
   }
 };
-var eventsTable = {
-  name: `${emmettPrefix}_events`,
+var messagesTable = {
+  name: `${emmettPrefix}_messages`,
   columns: {
     partition: columns.partition,
     isArchived: columns.isArchived
@@ -480,7 +480,7 @@ var readLastMessageGlobalPosition = async (execute, options) => {
     execute.query(
       _dumbo.sql.call(void 0, 
         `SELECT global_position
-           FROM ${eventsTable.name}
+           FROM ${messagesTable.name}
            WHERE partition = %L AND is_archived = FALSE AND transaction_id < pg_snapshot_xmin(pg_current_snapshot())
            ORDER BY transaction_id, global_position
            LIMIT 1`,
@@ -504,8 +504,8 @@ var readMessagesBatch = async (execute, options) => {
   const events = await _dumbo.mapRows.call(void 0, 
     execute.query(
       _dumbo.sql.call(void 0, 
-        `SELECT stream_id, stream_position, global_position, event_data, event_metadata, event_schema_version, event_type, event_id
-           FROM ${eventsTable.name}
+        `SELECT stream_id, stream_position, global_position, message_data, message_metadata, message_schema_version, message_type, message_id
+           FROM ${messagesTable.name}
            WHERE partition = %L AND is_archived = FALSE AND transaction_id < pg_snapshot_xmin(pg_current_snapshot()) ${fromCondition} ${toCondition}
            ORDER BY transaction_id, global_position
            ${limitCondition}`,
@@ -514,19 +514,20 @@ var readMessagesBatch = async (execute, options) => {
     ),
     (row) => {
       const rawEvent = {
-        type: row.event_type,
-        data: row.event_data,
-        metadata: row.event_metadata
+        type: row.message_type,
+        data: row.message_data,
+        metadata: row.message_metadata
       };
       const metadata = {
         ..."metadata" in rawEvent ? _nullishCoalesce(rawEvent.metadata, () => ( {})) : {},
-        eventId: row.event_id,
+        messageId: row.message_id,
         streamName: row.stream_id,
         streamPosition: BigInt(row.stream_position),
         globalPosition: BigInt(row.global_position)
       };
       return {
         ...rawEvent,
+        kind: "Event",
         metadata
       };
     }
@@ -623,13 +624,14 @@ var zipPostgreSQLEventStoreMessageBatchPullerStartFrom = (options) => {
 
 
 
-var appendEventsSQL = _dumbo.rawSql.call(void 0, 
-  `CREATE OR REPLACE FUNCTION emt_append_event(
-      v_event_ids text[],
-      v_events_data jsonb[],
-      v_events_metadata jsonb[],
-      v_event_schema_versions text[],
-      v_event_types text[],
+var appendToStreamSQL = _dumbo.rawSql.call(void 0, 
+  `CREATE OR REPLACE FUNCTION emt_append_to_stream(
+      v_message_ids text[],
+      v_messages_data jsonb[],
+      v_messages_metadata jsonb[],
+      v_message_schema_versions text[],
+      v_message_types text[],
+      v_message_kinds text[],
       v_stream_id text,
       v_stream_type text,
       v_expected_stream_position bigint DEFAULT NULL,
@@ -648,42 +650,15 @@ var appendEventsSQL = _dumbo.rawSql.call(void 0,
       v_transaction_id xid8;
       v_last_global_position bigint;
   BEGIN
+      v_transaction_id := pg_current_xact_id();
+
       IF v_expected_stream_position IS NULL THEN
           SELECT COALESCE(max(stream_position), 0) INTO v_expected_stream_position
           FROM ${streamsTable.name}
           WHERE stream_id = v_stream_id AND partition = v_partition;
       END IF;
 
-      v_next_stream_position := v_expected_stream_position + array_upper(v_events_data, 1);
-      v_transaction_id := pg_current_xact_id();
-
-      WITH ev AS (
-          SELECT row_number() OVER () + v_expected_stream_position AS stream_position, 
-                event_data, 
-                event_metadata, 
-                schema_version, 
-                event_id, 
-                event_type
-          FROM (
-              SELECT *
-              FROM 
-                unnest(v_event_ids, v_events_data, v_events_metadata, v_event_schema_versions, v_event_types) 
-              AS event(event_id, event_data, event_metadata, schema_version, event_type)
-          ) AS event
-      ),
-      all_events_insert AS (
-          INSERT INTO ${eventsTable.name}
-              (stream_id, stream_position, partition, event_data, event_metadata, event_schema_version, event_type, event_id, transaction_id)
-          SELECT 
-              v_stream_id, ev.stream_position, v_partition, ev.event_data, ev.event_metadata, ev.schema_version, ev.event_type, ev.event_id, v_transaction_id
-          FROM ev
-          RETURNING global_position
-      )
-      SELECT 
-          max(global_position) INTO v_last_global_position 
-      FROM 
-          all_events_insert;
-
+      v_next_stream_position := v_expected_stream_position + array_upper(v_messages_data, 1);
 
       IF v_expected_stream_position = 0 THEN
           INSERT INTO ${streamsTable.name}
@@ -703,25 +678,54 @@ var appendEventsSQL = _dumbo.rawSql.call(void 0,
           END IF;
       END IF;
 
+      WITH ev AS (
+          SELECT row_number() OVER () + v_expected_stream_position AS stream_position, 
+                message_data, 
+                message_metadata, 
+                schema_version, 
+                message_id, 
+                message_type,
+                message_kind
+          FROM (
+              SELECT *
+              FROM 
+                unnest(v_message_ids, v_messages_data, v_messages_metadata, v_message_schema_versions, v_message_types, v_message_kinds) 
+              AS message(message_id, message_data, message_metadata, schema_version, message_type, message_kind)
+          ) AS message
+      ),
+      all_messages_insert AS (
+          INSERT INTO ${messagesTable.name}
+              (stream_id, stream_position, partition, message_data, message_metadata, message_schema_version, message_type, message_kind, message_id, transaction_id)
+          SELECT 
+              v_stream_id, ev.stream_position, v_partition, ev.message_data, ev.message_metadata, ev.schema_version, ev.message_type, ev.message_kind, ev.message_id, v_transaction_id
+          FROM ev
+          RETURNING global_position
+      )
+      SELECT 
+          max(global_position) INTO v_last_global_position 
+      FROM 
+          all_messages_insert;
+
       RETURN QUERY SELECT TRUE, v_next_stream_position, v_last_global_position, v_transaction_id;
   END;
   $$;
   `
 );
-var appendToStream = (pool, streamName, streamType, events, options) => pool.withTransaction(async (transaction) => {
+var appendToStream = (pool, streamName, streamType, messages, options) => pool.withTransaction(async (transaction) => {
   const { execute } = transaction;
-  if (events.length === 0)
+  if (messages.length === 0)
     return { success: false, result: { success: false } };
   let appendResult;
   try {
     const expectedStreamVersion = toExpectedVersion(
       _optionalChain([options, 'optionalAccess', _19 => _19.expectedStreamVersion])
     );
-    const eventsToAppend = events.map((e, i) => ({
+    const messagesToAppend = messages.map((e, i) => ({
       ...e,
+      kind: _nullishCoalesce(e.kind, () => ( "Event")),
       metadata: {
         streamName,
-        eventId: _uuid.v4.call(void 0, ),
+        messageId: _uuid.v4.call(void 0, ),
         streamPosition: BigInt(i),
         ..."metadata" in e ? _nullishCoalesce(e.metadata, () => ( {})) : {}
       }
@@ -730,13 +734,13 @@ var appendToStream = (pool, streamName, streamType, events, options) => pool.wit
       execute,
       streamName,
       streamType,
-      eventsToAppend,
+      messagesToAppend,
       {
         expectedStreamVersion
       }
     );
     if (_optionalChain([options, 'optionalAccess', _20 => _20.preCommitHook]))
-      await options.preCommitHook(eventsToAppend, { transaction });
+      await options.preCommitHook(messagesToAppend, { transaction });
   } catch (error) {
     if (!isOptimisticConcurrencyError(error)) throw error;
     appendResult = {
@@ -770,25 +774,27 @@ var toExpectedVersion = (expected) => {
   return expected;
 };
 var isOptimisticConcurrencyError = (error) => error instanceof Error && "code" in error && error.code === "23505";
-var appendEventsRaw = (execute, streamId, streamType, events, options) => _dumbo.single.call(void 0, 
+var appendEventsRaw = (execute, streamId, streamType, messages, options) => _dumbo.single.call(void 0, 
   execute.command(
     _dumbo.sql.call(void 0, 
-      `SELECT * FROM emt_append_event(
+      `SELECT * FROM emt_append_to_stream(
                   ARRAY[%s]::text[],
                   ARRAY[%s]::jsonb[],
                   ARRAY[%s]::jsonb[],
                   ARRAY[%s]::text[],
                   ARRAY[%s]::text[],
+                  ARRAY[%s]::text[],
                   %L::text,
                   %L::text,
                   %s::bigint,
                   %L::text
               )`,
-      events.map((e) => _dumbo.sql.call(void 0, "%L", e.metadata.eventId)).join(","),
-      events.map((e) => _dumbo.sql.call(void 0, "%L", JSONParser.stringify(e.data))).join(","),
-      events.map((e) => _dumbo.sql.call(void 0, "%L", JSONParser.stringify(_nullishCoalesce(e.metadata, () => ( {}))))).join(","),
-      events.map(() => `'1'`).join(","),
-      events.map((e) => _dumbo.sql.call(void 0, "%L", e.type)).join(","),
+      messages.map((e) => _dumbo.sql.call(void 0, "%L", e.metadata.messageId)).join(","),
+      messages.map((e) => _dumbo.sql.call(void 0, "%L", JSONParser.stringify(e.data))).join(","),
+      messages.map((e) => _dumbo.sql.call(void 0, "%L", JSONParser.stringify(_nullishCoalesce(e.metadata, () => ( {}))))).join(","),
+      messages.map(() => `'1'`).join(","),
+      messages.map((e) => _dumbo.sql.call(void 0, "%L", e.type)).join(","),
+      messages.map((e) => _dumbo.sql.call(void 0, "%L", e.kind === "Event" ? "E" : "C")).join(","),
       streamId,
       streamType,
       _nullishCoalesce(_optionalChain([options, 'optionalAccess', _21 => _21.expectedStreamVersion]), () => ( "NULL")),
@@ -886,7 +892,7 @@ var streamsTableSQL = _dumbo.rawSql.call(void 0,
   `CREATE TABLE IF NOT EXISTS ${streamsTable.name}(
       stream_id         TEXT                      NOT NULL,
       stream_position   BIGINT                    NOT NULL,
-      partition         TEXT                      NOT NULL DEFAULT '${globalTag}__${globalTag}',
+      partition         TEXT                      NOT NULL DEFAULT '${globalTag}',
       stream_type       TEXT                      NOT NULL,
       stream_metadata   JSONB                     NOT NULL,
       is_archived       BOOLEAN                   NOT NULL DEFAULT FALSE,
@@ -894,21 +900,22 @@ var streamsTableSQL = _dumbo.rawSql.call(void 0,
       UNIQUE (stream_id, partition, is_archived)
   ) PARTITION BY LIST (partition);`
 );
-var eventsTableSQL = _dumbo.rawSql.call(void 0, 
+var messagesTableSQL = _dumbo.rawSql.call(void 0, 
   `
-  CREATE SEQUENCE IF NOT EXISTS emt_global_event_position;
+  CREATE SEQUENCE IF NOT EXISTS emt_global_message_position;
 
-  CREATE TABLE IF NOT EXISTS ${eventsTable.name}(
+  CREATE TABLE IF NOT EXISTS ${messagesTable.name}(
       stream_id              TEXT                      NOT NULL,
       stream_position        BIGINT                    NOT NULL,
       partition              TEXT                      NOT NULL DEFAULT '${globalTag}',
-      event_data             JSONB                     NOT NULL,
-      event_metadata         JSONB                     NOT NULL,
-      event_schema_version   TEXT                      NOT NULL,
-      event_type             TEXT                      NOT NULL,
-      event_id               TEXT                      NOT NULL,
+      message_kind           CHAR(1)                   NOT NULL DEFAULT 'E',
+      message_data           JSONB                     NOT NULL,
+      message_metadata       JSONB                     NOT NULL,
+      message_schema_version TEXT                      NOT NULL,
+      message_type           TEXT                      NOT NULL,
+      message_id             TEXT                      NOT NULL,
       is_archived            BOOLEAN                   NOT NULL DEFAULT FALSE,
-      global_position        BIGINT                    DEFAULT nextval('emt_global_event_position'),
+      global_position        BIGINT                    DEFAULT nextval('emt_global_message_position'),
       transaction_id         XID8                      NOT NULL,
       created                TIMESTAMPTZ               NOT NULL DEFAULT now(),
       PRIMARY KEY (stream_id, stream_position, partition, is_archived)
@@ -919,7 +926,7 @@ var subscriptionsTableSQL = _dumbo.rawSql.call(void 0,
   CREATE TABLE IF NOT EXISTS ${subscriptionsTable.name}(
       subscription_id                 TEXT                   NOT NULL,
       version                         INT                    NOT NULL DEFAULT 1,
-      partition                       TEXT                   NOT NULL DEFAULT '${globalTag}__${globalTag}',
+      partition                       TEXT                   NOT NULL DEFAULT '${globalTag}',
       last_processed_position         BIGINT                 NOT NULL,
       last_processed_transaction_id   XID8                   NOT NULL,
       PRIMARY KEY (subscription_id, partition, version)
@@ -967,11 +974,11 @@ var addTablePartitions = _dumbo.rawSql.call(void 0,
   END;
   $$ LANGUAGE plpgsql;`
 );
-var addEventsPartitions = _dumbo.rawSql.call(void 0, 
+var addPartitionSQL = _dumbo.rawSql.call(void 0, 
   `
   CREATE OR REPLACE FUNCTION emt_add_partition(partition_name TEXT) RETURNS void AS $$
   BEGIN                
-      PERFORM emt_add_table_partition('${eventsTable.name}', partition_name);
+      PERFORM emt_add_table_partition('${messagesTable.name}', partition_name);
       PERFORM emt_add_table_partition('${streamsTable.name}', partition_name);
 
       EXECUTE format('
@@ -986,23 +993,23 @@ var addModuleSQL = _dumbo.rawSql.call(void 0,
   `
       CREATE OR REPLACE FUNCTION add_module(new_module TEXT) RETURNS void AS $$
       BEGIN
-          -- For ${eventsTable.name} table
+          -- For ${messagesTable.name} table
           EXECUTE format('
               CREATE TABLE IF NOT EXISTS %I PARTITION OF %I
               FOR VALUES IN (emt_sanitize_name(%L || ''__'' || %L)) PARTITION BY LIST (is_archived);',
-              emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || '${globalTag}'), '${eventsTable.name}', new_module, '${globalTag}'
+              emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || '${globalTag}'), '${messagesTable.name}', new_module, '${globalTag}'
           );
   
           EXECUTE format('
               CREATE TABLE IF NOT EXISTS %I_active PARTITION OF %I
               FOR VALUES IN (FALSE);',
-              emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || '${globalTag}' || '_active'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || '${globalTag}')
+              emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || '${globalTag}' || '_active'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || '${globalTag}')
           );
   
           EXECUTE format('
               CREATE TABLE IF NOT EXISTS %I_archived PARTITION OF %I
               FOR VALUES IN (TRUE);',
-              emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || '${globalTag}' || '_archived'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || '${globalTag}')
+              emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || '${globalTag}' || '_archived'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || '${globalTag}')
           );
   
           -- For ${streamsTable.name} table
@@ -1031,23 +1038,23 @@ var addTenantSQL = _dumbo.rawSql.call(void 0,
   `
     CREATE OR REPLACE FUNCTION add_tenant(new_module TEXT, new_tenant TEXT) RETURNS void AS $$
     BEGIN
-        -- For ${eventsTable.name} table
+        -- For ${messagesTable.name} table
         EXECUTE format('
             CREATE TABLE IF NOT EXISTS %I PARTITION OF %I
             FOR VALUES IN (emt_sanitize_name(''%s__%s'')) PARTITION BY LIST (is_archived);',
-            emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || new_tenant), '${eventsTable.name}', new_module, new_tenant
+            emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || new_tenant), '${messagesTable.name}', new_module, new_tenant
         );
   
         EXECUTE format('
             CREATE TABLE IF NOT EXISTS %I_active PARTITION OF %I
             FOR VALUES IN (FALSE);',
-            emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || new_tenant || '_active'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || new_tenant)
+            emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || new_tenant || '_active'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || new_tenant)
         );
   
         EXECUTE format('
             CREATE TABLE IF NOT EXISTS %I_archived PARTITION OF %I
             FOR VALUES IN (TRUE);',
-            emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || new_tenant || '_archived'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || new_tenant)
+            emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || new_tenant || '_archived'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || new_tenant)
         );
   
         -- For ${streamsTable.name} table
@@ -1080,25 +1087,25 @@ var addModuleForAllTenantsSQL = _dumbo.rawSql.call(void 0,
     BEGIN
         PERFORM add_module(new_module);
   
-        FOR tenant_record IN SELECT DISTINCT tenant FROM ${eventsTable.name}
+        FOR tenant_record IN SELECT DISTINCT tenant FROM ${messagesTable.name}
         LOOP
-            -- For ${eventsTable.name} table
+            -- For ${messagesTable.name} table
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I PARTITION OF %I
                 FOR VALUES IN (emt_sanitize_name(''%s__%s'')) PARTITION BY LIST (is_archived);',
-                emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || tenant_record.tenant), '${eventsTable.name}', new_module, tenant_record.tenant
+                emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || tenant_record.tenant), '${messagesTable.name}', new_module, tenant_record.tenant
             );
   
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I_active PARTITION OF %I
                 FOR VALUES IN (FALSE);',
-                emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || tenant_record.tenant || '_active'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || tenant_record.tenant)
+                emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || tenant_record.tenant || '_active'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || tenant_record.tenant)
             );
   
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I_archived PARTITION OF %I
                 FOR VALUES IN (TRUE);',
-                emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || tenant_record.tenant || '_archived'), emt_sanitize_name('${eventsTable.name}_' || new_module || '__' || tenant_record.tenant)
+                emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || tenant_record.tenant || '_archived'), emt_sanitize_name('${messagesTable.name}_' || new_module || '__' || tenant_record.tenant)
             );
   
             -- For ${streamsTable.name} table
@@ -1130,25 +1137,25 @@ var addTenantForAllModulesSQL = _dumbo.rawSql.call(void 0,
     DECLARE
         module_record RECORD;
     BEGIN
-        FOR module_record IN SELECT DISTINCT partitionname FROM pg_partman.part_config WHERE parent_table = '${eventsTable.name}'
+        FOR module_record IN SELECT DISTINCT partitionname FROM pg_partman.part_config WHERE parent_table = '${messagesTable.name}'
         LOOP
-            -- For ${eventsTable.name} table
+            -- For ${messagesTable.name} table
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I PARTITION OF %I
                 FOR VALUES IN (emt_sanitize_name(''%s__%s'')) PARTITION BY LIST (is_archived);',
-                emt_sanitize_name('${eventsTable.name}_' || module_record.partitionname || '__' || new_tenant), '${eventsTable.name}', module_record.partitionname, new_tenant
+                emt_sanitize_name('${messagesTable.name}_' || module_record.partitionname || '__' || new_tenant), '${messagesTable.name}', module_record.partitionname, new_tenant
             );
   
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I_active PARTITION OF %I
                 FOR VALUES IN (FALSE);',
-                emt_sanitize_name('${eventsTable.name}_' || module_record.partitionname || '__' || new_tenant || '_active'), emt_sanitize_name('${eventsTable.name}_' || module_record.partitionname || '__' || new_tenant)
+                emt_sanitize_name('${messagesTable.name}_' || module_record.partitionname || '__' || new_tenant || '_active'), emt_sanitize_name('${messagesTable.name}_' || module_record.partitionname || '__' || new_tenant)
             );
   
             EXECUTE format('
                 CREATE TABLE IF NOT EXISTS %I_archived PARTITION OF %I
                 FOR VALUES IN (TRUE);',
-                emt_sanitize_name('${eventsTable.name}_' || module_record.partitionname || '__' || new_tenant || '_archived'), emt_sanitize_name('${eventsTable.name}_' || module_record.partitionname || '__' || new_tenant)
+                emt_sanitize_name('${messagesTable.name}_' || module_record.partitionname || '__' || new_tenant || '_archived'), emt_sanitize_name('${messagesTable.name}_' || module_record.partitionname || '__' || new_tenant)
             );
   
             -- For ${streamsTable.name} table
@@ -1174,9 +1181,76 @@ var addTenantForAllModulesSQL = _dumbo.rawSql.call(void 0,
     $$ LANGUAGE plpgsql;
   `
 );
-var addDefaultPartition = _dumbo.rawSql.call(void 0, 
+var addDefaultPartitionSQL = _dumbo.rawSql.call(void 0, 
   `SELECT emt_add_partition('${defaultTag}');`
 );
+var migrationFromEventsToMessagesSQL = _dumbo.rawSql.call(void 0, `
+DO $$ 
+DECLARE
+    partition_record RECORD;
+BEGIN
+    -- Rename the main table and its columns if it exists
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'emt_events') THEN
+        -- Rename all partitions first
+        FOR partition_record IN 
+            SELECT tablename 
+            FROM pg_tables 
+            WHERE tablename LIKE 'emt_events_%'
+            ORDER BY tablename DESC  -- to handle child partitions first
+        LOOP
+            EXECUTE format('ALTER TABLE %I RENAME TO %I', 
+                partition_record.tablename, 
+                REPLACE(partition_record.tablename, 'events', 'messages'));
+        END LOOP;
+
+        -- Rename the main table
+        ALTER TABLE emt_events RENAME TO emt_messages;
+        
+        -- Rename columns
+        ALTER TABLE emt_messages 
+            RENAME COLUMN event_data TO message_data;
+        ALTER TABLE emt_messages 
+            RENAME COLUMN event_metadata TO message_metadata;
+        ALTER TABLE emt_messages 
+            RENAME COLUMN event_schema_version TO message_schema_version;
+        ALTER TABLE emt_messages 
+            RENAME COLUMN event_type TO message_type;
+        ALTER TABLE emt_messages 
+            RENAME COLUMN event_id TO message_id;
+        ALTER TABLE emt_messages 
+            ADD COLUMN message_kind CHAR(1) NOT NULL DEFAULT 'E';
+
+        -- Rename sequence if it exists
+        IF EXISTS (SELECT 1 FROM pg_sequences WHERE sequencename = 'emt_global_event_position') THEN
+            ALTER SEQUENCE emt_global_event_position 
+            RENAME TO emt_global_message_position;
+            
+            ALTER TABLE emt_messages 
+                ALTER COLUMN global_position 
+                SET DEFAULT nextval('emt_global_message_position');
+        END IF;
+    END IF;
+END $$;`);
+
+// src/eventStore/schema/readProcessorCheckpoint.ts
+
+var readProcessorCheckpoint = async (execute, options) => {
+  const result = await _dumbo.singleOrNull.call(void 0, 
+    execute.query(
+      _dumbo.sql.call(void 0, 
+        `SELECT last_processed_position
+           FROM ${subscriptionsTable.name}
+           WHERE partition = %L AND subscription_id = %L
+           LIMIT 1`,
+        _nullishCoalesce(_optionalChain([options, 'optionalAccess', _23 => _23.partition]), () => ( defaultTag)),
+        options.processorId
+      )
+    )
+  );
+  return {
+    lastProcessedPosition: result !== null ? BigInt(result.last_processed_position) : null
+  };
+};
 
 // src/eventStore/schema/readStream.ts
 
@@ -1189,28 +1263,29 @@ var readStream = async (execute, streamId, options) => {
   const events = await _dumbo.mapRows.call(void 0, 
     execute.query(
       _dumbo.sql.call(void 0, 
-        `SELECT stream_id, stream_position, global_position, event_data, event_metadata, event_schema_version, event_type, event_id
-           FROM ${eventsTable.name}
+        `SELECT stream_id, stream_position, global_position, message_data, message_metadata, message_schema_version, message_type, message_id
+           FROM ${messagesTable.name}
            WHERE stream_id = %L AND partition = %L AND is_archived = FALSE ${fromCondition} ${toCondition}`,
         streamId,
-        _nullishCoalesce(_optionalChain([options, 'optionalAccess', _23 => _23.partition]), () => ( defaultTag))
+        _nullishCoalesce(_optionalChain([options, 'optionalAccess', _24 => _24.partition]), () => ( defaultTag))
       )
     ),
     (row) => {
       const rawEvent = {
-        type: row.event_type,
-        data: row.event_data,
-        metadata: row.event_metadata
+        type: row.message_type,
+        data: row.message_data,
+        metadata: row.message_metadata
       };
       const metadata = {
         ..."metadata" in rawEvent ? _nullishCoalesce(rawEvent.metadata, () => ( {})) : {},
-        eventId: row.event_id,
+        messageId: row.message_id,
         streamName: streamId,
         streamPosition: BigInt(row.stream_position),
         globalPosition: BigInt(row.global_position)
       };
       return {
         ...rawEvent,
+        kind: "Event",
         metadata
       };
     }
@@ -1226,40 +1301,21 @@ var readStream = async (execute, streamId, options) => {
   };
 };
 
-// src/eventStore/schema/readProcessorCheckpoint.ts
-
-var readProcessorCheckpoint = async (execute, options) => {
-  const result = await _dumbo.singleOrNull.call(void 0, 
-    execute.query(
-      _dumbo.sql.call(void 0, 
-        `SELECT last_processed_position
-           FROM ${subscriptionsTable.name}
-           WHERE partition = %L AND subscription_id = %L
-           LIMIT 1`,
-        _nullishCoalesce(_optionalChain([options, 'optionalAccess', _24 => _24.partition]), () => ( defaultTag)),
-        options.processorId
-      )
-    )
-  );
-  return {
-    lastProcessedPosition: result !== null ? BigInt(result.last_processed_position) : null
-  };
-};
-
 // src/eventStore/schema/index.ts
 var schemaSQL = [
+  migrationFromEventsToMessagesSQL,
   streamsTableSQL,
-  eventsTableSQL,
+  messagesTableSQL,
   subscriptionsTableSQL,
   sanitizeNameSQL,
   addTablePartitions,
-  addEventsPartitions,
+  addPartitionSQL,
   addModuleSQL,
   addTenantSQL,
   addModuleForAllTenantsSQL,
   addTenantForAllModulesSQL,
-  appendEventsSQL,
-  addDefaultPartition,
+  appendToStreamSQL,
+  addDefaultPartitionSQL,
   storeSubscriptionCheckpointSQL
 ];
 var createEventStoreSchema = async (pool) => {
@@ -1675,10 +1731,11 @@ var PostgreSQLProjectionSpec = {
                   globalPosition: ++globalPosition,
                   streamPosition: globalPosition,
                   streamName: `test-${_uuid.v4.call(void 0, )}`,
-                  eventId: _uuid.v4.call(void 0, )
+                  messageId: _uuid.v4.call(void 0, )
                 };
                 allEvents.push({
                   ...event,
+                  kind: "Event",
                   metadata: {
                     ...metadata,
                     ..."metadata" in event ? _nullishCoalesce(event.metadata, () => ( {})) : {}
@@ -1992,5 +2049,6 @@ var getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOpti
 
 
 
-exports.DefaultPostgreSQLEventStoreProcessorBatchSize = DefaultPostgreSQLEventStoreProcessorBatchSize; exports.DefaultPostgreSQLEventStoreProcessorPullingFrequencyInMs = DefaultPostgreSQLEventStoreProcessorPullingFrequencyInMs; exports.PostgreSQLEventStoreDefaultStreamVersion = PostgreSQLEventStoreDefaultStreamVersion; exports.PostgreSQLProcessor = PostgreSQLProcessor; exports.PostgreSQLProjectionSpec = PostgreSQLProjectionSpec; exports.addDefaultPartition = addDefaultPartition; exports.addEventsPartitions = addEventsPartitions; exports.addModuleForAllTenantsSQL = addModuleForAllTenantsSQL; exports.addModuleSQL = addModuleSQL; exports.addTablePartitions = addTablePartitions; exports.addTenantForAllModulesSQL = addTenantForAllModulesSQL; exports.addTenantSQL = addTenantSQL; exports.appendEventsSQL = appendEventsSQL; exports.appendToStream = appendToStream; exports.assertSQLQueryResultMatches = assertSQLQueryResultMatches; exports.createEventStoreSchema = createEventStoreSchema; exports.defaultPostgreSQLOptions = defaultPostgreSQLOptions; exports.defaultTag = defaultTag; exports.documentDoesNotExist = documentDoesNotExist; exports.documentExists = documentExists; exports.documentMatchingExists = documentMatchingExists; exports.documentsAreTheSame = documentsAreTheSame; exports.documentsMatchingHaveCount = documentsMatchingHaveCount; exports.emmettPrefix = emmettPrefix; exports.eventInStream = eventInStream; exports.eventsInStream = eventsInStream; exports.eventsTable = eventsTable; exports.eventsTableSQL = eventsTableSQL; exports.expectPongoDocuments = expectPongoDocuments; exports.expectSQL = expectSQL; exports.getPostgreSQLEventStore = getPostgreSQLEventStore; exports.globalNames = globalNames; exports.globalTag = globalTag; exports.handleProjections = handleProjections; exports.newEventsInStream = newEventsInStream; exports.pongoMultiStreamProjection = pongoMultiStreamProjection; exports.pongoProjection = pongoProjection; exports.pongoSingleStreamProjection = pongoSingleStreamProjection; exports.postgreSQLEventStoreConsumer = postgreSQLEventStoreConsumer; exports.postgreSQLEventStoreMessageBatchPuller = postgreSQLEventStoreMessageBatchPuller; exports.postgreSQLProcessor = postgreSQLProcessor; exports.postgreSQLProjection = postgreSQLProjection; exports.postgreSQLProjectionProcessor = postgreSQLProjectionProcessor; exports.postgreSQLRawBatchSQLProjection = postgreSQLRawBatchSQLProjection; exports.postgreSQLRawSQLProjection = postgreSQLRawSQLProjection; exports.readLastMessageGlobalPosition = readLastMessageGlobalPosition; exports.readMessagesBatch = readMessagesBatch; exports.readProcessorCheckpoint = readProcessorCheckpoint; exports.readStream = readStream; exports.sanitizeNameSQL = sanitizeNameSQL; exports.schemaSQL = schemaSQL; exports.storeProcessorCheckpoint = storeProcessorCheckpoint; exports.storeSubscriptionCheckpointSQL = storeSubscriptionCheckpointSQL; exports.streamsTable = streamsTable; exports.streamsTableSQL = streamsTableSQL; exports.subscriptionsTable = subscriptionsTable; exports.subscriptionsTableSQL = subscriptionsTableSQL; exports.zipPostgreSQLEventStoreMessageBatchPullerStartFrom = zipPostgreSQLEventStoreMessageBatchPullerStartFrom;
+
+exports.DefaultPostgreSQLEventStoreProcessorBatchSize = DefaultPostgreSQLEventStoreProcessorBatchSize; exports.DefaultPostgreSQLEventStoreProcessorPullingFrequencyInMs = DefaultPostgreSQLEventStoreProcessorPullingFrequencyInMs; exports.PostgreSQLEventStoreDefaultStreamVersion = PostgreSQLEventStoreDefaultStreamVersion; exports.PostgreSQLProcessor = PostgreSQLProcessor; exports.PostgreSQLProjectionSpec = PostgreSQLProjectionSpec; exports.addDefaultPartitionSQL = addDefaultPartitionSQL; exports.addModuleForAllTenantsSQL = addModuleForAllTenantsSQL; exports.addModuleSQL = addModuleSQL; exports.addPartitionSQL = addPartitionSQL; exports.addTablePartitions = addTablePartitions; exports.addTenantForAllModulesSQL = addTenantForAllModulesSQL; exports.addTenantSQL = addTenantSQL; exports.appendToStream = appendToStream; exports.appendToStreamSQL = appendToStreamSQL; exports.assertSQLQueryResultMatches = assertSQLQueryResultMatches; exports.createEventStoreSchema = createEventStoreSchema; exports.defaultPostgreSQLOptions = defaultPostgreSQLOptions; exports.defaultTag = defaultTag; exports.documentDoesNotExist = documentDoesNotExist; exports.documentExists = documentExists; exports.documentMatchingExists = documentMatchingExists; exports.documentsAreTheSame = documentsAreTheSame; exports.documentsMatchingHaveCount = documentsMatchingHaveCount; exports.emmettPrefix = emmettPrefix; exports.eventInStream = eventInStream; exports.eventsInStream = eventsInStream; exports.expectPongoDocuments = expectPongoDocuments; exports.expectSQL = expectSQL; exports.getPostgreSQLEventStore = getPostgreSQLEventStore; exports.globalNames = globalNames; exports.globalTag = globalTag; exports.handleProjections = handleProjections; exports.messagesTable = messagesTable; exports.messagesTableSQL = messagesTableSQL; exports.migrationFromEventsToMessagesSQL = migrationFromEventsToMessagesSQL; exports.newEventsInStream = newEventsInStream; exports.pongoMultiStreamProjection = pongoMultiStreamProjection; exports.pongoProjection = pongoProjection; exports.pongoSingleStreamProjection = pongoSingleStreamProjection; exports.postgreSQLEventStoreConsumer = postgreSQLEventStoreConsumer; exports.postgreSQLEventStoreMessageBatchPuller = postgreSQLEventStoreMessageBatchPuller; exports.postgreSQLProcessor = postgreSQLProcessor; exports.postgreSQLProjection = postgreSQLProjection; exports.postgreSQLProjectionProcessor = postgreSQLProjectionProcessor; exports.postgreSQLRawBatchSQLProjection = postgreSQLRawBatchSQLProjection; exports.postgreSQLRawSQLProjection = postgreSQLRawSQLProjection; exports.readLastMessageGlobalPosition = readLastMessageGlobalPosition; exports.readMessagesBatch = readMessagesBatch; exports.readProcessorCheckpoint = readProcessorCheckpoint; exports.readStream = readStream; exports.sanitizeNameSQL = sanitizeNameSQL; exports.schemaSQL = schemaSQL; exports.storeProcessorCheckpoint = storeProcessorCheckpoint; exports.storeSubscriptionCheckpointSQL = storeSubscriptionCheckpointSQL; exports.streamsTable = streamsTable; exports.streamsTableSQL = streamsTableSQL; exports.subscriptionsTable = subscriptionsTable; exports.subscriptionsTableSQL = subscriptionsTableSQL; exports.zipPostgreSQLEventStoreMessageBatchPullerStartFrom = zipPostgreSQLEventStoreMessageBatchPullerStartFrom;
 //# sourceMappingURL=index.cjs.map