fix index arg

Author: Shubham8287

crates/lib/src/db/raw_def/v10.rs

@@ -350,17 +350,14 @@ pub struct RawIndexDefV10 {
     /// Even though there is ABSOLUTELY NO REASON TO.
     pub source_name: Option<RawIdentifier>,
 
-    /// Accessor name for the index used in client codegen.
+    /// name for the index used internally and in client codegen
     ///
     /// This is set the user and should not be assumed to follow
     /// any particular format.
     ///
     /// May be set to `None` if this is an auto-generated index for which the user
-    /// has not supplied a name. In this case, no client code generation for this index
-    /// will be performed.
-    ///
-    /// This name is not visible in the system tables, it is only used for client codegen.
-    pub accessor_name: Option<RawIdentifier>,
+    /// has not supplied a name.
+    pub name: Option<RawIdentifier>,
 
     /// The algorithm parameters for the index.
     pub algorithm: RawIndexAlgorithm,
@@ -1140,8 +1137,8 @@ impl RawTableDefBuilderV10<'_> {
         let accessor_name = accessor_name.into();
 
         self.table.indexes.push(RawIndexDefV10 {
-            source_name: index_name.map(Into::into),
-            accessor_name: Some(accessor_name),
+            name: index_name.map(Into::into),
+            source_name: Some(accessor_name),
             algorithm,
         });
         self
@@ -1151,7 +1148,7 @@ impl RawTableDefBuilderV10<'_> {
     pub fn with_index_no_accessor_name(mut self, algorithm: RawIndexAlgorithm) -> Self {
         self.table.indexes.push(RawIndexDefV10 {
             source_name: None,
-            accessor_name: None,
+            name: None,
             algorithm,
         });
         self

crates/lib/src/db/raw_def/v9.rs

@@ -1074,8 +1074,8 @@ impl From<RawScopedTypeNameV10> for RawScopedTypeNameV9 {
 impl From<RawIndexDefV10> for RawIndexDefV9 {
     fn from(raw: RawIndexDefV10) -> Self {
         RawIndexDefV9 {
-            name: raw.source_name,
-            accessor_name: raw.accessor_name,
+            accessor_name: raw.source_name,
+            name: raw.name,
             algorithm: raw.algorithm,
         }
     }

crates/schema/src/def/validate/v10.rs

@@ -867,17 +867,17 @@ mod tests {
             [
                 &IndexDef {
                     name: "Apples_count_idx_direct".into(),
-                    codegen_name: Some(expect_identifier("Apples_count_direct")),
+                    codegen_name: Some(expect_identifier("Apples_count_idx_direct")),
                     algorithm: DirectAlgorithm { column: 2.into() }.into(),
                 },
                 &IndexDef {
                     name: "Apples_name_count_idx_btree".into(),
-                    codegen_name: Some(expect_identifier("apples_id")),
+                    codegen_name: Some(expect_identifier("Apples_name_count_idx_btree")),
                     algorithm: BTreeAlgorithm { columns: [1, 2].into() }.into(),
                 },
                 &IndexDef {
                     name: "Apples_type_idx_btree".into(),
-                    codegen_name: Some(expect_identifier("Apples_type_btree")),
+                    codegen_name: Some(expect_identifier("Apples_type_idx_btree")),
                     algorithm: BTreeAlgorithm { columns: 3.into() }.into(),
                 }
             ]
@@ -1463,7 +1463,7 @@ mod tests {
         let mut raw_def = builder.finish();
         let tables = raw_def.tables_mut_for_tests();
         tables[0].constraints[0].source_name = Some("wacky.constraint()".into());
-        tables[0].indexes[0].source_name = Some("wacky.index()".into());
+        tables[0].indexes[0].name = Some("wacky.index()".into());
         tables[0].sequences[0].source_name = Some("wacky.sequence()".into());
 
         let def: ModuleDef = raw_def.try_into().unwrap();