Skip to content

Commit 29d7eec

Browse files
authored
Merge pull request #520 from devforth/feature/AdminForth/1344/make-dev-demo-use-prisma-7
Feature/admin forth/1344/make dev demo use prisma 7
2 parents 8d65703 + cb7a66b commit 29d7eec

File tree

7 files changed

+631
-45
lines changed

7 files changed

+631
-45
lines changed

dev-demo/migrations/prisma/mysql/schema.mysql.prisma

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ generator client {
44

55
datasource mysql_db {
66
provider = "mysql"
7-
url = "mysql://demo:demo@localhost:3307/dev_demo"
87
}
98

109
model cars {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import 'dotenv/config'
2+
import { defineConfig } from 'prisma/config'
3+
4+
export default defineConfig({
5+
datasource: {
6+
url: 'postgres://demo:demo@localhost:53321/dev_demo',
7+
},
8+
})

dev-demo/migrations/prisma/postgres/schema.postgres.prisma

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ generator client {
44

55
datasource mysql_db {
66
provider = "postgres"
7-
url = "postgres://demo:demo@localhost:53321/dev_demo"
87
}
98

109
model cars {
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import 'dotenv/config'
22
import { defineConfig, env } from 'prisma/config'
33

4+
console.log('SQLITE_FILE_URL =', process.env.SQLITE_FILE_URL)
5+
46
export default defineConfig({
57
datasource: {
6-
url: env('PRISMA_DATABASE_URL'),
8+
url: env('SQLITE_FILE_URL'),
79
},
810
})

dev-demo/migrations/prisma/sqlite/schema.prisma

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ generator client {
44

55
datasource db {
66
provider = "sqlite"
7-
url = env("SQLITE_FILE_URL")
87
}
98

109
model adminuser {

dev-demo/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"scripts": {
88
"_env:dev": "dotenvx run -f .env.local -f .env --overload --",
99
"start": "pnpm _env:dev tsx watch index.ts",
10-
"makemigration:sqlite": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --schema=./migrations/prisma/sqlite/schema.prisma",
11-
"migrate:sqlite": "pnpm _env:dev pnpm exec prisma migrate deploy --schema=./migrations/prisma/sqlite/schema.prisma",
12-
"makemigration:mysql": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --schema=./migrations/prisma/mysql/schema.mysql.prisma",
13-
"migrate:mysql": "pnpm _env:dev pnpm exec prisma migrate deploy --schema=./migrations/prisma/mysql/schema.mysql.prisma",
14-
"makemigration:postgres": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --schema=./migrations/prisma/postgres/schema.postgres.prisma",
15-
"migrate:postgres": "pnpm _env:dev pnpm exec prisma migrate deploy --schema=./migrations/prisma/postgres/schema.postgres.prisma",
10+
"makemigration:sqlite": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --config=./migrations/prisma/sqlite/prisma.config.ts --schema=./migrations/prisma/sqlite/schema.prisma",
11+
"migrate:sqlite": "pnpm _env:dev pnpm exec prisma migrate deploy --config=./migrations/prisma/sqlite/prisma.config.ts --schema=./migrations/prisma/sqlite/schema.prisma",
12+
"makemigration:mysql": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --config=./migrations/prisma/mysql/prisma.config.ts --schema=./migrations/prisma/mysql/schema.mysql.prisma",
13+
"migrate:mysql": "pnpm _env:dev pnpm exec prisma migrate deploy --config=./migrations/prisma/mysql/prisma.config.ts --schema=./migrations/prisma/mysql/schema.mysql.prisma",
14+
"makemigration:postgres": "pnpm _env:dev pnpm exec prisma migrate dev --create-only --config=./migrations/prisma/postgres/prisma.config.ts --schema=./migrations/prisma/postgres/schema.postgres.prisma",
15+
"migrate:postgres": "pnpm _env:dev pnpm exec prisma migrate deploy --config=./migrations/prisma/postgres/prisma.config.ts --schema=./migrations/prisma/postgres/schema.postgres.prisma",
1616
"migrate:clickhouse": "pnpm exec clickhouse-migrations migrate --host=http://localhost:28124 --user=demo --password=demo --db=demo --migrations-home=./migrations/clickhouse_migrations",
1717
"install-plugins": "task pull_plugins && task pnpm_plugins",
1818
"install-adapters": "task pull_adapters && task pnpm_adapters",
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@dotenvx/dotenvx": "^1.39.0",
43-
"prisma": "^5.22.0",
43+
"prisma": "^7.5.0",
4444
"tsx": "^4.19.2",
4545
"typescript": "^5.4.5"
4646
}

0 commit comments

Comments
 (0)