Browse Source

Merge branch 'main' into bugfix/fix-word-wrap-in-menu-of-historical-market-data-table-of-admin-control-panel

pull/4562/head
Thomas Kaul 4 months ago
committed by GitHub
parent
commit
f09b9ee74f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      CHANGELOG.md
  2. 16
      prisma/migrations/20250418123137_added_watchlist_to_user/migration.sql
  3. 2
      prisma/migrations/migration_lock.toml
  4. 2
      prisma/schema.prisma

4
CHANGELOG.md

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Added
- Added `watchlist` to the `User` database schema as a preparation for watching assets
### Fixed
- Fixed the word wrap in the menu of the historical market data table in the admin control panel

16
prisma/migrations/20250418123137_added_watchlist_to_user/migration.sql

@ -0,0 +1,16 @@
-- CreateTable
CREATE TABLE "_UserWatchlist" (
"A" TEXT NOT NULL,
"B" TEXT NOT NULL,
CONSTRAINT "_UserWatchlist_AB_pkey" PRIMARY KEY ("A","B")
);
-- CreateIndex
CREATE INDEX "_UserWatchlist_B_index" ON "_UserWatchlist"("B");
-- AddForeignKey
ALTER TABLE "_UserWatchlist" ADD CONSTRAINT "_UserWatchlist_A_fkey" FOREIGN KEY ("A") REFERENCES "SymbolProfile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "_UserWatchlist" ADD CONSTRAINT "_UserWatchlist_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

2
prisma/migrations/migration_lock.toml

@ -1,3 +1,3 @@
# Please do not edit this file manually
# It should be added in your version-control system (e.g., Git)
provider = "postgresql"
provider = "postgresql"

2
prisma/schema.prisma

@ -191,6 +191,7 @@ model SymbolProfile {
symbolMapping Json?
url String?
userId String?
watchedBy User[] @relation("UserWatchlist")
Order Order[]
SymbolProfileOverrides SymbolProfileOverrides?
User User? @relation(fields: [userId], onDelete: Cascade, references: [id])
@ -251,6 +252,7 @@ model User {
role Role @default(USER)
thirdPartyId String?
updatedAt DateTime @updatedAt
watchlist SymbolProfile[] @relation("UserWatchlist")
Access Access[] @relation("accessGet")
AccessGive Access[] @relation("accessGive")
Account Account[]

Loading…
Cancel
Save