Fix table codegen wrt table names (#1689)

Author: coolreader18

crates/cli/src/subcommands/generate/rust.rs

@@ -860,7 +860,7 @@ fn print_handle_table_update_defn(ctx: &GenCtx, out: &mut Indenter, items: &[Gen
                         writeln!(
                             out,
                             "{:?} => client_cache.{}::<{}::{}>(callbacks, table_update),",
-                            type_name(ctx, table_desc.data),
+                            table.table_name,
                             if find_primary_key_column_index(&table).is_some() {
                                 "handle_table_update_with_primary_key"
                             } else {
@@ -916,7 +916,7 @@ fn print_handle_resubscribe_defn(ctx: &GenCtx, out: &mut Indenter, items: &[GenI
                         writeln!(
                             out,
                             "{:?} => client_cache.handle_resubscribe_for_type::<{}::{}>(callbacks, new_subs),",
-                            type_name(ctx, table.data),
+                            table.schema.table_name,
                             type_name(ctx, table.data).to_case(Case::Snake),
                             type_name(ctx, table.data).to_case(Case::Pascal),
                         );

crates/cli/tests/snapshots/codegen__codegen_rust.snap

@@ -393,14 +393,14 @@ impl SpacetimeModule for Module {
 	fn handle_table_update(&self, table_update: TableUpdate, client_cache: &mut ClientCache, callbacks: &mut RowCallbackReminders) {
 				let table_name = &table_update.table_name[..];
 match table_name {
-						"HasSpecialStuff" => client_cache.handle_table_update_no_primary_key::<has_special_stuff::HasSpecialStuff>(callbacks, table_update),
-			"PkMultiIdentity" => client_cache.handle_table_update_with_primary_key::<pk_multi_identity::PkMultiIdentity>(callbacks, table_update),
-			"Point" => client_cache.handle_table_update_no_primary_key::<point::Point>(callbacks, table_update),
-			"Private" => client_cache.handle_table_update_no_primary_key::<private::Private>(callbacks, table_update),
-			"RepeatingTestArg" => client_cache.handle_table_update_with_primary_key::<repeating_test_arg::RepeatingTestArg>(callbacks, table_update),
-			"TestA" => client_cache.handle_table_update_no_primary_key::<test_a::TestA>(callbacks, table_update),
-			"TestD" => client_cache.handle_table_update_no_primary_key::<test_d::TestD>(callbacks, table_update),
-			"TestE" => client_cache.handle_table_update_with_primary_key::<test_e::TestE>(callbacks, table_update),
+						"has_special_stuff" => client_cache.handle_table_update_no_primary_key::<has_special_stuff::HasSpecialStuff>(callbacks, table_update),
+			"pk_multi_identity" => client_cache.handle_table_update_with_primary_key::<pk_multi_identity::PkMultiIdentity>(callbacks, table_update),
+			"points" => client_cache.handle_table_update_no_primary_key::<point::Point>(callbacks, table_update),
+			"private" => client_cache.handle_table_update_no_primary_key::<private::Private>(callbacks, table_update),
+			"repeating_test_args" => client_cache.handle_table_update_with_primary_key::<repeating_test_arg::RepeatingTestArg>(callbacks, table_update),
+			"test_a" => client_cache.handle_table_update_no_primary_key::<test_a::TestA>(callbacks, table_update),
+			"test_d" => client_cache.handle_table_update_no_primary_key::<test_d::TestD>(callbacks, table_update),
+			"test_e" => client_cache.handle_table_update_with_primary_key::<test_e::TestE>(callbacks, table_update),
 			_ => spacetimedb_sdk::log::error!("TableRowOperation on unknown table {:?}", table_name),
 }
 }
@@ -431,14 +431,14 @@ match &reducer_call.reducer_name[..] {
 fn handle_resubscribe(&self, new_subs: TableUpdate, client_cache: &mut ClientCache, callbacks: &mut RowCallbackReminders) {
 				let table_name = &new_subs.table_name[..];
 match table_name {
-						"HasSpecialStuff" => client_cache.handle_resubscribe_for_type::<has_special_stuff::HasSpecialStuff>(callbacks, new_subs),
-			"PkMultiIdentity" => client_cache.handle_resubscribe_for_type::<pk_multi_identity::PkMultiIdentity>(callbacks, new_subs),
-			"Point" => client_cache.handle_resubscribe_for_type::<point::Point>(callbacks, new_subs),
-			"Private" => client_cache.handle_resubscribe_for_type::<private::Private>(callbacks, new_subs),
-			"RepeatingTestArg" => client_cache.handle_resubscribe_for_type::<repeating_test_arg::RepeatingTestArg>(callbacks, new_subs),
-			"TestA" => client_cache.handle_resubscribe_for_type::<test_a::TestA>(callbacks, new_subs),
-			"TestD" => client_cache.handle_resubscribe_for_type::<test_d::TestD>(callbacks, new_subs),
-			"TestE" => client_cache.handle_resubscribe_for_type::<test_e::TestE>(callbacks, new_subs),
+						"has_special_stuff" => client_cache.handle_resubscribe_for_type::<has_special_stuff::HasSpecialStuff>(callbacks, new_subs),
+			"pk_multi_identity" => client_cache.handle_resubscribe_for_type::<pk_multi_identity::PkMultiIdentity>(callbacks, new_subs),
+			"points" => client_cache.handle_resubscribe_for_type::<point::Point>(callbacks, new_subs),
+			"private" => client_cache.handle_resubscribe_for_type::<private::Private>(callbacks, new_subs),
+			"repeating_test_args" => client_cache.handle_resubscribe_for_type::<repeating_test_arg::RepeatingTestArg>(callbacks, new_subs),
+			"test_a" => client_cache.handle_resubscribe_for_type::<test_a::TestA>(callbacks, new_subs),
+			"test_d" => client_cache.handle_resubscribe_for_type::<test_d::TestD>(callbacks, new_subs),
+			"test_e" => client_cache.handle_resubscribe_for_type::<test_e::TestE>(callbacks, new_subs),
 			_ => spacetimedb_sdk::log::error!("TableRowOperation on unknown table {:?}", table_name),
 }
 }