Skip to content

Fix C# + C++ SDKs for making Options filterable and expand sdk-test #5461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JasonAtClockwork wants to merge 5 commits into
base: phoebe/sdk-test-filterable-option
Choose a base branch
from
Open

Fix C# + C++ SDKs for making Options filterable and expand sdk-test #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f2a3f8
Added basic sdk-test update for filterable option in TS/C#/C++
JasonAtClockwork Jun 29, 2026
f69f4db
Add C# + Unreal tests for nullable filters
JasonAtClockwork Jun 29, 2026
150784c
Linting fix
JasonAtClockwork Jun 29, 2026
5706407
Add missing delete_all from sdk-test-*
JasonAtClockwork Jun 30, 2026
9f1893f
Fix for dotnet tests
JasonAtClockwork Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions crates/bindings-cpp/include/spacetimedb/table_with_constraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,30 @@ struct MultiColumnIndexTag {
// Constraint Concepts
// =============================================================================

namespace detail {
template<typename T>
struct filterable_value_impl
: std::bool_constant<
std::integral<T> ||
std::same_as<T, std::string> ||
std::same_as<T, SpacetimeDB::Identity> ||
std::same_as<T, SpacetimeDB::ConnectionId> ||
std::same_as<T, SpacetimeDB::Timestamp> ||
std::same_as<T, SpacetimeDB::Uuid> ||
std::same_as<T, SpacetimeDB::I128> ||
std::same_as<T, SpacetimeDB::U128> ||
std::same_as<T, SpacetimeDB::I256> ||
std::same_as<T, SpacetimeDB::U256> ||
std::same_as<T, SpacetimeDB::i256> ||
std::same_as<T, SpacetimeDB::u256> ||
std::is_enum_v<T>> {};

template<typename T>
struct filterable_value_impl<std::optional<T>> : filterable_value_impl<std::remove_cvref_t<T>> {};
}

template<typename T>
concept FilterableValue =
std::integral<T> ||
std::same_as<T, std::string> ||
std::same_as<T, SpacetimeDB::Identity> ||
std::same_as<T, SpacetimeDB::ConnectionId> ||
std::same_as<T, SpacetimeDB::Timestamp> ||
std::same_as<T, SpacetimeDB::Uuid> ||
std::same_as<T, SpacetimeDB::I128> ||
std::same_as<T, SpacetimeDB::U128> ||
std::same_as<T, SpacetimeDB::I256> ||
std::same_as<T, SpacetimeDB::U256> ||
std::same_as<T, SpacetimeDB::i256> ||
std::same_as<T, SpacetimeDB::u256> ||
std::is_enum_v<T>;
concept FilterableValue = detail::filterable_value_impl<std::remove_cvref_t<T>>::value;

template<typename T>
concept AutoIncrementable =
Expand Down
27 changes: 27 additions & 0 deletions crates/bindings-csharp/Codegen.Tests/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,33 @@ public static void TestNullableBTreeIndex(ReducerContext ctx)
_ = ctx.Db.NullableBTreeIndex.AccountId.Filter(new Bound<uint?>(null, 99));
}
}

[SpacetimeDB.Table]
public partial struct NullableUniqueIndex
{
[SpacetimeDB.PrimaryKey]
public uint Id;

[SpacetimeDB.Unique]
public uint? AccountId;

[SpacetimeDB.Unique]
public string? Name;

[SpacetimeDB.Unique]
public SpacetimeDB.Uuid? ExternalId;

[SpacetimeDB.Reducer]
public static void TestNullableUniqueIndex(ReducerContext ctx)
{
_ = ctx.Db.NullableUniqueIndex.AccountId.Find((uint?)null);
_ = ctx.Db.NullableUniqueIndex.AccountId.Find((uint?)55);
_ = ctx.Db.NullableUniqueIndex.Name.Find((string?)null);
_ = ctx.Db.NullableUniqueIndex.Name.Find("name");
_ = ctx.Db.NullableUniqueIndex.ExternalId.Find((SpacetimeDB.Uuid?)null);
_ = ctx.Db.NullableUniqueIndex.ExternalId.Find(SpacetimeDB.Uuid.NIL);
}
}
""";

var parseOptions = new CSharpParseOptions(fixture.SampleCompilation.LanguageVersion);
Expand Down
70 changes: 70 additions & 0 deletions crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module#FFI.verified.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 1 addition & 35 deletions crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,6 @@
}
},
{/*
[Unique]
public int? UniqueField;
^^^^^^^^^^^

*/
Message: Field UniqueField is marked as Unique but it has a type int? which is not an equatable primitive.,
Severity: Error,
Descriptor: {
Id: STDB0003,
Title: Unique fields must be equatable,
MessageFormat: Field {0} is marked as Unique but it has a type {1} which is not an equatable primitive.,
Category: SpacetimeDB,
DefaultSeverity: Error,
IsEnabledByDefault: true
}
},
{/*
[SpacetimeDB.Table]
public partial record TestTableTaggedEnum : SpacetimeDB.TaggedEnum<(int X, int Y)> { }
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -69,23 +52,6 @@ public partial record TestTableTaggedEnum : SpacetimeDB.TaggedEnum<(int X, int Y
}
},
{/*
[Unique]
public int? UniqueField;
^^^^^^^^^^^

*/
Message: Field UniqueField is marked as Unique but it has a type int? which is not an equatable primitive.,
Severity: Error,
Descriptor: {
Id: STDB0003,
Title: Unique fields must be equatable,
MessageFormat: Field {0} is marked as Unique but it has a type {1} which is not an equatable primitive.,
Category: SpacetimeDB,
DefaultSeverity: Error,
IsEnabledByDefault: true
}
},
{/*
{
[SpacetimeDB.Index.BTree(Accessor = "TestUnexpectedColumns", Columns = ["UnexpectedColumn"])]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -626,4 +592,4 @@ public partial struct TestScheduleIssues
}
}
]
}
}
24 changes: 18 additions & 6 deletions crates/bindings-csharp/Codegen/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,22 @@ public static bool IsNoPayloadEnum(ITypeSymbol type)
&& variants.All(field => field.Type.ToString() == "SpacetimeDB.Unit");
}

public static bool IsEquatable(ITypeSymbol type) =>
(
IsInteger(type)
private static ITypeSymbol UnwrapNullable(ITypeSymbol type) =>
type switch
{
INamedTypeSymbol
{
OriginalDefinition.SpecialType: SpecialType.System_Nullable_T
} nullable => nullable.TypeArguments[0],
_ when type.NullableAnnotation == NullableAnnotation.Annotated =>
type.WithNullableAnnotation(NullableAnnotation.None),
_ => type,
};

public static bool IsEquatable(ITypeSymbol type)
{
type = UnwrapNullable(type);
return IsInteger(type)
|| IsNoPayloadEnum(type)
|| type.SpecialType switch
{
Expand All @@ -173,9 +186,8 @@ public static bool IsEquatable(ITypeSymbol type) =>
or "SpacetimeDB.Timestamp"
or "SpacetimeDB.Uuid",
_ => false,
}
)
&& type.NullableAnnotation != NullableAnnotation.Annotated;
};
}
}

/// <summary>
Expand Down
19 changes: 15 additions & 4 deletions crates/codegen/src/csharp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,12 @@ impl Lang for Csharp<'_> {
(csharp_field_name_pascal, csharp_field_type)
};

let (row_to_key, key_type) = match columns.as_singleton() {
let (row_to_key, key_type, nullable_single_column) = match columns.as_singleton() {
Some(col_pos) => {
let (field_name, field_type) = get_csharp_field_name_and_type(col_pos);
(format!("row.{field_name}"), field_type.to_string())
let field_type = field_type.to_string();
let nullable_single_column = field_type.ends_with('?');
(format!("row.{field_name}"), field_type, nullable_single_column)
}
None => {
let mut key_accessors = Vec::new();
Expand All @@ -576,6 +578,7 @@ impl Lang for Csharp<'_> {
(
format!("({})", key_accessors.join(", ")),
format!("({})", key_type_elems.join(", ")),
false,
)
}
};
Expand All @@ -585,10 +588,18 @@ impl Lang for Csharp<'_> {
let mut csharp_index_class_name = csharp_index_name.clone();
let csharp_index_base_class_name = if schema.is_unique(&columns) {
csharp_index_class_name += "UniqueIndex";
"UniqueIndexBase"
if nullable_single_column {
"NullableUniqueIndexBase"
} else {
"UniqueIndexBase"
}
} else {
csharp_index_class_name += "Index";
"BTreeIndexBase"
if nullable_single_column {
"NullableBTreeIndexBase"
} else {
"BTreeIndexBase"
}
};

writeln!(
Expand Down
Loading
Loading