From ddc4ac801739ada61f3d0beb683fd0b3acba8f03 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 19 Sep 2021 17:07:16 +0200 Subject: [PATCH] fixed migrations --- prisma/schema.sqlite.prisma | 88 +++++++++---------- prisma/sqlite/migration_lock.toml | 3 - .../20210919145826_init}/migration.sql | 35 ++++---- .../migrations/migration_lock.toml | 0 4 files changed, 60 insertions(+), 66 deletions(-) delete mode 100644 prisma/sqlite/migration_lock.toml rename prisma/{migrations/20210916212348_init => sqlite/migrations/20210919145826_init}/migration.sql (95%) rename prisma/{ => sqlite}/migrations/migration_lock.toml (100%) diff --git a/prisma/schema.sqlite.prisma b/prisma/schema.sqlite.prisma index 07a832a1..d30a3122 100644 --- a/prisma/schema.sqlite.prisma +++ b/prisma/schema.sqlite.prisma @@ -4,80 +4,80 @@ generator client { datasource db { provider = "sqlite" - url = "file:./db/umami.db" + url = env("DATABASE_URL") } model account { - user_id Int @id @default(autoincrement()) - username String @unique - password String + user_id Int @id @default(autoincrement()) + username String @unique + password String is_admin Boolean @default(false) - created_at DateTime? @default(now()) - updated_at DateTime? @default(now()) + created_at DateTime? @default(now()) + updated_at DateTime? @default(now()) website website[] } model event { - event_id Int @id @default(autoincrement()) - website_id Int - session_id Int - created_at DateTime? @default(now()) - url String - event_type String - event_value String + event_id Int @id @default(autoincrement()) + website_id Int + session_id Int + created_at DateTime? @default(now()) + url String + event_type String + event_value String session session @relation(fields: [session_id], references: [session_id]) website website @relation(fields: [website_id], references: [website_id]) - @@index([created_at], name: "event_created_at_idx") - @@index([session_id], name: "event_session_id_idx") @@index([website_id], name: "event_website_id_idx") + @@index([session_id], name: "event_session_id_idx") + @@index([created_at], name: "event_created_at_idx") } model pageview { - view_id Int @id @default(autoincrement()) - website_id Int - session_id Int - created_at DateTime? @default(now()) - url String - referrer String? + view_id Int @id @default(autoincrement()) + website_id Int + session_id Int + created_at DateTime? @default(now()) + url String + referrer String? session session @relation(fields: [session_id], references: [session_id]) website website @relation(fields: [website_id], references: [website_id]) - @@index([created_at], name: "pageview_created_at_idx") - @@index([session_id], name: "pageview_session_id_idx") - @@index([website_id, created_at], name: "pageview_website_id_created_at_idx") - @@index([website_id], name: "pageview_website_id_idx") @@index([website_id, session_id, created_at], name: "pageview_website_id_session_id_created_at_idx") + @@index([website_id], name: "pageview_website_id_idx") + @@index([website_id, created_at], name: "pageview_website_id_created_at_idx") + @@index([session_id], name: "pageview_session_id_idx") + @@index([created_at], name: "pageview_created_at_idx") } model session { - session_id Int @id @default(autoincrement()) - session_uuid String @unique - website_id Int - created_at DateTime? @default(now()) - hostname String? - browser String? - os String? - device String? - screen String? - language String? - country String? + session_id Int @id @default(autoincrement()) + session_uuid String @unique + website_id Int + created_at DateTime? @default(now()) + hostname String? + browser String? + os String? + device String? + screen String? + language String? + country String? website website @relation(fields: [website_id], references: [website_id]) event event[] pageview pageview[] - @@index([created_at], name: "session_created_at_idx") @@index([website_id], name: "session_website_id_idx") + @@index([created_at], name: "session_created_at_idx") } model website { - website_id Int @id @default(autoincrement()) - website_uuid String @unique - user_id Int - name String - domain String? - share_id String? @unique - created_at DateTime? @default(now()) + website_id Int @id @default(autoincrement()) + website_uuid String @unique + user_id Int + name String + domain String? + share_id String? @unique + created_at DateTime? @default(now()) account account @relation(fields: [user_id], references: [user_id]) event event[] pageview pageview[] diff --git a/prisma/sqlite/migration_lock.toml b/prisma/sqlite/migration_lock.toml deleted file mode 100644 index e5e5c470..00000000 --- a/prisma/sqlite/migration_lock.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Please do not edit this file manually -# It should be added in your version-control system (i.e. Git) -provider = "sqlite" \ No newline at end of file diff --git a/prisma/migrations/20210916212348_init/migration.sql b/prisma/sqlite/migrations/20210919145826_init/migration.sql similarity index 95% rename from prisma/migrations/20210916212348_init/migration.sql rename to prisma/sqlite/migrations/20210919145826_init/migration.sql index 3adeb40c..25095cb2 100644 --- a/prisma/migrations/20210916212348_init/migration.sql +++ b/prisma/sqlite/migrations/20210919145826_init/migration.sql @@ -65,37 +65,37 @@ CREATE TABLE "website" ( CREATE UNIQUE INDEX "account.username_unique" ON "account"("username"); -- CreateIndex -CREATE INDEX "event_created_at_idx" ON "event"("created_at"); +CREATE INDEX "event_website_id_idx" ON "event"("website_id"); -- CreateIndex CREATE INDEX "event_session_id_idx" ON "event"("session_id"); -- CreateIndex -CREATE INDEX "event_website_id_idx" ON "event"("website_id"); - --- CreateIndex -CREATE INDEX "pageview_created_at_idx" ON "pageview"("created_at"); - --- CreateIndex -CREATE INDEX "pageview_session_id_idx" ON "pageview"("session_id"); - --- CreateIndex -CREATE INDEX "pageview_website_id_created_at_idx" ON "pageview"("website_id", "created_at"); - --- CreateIndex -CREATE INDEX "pageview_website_id_idx" ON "pageview"("website_id"); +CREATE INDEX "event_created_at_idx" ON "event"("created_at"); -- CreateIndex CREATE INDEX "pageview_website_id_session_id_created_at_idx" ON "pageview"("website_id", "session_id", "created_at"); +-- CreateIndex +CREATE INDEX "pageview_website_id_idx" ON "pageview"("website_id"); + +-- CreateIndex +CREATE INDEX "pageview_website_id_created_at_idx" ON "pageview"("website_id", "created_at"); + +-- CreateIndex +CREATE INDEX "pageview_session_id_idx" ON "pageview"("session_id"); + +-- CreateIndex +CREATE INDEX "pageview_created_at_idx" ON "pageview"("created_at"); + -- CreateIndex CREATE UNIQUE INDEX "session.session_uuid_unique" ON "session"("session_uuid"); -- CreateIndex -CREATE INDEX "session_created_at_idx" ON "session"("created_at"); +CREATE INDEX "session_website_id_idx" ON "session"("website_id"); -- CreateIndex -CREATE INDEX "session_website_id_idx" ON "session"("website_id"); +CREATE INDEX "session_created_at_idx" ON "session"("created_at"); -- CreateIndex CREATE UNIQUE INDEX "website.website_uuid_unique" ON "website"("website_uuid"); @@ -105,6 +105,3 @@ CREATE UNIQUE INDEX "website.share_id_unique" ON "website"("share_id"); -- CreateIndex CREATE INDEX "website_user_id_idx" ON "website"("user_id"); - --- TODO: move this insert into seeder -insert into account (username, password, is_admin) values ('admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa', true); \ No newline at end of file diff --git a/prisma/migrations/migration_lock.toml b/prisma/sqlite/migrations/migration_lock.toml similarity index 100% rename from prisma/migrations/migration_lock.toml rename to prisma/sqlite/migrations/migration_lock.toml