Merge remote-tracking branch 'origin' into dump-db-new

Author: smarnach

migrations/2019-09-15-194259_add_badges_crate_id_foreign_key/down.sql

@@ -0,0 +1 @@
+ALTER TABLE badges DROP CONSTRAINT fk_badges_crate_id;

migrations/2019-09-15-194259_add_badges_crate_id_foreign_key/up.sql

@@ -0,0 +1,3 @@
+DELETE FROM badges WHERE crate_id NOT IN (SELECT id FROM crates);
+ALTER TABLE badges
+    ADD CONSTRAINT fk_badges_crate_id FOREIGN KEY (crate_id) REFERENCES crates(id) ON DELETE CASCADE;

src/schema.patch

@@ -56,9 +56,9 @@ index df884e4..18e08cd 100644
      /// Representation of the `reserved_crate_names` table.
      ///
 @@ -881,23 +901,25 @@ table! {
- }
 
  joinable!(api_tokens -> users (user_id));
+ joinable!(badges -> crates (crate_id));
  joinable!(crate_owner_invitations -> crates (crate_id));
  joinable!(crate_owners -> crates (crate_id));
 -joinable!(crate_owners -> users (created_by));

src/schema.rs

@@ -961,6 +961,7 @@ table! {
 }
 
 joinable!(api_tokens -> users (user_id));
+joinable!(badges -> crates (crate_id));
 joinable!(crate_owner_invitations -> crates (crate_id));
 joinable!(crate_owners -> crates (crate_id));
 joinable!(crate_owners -> teams (owner_id));

src/tests/load_foreign_key_constraints.sql

@@ -6,5 +6,6 @@ SELECT relname, conname, pg_get_constraintdef(pg_constraint.oid, true) AS defini
     LEFT JOIN pg_constraint ON pg_class.oid = conrelid AND ARRAY[attnum] = conkey
     INNER JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace
     WHERE attname = $1
-      AND contype = 'f'
+      AND relkind = 'r'
+      AND (contype IS NULL OR contype = 'f')
       AND nspname = 'public';