From e04ef9da51351bc36d572d995cb7090177a6ead8 Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Thu, 18 Jan 2018 21:02:48 +0100 Subject: [PATCH] refactor(db): update schema --- .../down.sql | 0 .../up.sql | 4 ++-- src/infrastructure/db/sqlite/schema.rs | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) rename migrations/{2018-01-17-000001_init => 2018-01-18-000001_init}/down.sql (100%) rename migrations/{2018-01-17-000001_init => 2018-01-18-000001_init}/up.sql (97%) diff --git a/migrations/2018-01-17-000001_init/down.sql b/migrations/2018-01-18-000001_init/down.sql similarity index 100% rename from migrations/2018-01-17-000001_init/down.sql rename to migrations/2018-01-18-000001_init/down.sql diff --git a/migrations/2018-01-17-000001_init/up.sql b/migrations/2018-01-18-000001_init/up.sql similarity index 97% rename from migrations/2018-01-17-000001_init/up.sql rename to migrations/2018-01-18-000001_init/up.sql index 5dc30e5b..d818acd4 100644 --- a/migrations/2018-01-17-000001_init/up.sql +++ b/migrations/2018-01-18-000001_init/up.sql @@ -31,8 +31,8 @@ CREATE TABLE entry_category_relations ( entry_version INTEGER NOT NULL, category_id TEXT NOT NULL, PRIMARY KEY (entry_id, entry_version, category_id), - FOREIGN KEY (entry_id, entry_version) REFERENCES entries(id,version) - -- FOREIGN KEY (category_id) REFERENCES categories(id) + FOREIGN KEY (entry_id, entry_version) REFERENCES entries(id,version), + FOREIGN KEY (category_id) REFERENCES categories(id) ); CREATE TABLE entry_tag_relations ( diff --git a/src/infrastructure/db/sqlite/schema.rs b/src/infrastructure/db/sqlite/schema.rs index e5ceab27..3d107414 100644 --- a/src/infrastructure/db/sqlite/schema.rs +++ b/src/infrastructure/db/sqlite/schema.rs @@ -93,6 +93,11 @@ table! { } } +joinable!(bbox_subscriptions -> users (username)); +joinable!(comments -> ratings (rating_id)); +joinable!(entry_category_relations -> categories (category_id)); +joinable!(entry_tag_relations -> tags (tag_id)); + allow_tables_to_appear_in_same_query!( bbox_subscriptions, categories,