Merge pull request #3370 from weiznich/rewrite_table_macro_as_proc_macro

Rewrite table! as proc_macro
diesel-rs · Nov 3, 2022 · f560c29 · f560c29
2 parents b5eef93 + 282bfa5
commit f560c29
Show file tree

Hide file tree

Showing 45 changed files with 1,685 additions and 2,457 deletions.
diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
@@ -513,6 +513,8 @@ pub mod prelude {
     pub use crate::query_source::{Column, JoinTo, QuerySource, Table};
     #[doc(inline)]
     pub use crate::result::{ConnectionError, ConnectionResult, OptionalExtension, QueryResult};
+    #[doc(inline)]
+    pub use diesel_derives::table_proc as table;
 
     #[cfg(feature = "mysql")]
     #[doc(inline)]
@@ -525,6 +527,8 @@ pub mod prelude {
     pub use crate::sqlite::SqliteConnection;
 }
 
+#[doc(inline)]
+pub use crate::macros::table;
 pub use crate::prelude::*;
 #[doc(inline)]
 pub use crate::query_builder::debug_query;
@@ -537,7 +541,3 @@ pub use crate::result::Error::NotFound;
 pub(crate) mod diesel {
     pub(crate) use super::*;
 }
-
-// workaround https://github.com/rust-lang/rust/pull/52234
-#[doc(hidden)]
-pub use __diesel_check_column_count_internal as __diesel_check_column_count;