topaLE
/
ghostfolio
mirror of https://github.com/ghostfolio/ghostfolio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Feature/upgrade to prisma 4.1.1 (#1126) 

* Upgrade prisma to 4.1.1

* Update changelog
pull/1127/head
Thomas Kaul 3 years ago
committed by GitHub
parent
7ec9170c0d
commit
03942aecda
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 4
      package.json
  3. 64
      prisma/schema.prisma
  4. 36
      yarn.lock

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Upgraded `angular` from version `14.0.2` to `14.1.0` - Upgraded `angular` from version `14.0.2` to `14.1.0`
- Upgraded `nestjs` from version `8.4.7` to `9.0.7` - Upgraded `nestjs` from version `8.4.7` to `9.0.7`
- Upgraded `Nx` from version `14.3.5` to `14.5.1` - Upgraded `Nx` from version `14.3.5` to `14.5.1`
- Upgraded `prisma` from version `3.15.2` to `4.1.1`
## 1.176.2 - 31.07.2022 ## 1.176.2 - 31.07.2022

4
package.json
View File

@ -80,7 +80,7 @@
"@nestjs/schedule": "2.1.0", "@nestjs/schedule": "2.1.0",
"@nestjs/serve-static": "3.0.0", "@nestjs/serve-static": "3.0.0",
"@nrwl/angular": "14.5.1", "@nrwl/angular": "14.5.1",
"@prisma/client": "3.15.2", "@prisma/client": "4.1.1",
"@simplewebauthn/browser": "5.2.1", "@simplewebauthn/browser": "5.2.1",
"@simplewebauthn/server": "5.2.1", "@simplewebauthn/server": "5.2.1",
"@stripe/stripe-js": "1.22.0", "@stripe/stripe-js": "1.22.0",
@ -117,7 +117,7 @@
"passport": "0.6.0", "passport": "0.6.0",
"passport-google-oauth20": "2.0.0", "passport-google-oauth20": "2.0.0",
"passport-jwt": "4.0.0", "passport-jwt": "4.0.0",
"prisma": "3.15.2", "prisma": "4.1.1",
"reflect-metadata": "0.1.13", "reflect-metadata": "0.1.13",
"rxjs": "7.4.0", "rxjs": "7.4.0",
"stripe": "8.199.0", "stripe": "8.199.0",

64
prisma/schema.prisma
View File

@ -1,22 +1,22 @@
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
}
generator client { generator client {
provider = "prisma-client-js" provider = "prisma-client-js"
binaryTargets = ["debian-openssl-1.1.x", "native"]
previewFeatures = [] previewFeatures = []
binaryTargets = ["debian-openssl-1.1.x", "native"]
}
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
} }
model Access { model Access {
createdAt DateTime @default(now()) createdAt DateTime @default(now())
GranteeUser User? @relation(fields: [granteeUserId], name: "accessGet", references: [id])
granteeUserId String? granteeUserId String?
id String @id @default(uuid()) id String @id @default(uuid())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], name: "accessGive", references: [id])
userId String userId String
GranteeUser User? @relation("accessGet", fields: [granteeUserId], references: [id])
User User @relation("accessGive", fields: [userId], references: [id])
} }
model Account { model Account {
@ -27,12 +27,12 @@ model Account {
id String @default(uuid()) id String @default(uuid())
isDefault Boolean @default(false) isDefault Boolean @default(false)
name String? name String?
Order Order[]
Platform Platform? @relation(fields: [platformId], references: [id])
platformId String? platformId String?
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], references: [id])
userId String userId String
Platform Platform? @relation(fields: [platformId], references: [id])
User User @relation(fields: [userId], references: [id])
Order Order[]
@@id([id, userId]) @@id([id, userId])
} }
@ -40,8 +40,8 @@ model Account {
model Analytics { model Analytics {
activityCount Int @default(0) activityCount Int @default(0)
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], references: [id])
userId String @id userId String @id
User User @relation(fields: [userId], references: [id])
} }
model AuthDevice { model AuthDevice {
@ -51,8 +51,8 @@ model AuthDevice {
counter Int counter Int
id String @id @default(uuid()) id String @id @default(uuid())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], references: [id])
userId String userId String
User User @relation(fields: [userId], references: [id])
} }
model MarketData { model MarketData {
@ -64,11 +64,10 @@ model MarketData {
marketPrice Float marketPrice Float
@@unique([date, symbol]) @@unique([date, symbol])
@@index(fields: [symbol]) @@index([symbol])
} }
model Order { model Order {
Account Account? @relation(fields: [accountId, accountUserId], references: [id, userId])
accountId String? accountId String?
accountUserId String? accountUserId String?
comment String? comment String?
@ -78,21 +77,22 @@ model Order {
id String @id @default(uuid()) id String @id @default(uuid())
isDraft Boolean @default(false) isDraft Boolean @default(false)
quantity Float quantity Float
SymbolProfile SymbolProfile @relation(fields: [symbolProfileId], references: [id])
symbolProfileId String symbolProfileId String
tags Tag[]
type Type type Type
unitPrice Float unitPrice Float
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], references: [id])
userId String userId String
Account Account? @relation(fields: [accountId, accountUserId], references: [id, userId])
SymbolProfile SymbolProfile @relation(fields: [symbolProfileId], references: [id])
User User @relation(fields: [userId], references: [id])
tags Tag[]
} }
model Platform { model Platform {
Account Account[]
id String @id @default(uuid()) id String @id @default(uuid())
name String? name String?
url String @unique url String @unique
Account Account[]
} }
model Property { model Property {
@ -105,8 +105,8 @@ model Settings {
settings Json? settings Json?
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
viewMode ViewMode? viewMode ViewMode?
User User @relation(fields: [userId], references: [id])
userId String @id userId String @id
User User @relation(fields: [userId], references: [id])
} }
model SymbolProfile { model SymbolProfile {
@ -118,14 +118,14 @@ model SymbolProfile {
dataSource DataSource dataSource DataSource
id String @id @default(uuid()) id String @id @default(uuid())
name String? name String?
Order Order[]
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
scraperConfiguration Json? scraperConfiguration Json?
sectors Json? sectors Json?
symbol String symbol String
symbolMapping Json? symbolMapping Json?
SymbolProfileOverrides SymbolProfileOverrides?
url String? url String?
Order Order[]
SymbolProfileOverrides SymbolProfileOverrides?
@@unique([dataSource, symbol]) @@unique([dataSource, symbol])
} }
@ -136,9 +136,9 @@ model SymbolProfileOverrides {
countries Json? countries Json?
name String? name String?
sectors Json? sectors Json?
SymbolProfile SymbolProfile @relation(fields: [symbolProfileId], references: [id])
symbolProfileId String @id symbolProfileId String @id
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
SymbolProfile SymbolProfile @relation(fields: [symbolProfileId], references: [id])
} }
model Subscription { model Subscription {
@ -146,8 +146,8 @@ model Subscription {
expiresAt DateTime expiresAt DateTime
id String @id @default(uuid()) id String @id @default(uuid())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
User User @relation(fields: [userId], references: [id])
userId String userId String
User User @relation(fields: [userId], references: [id])
} }
model Tag { model Tag {
@ -157,23 +157,23 @@ model Tag {
} }
model User { model User {
Access Access[] @relation("accessGet")
AccessGive Access[] @relation(name: "accessGive")
accessToken String? accessToken String?
Account Account[]
alias String? alias String?
Analytics Analytics?
authChallenge String? authChallenge String?
AuthDevice AuthDevice[]
createdAt DateTime @default(now()) createdAt DateTime @default(now())
id String @id @default(uuid()) id String @id @default(uuid())
Order Order[]
provider Provider @default(ANONYMOUS) provider Provider @default(ANONYMOUS)
role Role @default(USER) role Role @default(USER)
Settings Settings?
Subscription Subscription[]
thirdPartyId String? thirdPartyId String?
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
Access Access[] @relation("accessGet")
AccessGive Access[] @relation("accessGive")
Account Account[]
Analytics Analytics?
AuthDevice AuthDevice[]
Order Order[]
Settings Settings?
Subscription Subscription[]
} }
enum AccountType { enum AccountType {

36
yarn.lock
View File

@ -3607,22 +3607,22 @@
schema-utils "^3.0.0" schema-utils "^3.0.0"
source-map "^0.7.3" source-map "^0.7.3"
"@prisma/client@3.15.2": "@prisma/client@4.1.1":
version "3.15.2" version "4.1.1"
resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.15.2.tgz#2181398147afc79bfe0d83c03a88dc45b49bd365" resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.1.1.tgz#dcb1118397deb8247fbe39a1f3eee5606648adf8"
integrity sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w== integrity sha512-2pXuIUYxHv5H9o6QTa1VIsl4yMgsAjKQOitlo8WVTB+vo73rmMJITBPavdGUZSWUc7adMkFzEV3y5rVTUQr77Q==
dependencies: dependencies:
"@prisma/engines-version" "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" "@prisma/engines-version" "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8"
"@prisma/engines-version@3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e": "@prisma/engines-version@4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8":
version "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" version "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8"
resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz#bf5e2373ca68ce7556b967cb4965a7095e93fe53" resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz#ce00e6377126e491a8b1e0e2039c97e2924bd6d9"
integrity sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w== integrity sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ==
"@prisma/engines@3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e": "@prisma/engines@4.1.1":
version "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" version "4.1.1"
resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz#f691893df506b93e3cb1ccc15ec6e5ac64e8e570" resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.1.1.tgz#a6a75870618bbd19ff734c51af7dbe9f362c3265"
integrity sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg== integrity sha512-DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA==
"@rollup/plugin-babel@^5.3.0": "@rollup/plugin-babel@^5.3.0":
version "5.3.1" version "5.3.1"
@ -16358,12 +16358,12 @@ pretty-hrtime@^1.0.3:
resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==
prisma@3.15.2: prisma@4.1.1:
version "3.15.2" version "4.1.1"
resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.15.2.tgz#4ebe32fb284da3ac60c49fbc16c75e56ecf32067" resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.1.1.tgz#41c2e19896357f484ef21567165d762908376fca"
integrity sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA== integrity sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==
dependencies: dependencies:
"@prisma/engines" "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" "@prisma/engines" "4.1.1"
prismjs@^1.27.0, prismjs@^1.28.0: prismjs@^1.27.0, prismjs@^1.28.0:
version "1.28.0" version "1.28.0"

Write Preview
Loading…
Cancel
Save