diff --git a/crates/db_schema/src/without_id.rs b/crates/db_schema/src/without_id.rs
index 5158b3328..501ba5162 100644
--- a/crates/db_schema/src/without_id.rs
+++ b/crates/db_schema/src/without_id.rs
@@ -22,12 +22,11 @@ macro_rules! WithoutId {
       $(#[$_id_meta:meta])*
       $_id_vis:vis id: $id_type:ty,
       $(
-        // TODO: more flexible attribute matching
+        // TODO: more flexible and clean attribute matching
         $(#[doc = $_doc1:tt])*
         $(#[cfg($($cfgtt:tt)*)])*
-        $(#[cfg_attr($($cfgattrtt:tt)*)])*
+        $(#[cfg_attr($($cfgattrtt:tt)*)] $(#[doc = $_doc2:tt])*)*
         $(#[serde($($serdett:tt)*)])*
-        $(#[doc = $_doc2:tt])*
         $field_vis:vis $field_name:ident : $field_type:ty,
       )*
     }