clockworklabs · cloutiertyler · Feb 12, 2026 · Feb 12, 2026 · Feb 12, 2026 · Feb 12, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,11 +49,13 @@ members = [
   "modules/sdk-test-connect-disconnect",
   "modules/sdk-test-procedure",
   "modules/sdk-test-view",
+  "modules/sdk-test-event-table",
   "sdks/rust/tests/test-client",
   "sdks/rust/tests/test-counter",
   "sdks/rust/tests/connect_disconnect_client",
   "sdks/rust/tests/procedure-client",
   "sdks/rust/tests/view-client",
+  "sdks/rust/tests/event-table-client",
   "tools/ci",
   "tools/upgrade-version",
   "tools/license-check",

diff --git a/crates/bindings-macro/src/lib.rs b/crates/bindings-macro/src/lib.rs
@@ -61,6 +61,7 @@ mod sym {
     symbol!(unique);
     symbol!(update);
     symbol!(default);
+    symbol!(event);
 
     symbol!(u8);
     symbol!(i8);

diff --git a/crates/bindings-macro/src/table.rs b/crates/bindings-macro/src/table.rs
@@ -19,6 +19,7 @@ pub(crate) struct TableArgs {
     scheduled: Option<ScheduledArg>,
     name: Ident,
     indices: Vec<IndexArg>,
+    event: Option<Span>,
 }
 
 enum TableAccess {
@@ -71,6 +72,7 @@ impl TableArgs {
         let mut scheduled = None;
         let mut name = None;
         let mut indices = Vec::new();
+        let mut event = None;
         syn::meta::parser(|meta| {
             match_meta!(match meta {
                 sym::public => {
@@ -91,6 +93,10 @@ impl TableArgs {
                     check_duplicate(&scheduled, &meta)?;
                     scheduled = Some(ScheduledArg::parse_meta(meta)?);
                 }
+                sym::event => {
+                    check_duplicate(&event, &meta)?;
+                    event = Some(meta.path.span());
+                }
             });
             Ok(())
         })
@@ -107,6 +113,7 @@ impl TableArgs {
             scheduled,
             name,
             indices,
+            event,
         })
     }
 }
@@ -852,6 +859,18 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     );
 
     let table_access = args.access.iter().map(|acc| acc.to_value());
+    let is_event = args.event.iter().map(|_| {
+        quote!(
+            const IS_EVENT: bool = true;
+        )
+    });
+    let can_be_lookup_impl = if args.event.is_none() {
+        quote! {
+            impl spacetimedb::query_builder::CanBeLookupTable for #original_struct_ident {}
+        }
+    } else {
+        quote! {}
+    };
     let unique_col_ids = unique_columns.iter().map(|col| col.index);
     let primary_col_id = primary_key_column.clone().into_iter().map(|col| col.index);
     let sequence_col_ids = sequenced_columns.iter().map(|col| col.index);
@@ -977,6 +996,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             const TABLE_NAME: &'static str = #table_name;
             // the default value if not specified is Private
             #(const TABLE_ACCESS: spacetimedb::table::TableAccess = #table_access;)*
+            #(#is_event)*
             const UNIQUE_COLUMNS: &'static [u16] = &[#(#unique_col_ids),*];
             const INDEXES: &'static [spacetimedb::table::IndexDesc<'static>] = &[#(#index_descs),*];
             #(const PRIMARY_KEY: Option<u16> = Some(#primary_col_id);)*
@@ -1088,6 +1108,8 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             }
         }
 
+        #can_be_lookup_impl
+
     };
 
     let table_query_handle_def = quote! {

diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
@@ -117,6 +117,7 @@ export function tableToSchema<
       };
     }) as T['idxs'],
     tableDef,
+    ...(tableDef.isEvent ? { isEvent: true } : {}),
   };
 }
 

diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
@@ -117,6 +117,7 @@ export type UntypedTableDef = {
   indexes: readonly IndexOpts<any>[];
   constraints: readonly ConstraintOpts<any>[];
   tableDef: Infer<typeof RawTableDefV10>;
+  isEvent?: boolean;
 };
 
 /**
@@ -179,6 +180,7 @@ export type TableOpts<Row extends RowObj> = {
         { [k: string]: RowBuilder<RowObj> },
         ReturnType<typeof t.unit>
       >;
+  event?: boolean;
 };
 
 /**
@@ -301,6 +303,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     public: isPublic = false,
     indexes: userIndexes = [],
     scheduled,
+    event: isEvent = false,
   } = opts;
 
   // 1. column catalogue + helpers
@@ -476,7 +479,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
         tableType: { tag: 'User' },
         tableAccess: { tag: isPublic ? 'Public' : 'Private' },
         defaultValues,
-        isEvent: false,
+        isEvent,
       };
     },
     idxs: {} as OptsIndices<Opts>,

diff --git a/crates/bindings-typescript/src/sdk/client_table.ts b/crates/bindings-typescript/src/sdk/client_table.ts
@@ -42,7 +42,7 @@ export type ClientTablePrimaryKeyMethods<
   ): void;
 };
 
-export type ClientTableMethods<
+export type ClientTableInsertMethods<
   RemoteModule extends UntypedRemoteModule,
   TableName extends TableNamesOf<RemoteModule>,
 > = {
@@ -66,7 +66,12 @@ export type ClientTableMethods<
       row: Prettify<RowType<TableDefForTableName<RemoteModule, TableName>>>
     ) => void
   ): void;
+};
 
+export type ClientTableDeleteMethods<
+  RemoteModule extends UntypedRemoteModule,
+  TableName extends TableNamesOf<RemoteModule>,
+> = {
   /**
    * Registers a callback to be invoked when a row is deleted from the table.
    */
@@ -89,6 +94,12 @@ export type ClientTableMethods<
   ): void;
 };
 
+export type ClientTableMethods<
+  RemoteModule extends UntypedRemoteModule,
+  TableName extends TableNamesOf<RemoteModule>,
+> = ClientTableInsertMethods<RemoteModule, TableName> &
+  ClientTableDeleteMethods<RemoteModule, TableName>;
+
 /**
  * Table<Row, UniqueConstraintViolation = never, AutoIncOverflow = never>
  *
@@ -107,6 +118,12 @@ export type ClientTable<
     >
 >;
 
+type IsEventTable<TableDef extends UntypedTableDef> = TableDef extends {
+  isEvent: true;
+}
+  ? true
+  : false;
+
 type HasPrimaryKey<TableDef extends UntypedTableDef> = ColumnsHavePrimaryKey<
   TableDef['columns']
 >;
@@ -142,13 +159,21 @@ export type ClientTableCoreImplementable<
 
 /**
  * Core methods of ClientTable, without the indexes mixed in.
- * Includes only staticly known methods.
+ * Includes only statically known methods.
+ *
+ * Event tables only expose insert callbacks (no delete or update),
+ * matching the Rust SDK's `EventTable` trait.
  */
 export type ClientTableCore<
   RemoteModule extends UntypedRemoteModule,
   TableName extends TableNamesOf<RemoteModule>,
 > = ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
-  ClientTableMethods<RemoteModule, TableName> &
-  (HasPrimaryKey<TableDefForTableName<RemoteModule, TableName>> extends true
-    ? ClientTablePrimaryKeyMethods<RemoteModule, TableName>
-    : {});
+  ClientTableInsertMethods<RemoteModule, TableName> &
+  (IsEventTable<TableDefForTableName<RemoteModule, TableName>> extends true
+    ? {}
+    : ClientTableDeleteMethods<RemoteModule, TableName> &
+        (HasPrimaryKey<
+          TableDefForTableName<RemoteModule, TableName>
+        > extends true
+          ? ClientTablePrimaryKeyMethods<RemoteModule, TableName>
+          : {}));
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -510,7 +510,8 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
       return inserts.concat(deletes);
     }
     if (rows.tag === 'EventTable') {
-      // TODO: Decide how event tables should be merged into the cache.
+      // Event table rows are insert-only. The table cache handles skipping
+      // storage for event tables and only firing on_insert callbacks.
       return this.#parseRowList('insert', tableName, rows.value.events);
     }
     return [];

diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -261,6 +261,23 @@ export class TableCacheImpl<
     ctx: EventContextInterface<RemoteModule>
   ): PendingCallback[] => {
     const pendingCallbacks: PendingCallback[] = [];
+
+    // Event tables: fire on_insert callbacks but don't store rows in the cache.
+    if (this.tableDef.isEvent) {
+      for (const op of operations) {
+        if (op.type === 'insert') {
+          pendingCallbacks.push({
+            type: 'insert',
+            table: this.tableDef.sourceName,
+            cb: () => {
+              this.emitter.emit('insert', ctx, op.row);
+            },
+          });
+        }
+      }
+      return pendingCallbacks;
+    }
+
     // TODO: performance
     const hasPrimaryKey = Object.values(this.tableDef.columns).some(
       col => col.columnMetadata.isPrimaryKey === true

diff --git a/crates/bindings/src/rt.rs b/crates/bindings/src/rt.rs
@@ -740,7 +740,8 @@ pub fn register_table<T: Table>() {
             .inner
             .build_table(T::TABLE_NAME, product_type_ref)
             .with_type(TableType::User)
-            .with_access(T::TABLE_ACCESS);
+            .with_access(T::TABLE_ACCESS)
+            .with_event(T::IS_EVENT);
 
         for &col in T::UNIQUE_COLUMNS {
             table = table.with_unique_constraint(col);

diff --git a/crates/bindings/src/table.rs b/crates/bindings/src/table.rs
@@ -128,6 +128,7 @@ pub trait TableInternal: Sized {
     const PRIMARY_KEY: Option<u16> = None;
     const SEQUENCES: &'static [u16];
     const SCHEDULE: Option<ScheduleDesc<'static>> = None;
+    const IS_EVENT: bool = false;
 
     /// Returns the ID of this table.
     fn table_id() -> TableId;

diff --git a/crates/codegen/src/csharp.rs b/crates/codegen/src/csharp.rs
@@ -521,9 +521,14 @@ impl Lang for Csharp<'_> {
             let csharp_table_class_name = csharp_table_name.clone() + "Handle";
             let table_type = type_ref_name(module, table.product_type_ref);
 
+            let base_class = if table.is_event {
+                "RemoteEventTableHandle"
+            } else {
+                "RemoteTableHandle"
+            };
             writeln!(
                 output,
-                "public sealed class {csharp_table_class_name} : RemoteTableHandle<EventContext, {table_type}>"
+                "public sealed class {csharp_table_class_name} : {base_class}<EventContext, {table_type}>"
             );
             indented_block(output, |output| {
                 writeln!(
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,6 +117,7 @@ export function tableToSchema< @@
           };
         }) as T['idxs'],
         tableDef,
+        ...(tableDef.isEvent ? { isEvent: true } : {}),
       };
     }
@@ Expand Down @@