Merge pull request #1526 from diesel-rs/sg-rewrite-identifiable

Rewrite `#[derive(Identifiable)]` in derives2
diesel-rs · Feb 3, 2018 · 14887fc · 14887fc
2 parents 0b0b1e8 + b76df56
commit 14887fc
Show file tree

Hide file tree

Showing 16 changed files with 318 additions and 414 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,9 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   old and new timestamp formats. (The migrations were always run in the correct
   order, this only affects the display logic of `migration list`)
 
+* `#[derive(Identifiable)]` now correctly associates `#[primary_key]` with the
+  column name, not field name.
+
 ## [1.1.1] - 2018-01-16
 
 ### Added

diff --git a/diesel/src/macros/identifiable.rs b/diesel/src/macros/identifiable.rs
diff --git a/diesel/src/macros/mod.rs b/diesel/src/macros/mod.rs
@@ -1143,8 +1143,6 @@ mod static_cond;
 #[macro_use]
 mod ops;
 
-#[macro_use]
-mod identifiable;
 #[macro_use]
 mod insertable;
 

diff --git a/diesel_compile_tests/tests/compile-fail/identifiable_requires_primary_key_field.rs b/diesel_compile_tests/tests/compile-fail/identifiable_requires_primary_key_field.rs