checkpoint

src/database/schema.rs

@@ -551,10 +551,6 @@ impl Schema {
       return;
     }
 
-    if let Some(id) = &self.obj.id {
-        println!("[DEBUG POLYMORPHISM] ID: {}, Strategy: {}, Options: {:?}", id, strategy, options);
-    }
-
     if !options.is_empty() {
         let _ = self.obj.compiled_discriminator.set(strategy);
         let _ = self.obj.compiled_options.set(options);

src/queryer/compiler.rs

@@ -102,7 +102,11 @@ impl<'a> Compiler<'a> {
     let mut resolved_type = None;
 
     if let Some(family_target) = node.schema.obj.family.as_ref() {
-      resolved_type = self.db.types.get(family_target);
+      let base_type_name = family_target
+        .split('.')
+        .next_back()
+        .unwrap_or(family_target);
+      resolved_type = self.db.types.get(base_type_name);
     } else if let Some(base_type_name) = node.schema.obj.identifier() {
       resolved_type = self.db.types.get(&base_type_name);
     }
@@ -221,7 +225,6 @@ impl<'a> Compiler<'a> {
         }
         
         let options = node.schema.obj.compiled_options.get();
-        println!("[DEBUG QUERYER] Evaluating node. Target family: {:?}, disc: {:?}, options: {:?}", node.schema.obj.family, disc, options);
         if options.is_none() {
             return Ok(select_args);
         }
@@ -352,7 +355,9 @@ impl<'a> Compiler<'a> {
   ) -> Result<Vec<String>, String> {
     let mut select_args = Vec::new();
     let grouped_fields = r#type.grouped_fields.as_ref().and_then(|v| v.as_object());
-    let merged_props = node.schema.obj.compiled_properties.get().unwrap();
+    let default_props = std::collections::BTreeMap::new();
+    let merged_props = node.schema.obj.compiled_properties.get().unwrap_or(&default_props);
+    
     let mut sorted_keys: Vec<&String> = merged_props.keys().collect();
     sorted_keys.sort();