From 0c23e5213be1366bb64029e2007e97194e126676 Mon Sep 17 00:00:00 2001
From: dullbananas <dull.bananas0@gmail.com>
Date: Wed, 2 Aug 2023 16:57:03 -0700
Subject: [PATCH] Move WithoutId to lib.rs

---
 crates/db_schema/src/lib.rs        | 69 ++++++++++++++++++++++++++++--
 crates/db_schema/src/without_id.rs | 65 ----------------------------
 2 files changed, 66 insertions(+), 68 deletions(-)
 delete mode 100644 crates/db_schema/src/without_id.rs

diff --git a/crates/db_schema/src/lib.rs b/crates/db_schema/src/lib.rs
index e07728f5e..814da350b 100644
--- a/crates/db_schema/src/lib.rs
+++ b/crates/db_schema/src/lib.rs
@@ -29,9 +29,72 @@ extern crate macro_rules_attribute;
 extern crate paste;
 
 #[cfg(feature = "full")]
-#[allow(unused_imports)]
-#[macro_use]
-mod without_id;
+/// `macro_rules_attribute::derive(WithoutId!)` generates a variant of the struct with
+/// `WithoutId` added to the name and no `id` field.
+///
+/// This is useful for making less redundant selections of multiple joined tables.
+/// For example, selecting both `comment::post_id` and `post::id` is redundant if they
+/// have the same value. In this case, the selection of `post::id` can be avoided by selecting
+/// `PostWithoutId::as_select()` instead of `post::all_columns`.
+///
+/// This macro generates an `into_full` method, which converts to the sturct with `id`.
+/// For example, `PostWithoutId` would have this:
+///
+/// `pub fn into_full(self, id: PostId) -> Post`
+///
+/// The `id` value can come from a column in another table, like `comment::post_id`.
+///
+/// The generated struct implements `Selectable` and `Queryable`.
+macro_rules! WithoutId {
+  (
+    #[diesel(table_name = $table_name:ident)]
+    $(#[$_struct_meta:meta])*
+    $vis:vis struct $struct_name:ident {
+      $(#[$_id_meta:meta])*
+      $_id_vis:vis id: $id_type:ty,
+      $(
+        // TODO: more flexible and clean attribute matching
+        $(#[doc = $_doc1:tt])*
+        $(#[cfg($($cfgtt:tt)*)])*
+        $(#[cfg_attr($($cfgattrtt:tt)*)] $(#[doc = $_doc2:tt])*)*
+        $(#[serde($($serdett:tt)*)])*
+        $field_vis:vis $field_name:ident : $field_type:ty,
+      )*
+    }
+  ) => {
+    ::paste::paste! {
+      #[derive(::diesel::Queryable, ::diesel::Selectable)]
+      #[diesel(table_name = $table_name)]
+      $vis struct [<$struct_name WithoutId>] {
+        $(
+          $(#[cfg($($cfgtt)*)])*
+          $field_vis $field_name : $field_type,
+        )*
+      }
+
+      impl [<$struct_name WithoutId>] {
+        pub fn into_full(self, id: $id_type) -> $struct_name {
+          $struct_name {
+            id,
+            $($(#[cfg($($cfgtt)*)])* $field_name : self.$field_name,)*
+          }
+        }
+      }
+    }
+  };
+
+  // Keep on removing the first attribute until `diesel(table_name = ...)` becomes
+  // the first, which will cause the first pattern to be matched.
+  (#[$_meta:meta] $($remaining:tt)*) => {
+    WithoutId!($($remaining)*);
+  };
+
+  // This pattern is matched when there's no attributes.
+  ($_vis:vis struct $($_tt:tt)*) => {
+    ::std::compile_error!("`#[diesel(table_name = ...)]` is missing");
+  };
+}
+
 pub mod aggregates;
 #[cfg(feature = "full")]
 pub mod impls;
diff --git a/crates/db_schema/src/without_id.rs b/crates/db_schema/src/without_id.rs
deleted file mode 100644
index ab8b3a6b5..000000000
--- a/crates/db_schema/src/without_id.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-/// `macro_rules_attribute::derive(WithoutId!)` generates a variant of the struct with
-/// `WithoutId` added to the name and no `id` field.
-///
-/// This is useful for making less redundant selections of multiple joined tables.
-/// For example, selecting both `comment::post_id` and `post::id` is redundant if they
-/// have the same value. In this case, the selection of `post::id` can be avoided by selecting
-/// `PostWithoutId::as_select()` instead of `post::all_columns`.
-///
-/// This macro generates an `into_full` method, which converts to the sturct with `id`.
-/// For example, `PostWithoutId` would have this:
-///
-/// `pub fn into_full(self, id: PostId) -> Post`
-///
-/// The `id` value can come from a column in another table, like `comment::post_id`.
-///
-/// The generated struct implements `Selectable` and `Queryable`.
-macro_rules! WithoutId {
-  (
-    #[diesel(table_name = $table_name:ident)]
-    $(#[$_struct_meta:meta])*
-    $vis:vis struct $struct_name:ident {
-      $(#[$_id_meta:meta])*
-      $_id_vis:vis id: $id_type:ty,
-      $(
-        // TODO: more flexible and clean attribute matching
-        $(#[doc = $_doc1:tt])*
-        $(#[cfg($($cfgtt:tt)*)])*
-        $(#[cfg_attr($($cfgattrtt:tt)*)] $(#[doc = $_doc2:tt])*)*
-        $(#[serde($($serdett:tt)*)])*
-        $field_vis:vis $field_name:ident : $field_type:ty,
-      )*
-    }
-  ) => {
-    ::paste::paste! {
-      #[derive(::diesel::Queryable, ::diesel::Selectable)]
-      #[diesel(table_name = $table_name)]
-      $vis struct [<$struct_name WithoutId>] {
-        $(
-          $(#[cfg($($cfgtt)*)])*
-          $field_vis $field_name : $field_type,
-        )*
-      }
-
-      impl [<$struct_name WithoutId>] {
-        pub fn into_full(self, id: $id_type) -> $struct_name {
-          $struct_name {
-            id,
-            $($(#[cfg($($cfgtt)*)])* $field_name : self.$field_name,)*
-          }
-        }
-      }
-    }
-  };
-
-  // Keep on removing the first attribute until `diesel(table_name = ...)` becomes
-  // the first, which will cause the first pattern to be matched.
-  (#[$_meta:meta] $($remaining:tt)*) => {
-    WithoutId!($($remaining)*);
-  };
-
-  // This pattern is matched when there's no attributes.
-  ($_vis:vis struct $($_tt:tt)*) => {
-    ::std::compile_error!("`#[diesel(table_name = ...)]` is missing");
-  };
-}