Merge remote-tracking branch 'origin/main' into ql_gen

Author: nickrolfe

extractor/src/extractor.rs

@@ -229,13 +229,13 @@ impl Visitor<'_> {
                         )
                     }
                 }
-                Storage::Table { index } => {
-                    for child_id in child_ids {
+                Storage::Table => {
+                    for (index, child_id) in child_ids.iter().enumerate() {
                         self.trap_output.push(TrapEntry::ChildOf(
                             node_type_name(&field.parent.kind, field.parent.named),
                             parent_id,
                             field.get_name(),
-                            Index(*index),
+                            Index(index),
                             *child_id,
                         ));
                     }

generator/src/ql_gen.rs

@@ -400,7 +400,7 @@ fn create_field_getters(
             *main_table_column_index += 1;
             result
         }
-        node_types::Storage::Table { index: _ } => {
+        node_types::Storage::Table => {
             let field_table_name = format!("{}_{}", parent_name, &field.get_name());
             (
                 ql::Predicate {

node-types/src/lib.rs

@@ -47,9 +47,7 @@ pub enum Storage {
     /// the field is stored as a column in the parent table
     Column,
     // the field is store in a link table
-    Table {
-        index: usize,
-    },
+    Table,
 }
 
 pub fn read_node_types(node_types_path: &Path) -> std::io::Result<Vec<Entry>> {
@@ -132,9 +130,7 @@ fn add_field(
     } else {
         // This field can appear zero or multiple times, so put
         // it in an auxiliary table.
-        storage = Storage::Table {
-            index: fields.len(),
-        };
+        storage = Storage::Table;
     }
     fields.push(Field {
         parent: TypeName {