Skip to content

Commit 81099de

Browse files
authored
Merge pull request #33 from zenstackhq/dev
fix: downgrade the driver of sqlite and mariadb to 6.18.0 (#32)
2 parents b25acc2 + a531a7f commit 81099de

3 files changed

Lines changed: 34 additions & 42 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/proxy",
3-
"version": "0.4.0",
3+
"version": "0.4.1",
44
"description": "A CLI tool to run an Express server that proxies CRUD requests to a ZenStack backend",
55
"main": "index.js",
66
"publishConfig": {
@@ -29,8 +29,8 @@
2929
"author": "",
3030
"license": "MIT",
3131
"dependencies": {
32-
"@prisma/adapter-better-sqlite3": "^7.3.0",
33-
"@prisma/adapter-mariadb": "^7.1.0",
32+
"@prisma/adapter-better-sqlite3": "^6.18.0",
33+
"@prisma/adapter-mariadb": "^6.18.0",
3434
"@prisma/adapter-pg": "^6.18.0",
3535
"@zenstackhq/server": "^2.0.0",
3636
"colors": "^1.4.0",

pnpm-lock.yaml

Lines changed: 24 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/server.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ function createAdapter(config: ZModelConfig, zmodelSchemaDir: string): any {
105105
resolvedUrl = `file:${resolveSQLitePath(filePath, prismaSchemaDir)}`
106106
}
107107
}
108-
const { PrismaBetterSQLite3 } = require('@prisma/adapter-better-sqlite3')
108+
const _mod = require('@prisma/adapter-better-sqlite3')
109+
//Prisma7 renamed PrismaBetterSqlite3 from PrismaBetterSQLite3, support both cases for compatibility
110+
const PrismaBetterSQLite3 =
111+
_mod.PrismaBetterSQLite3 ?? _mod.PrismaBetterSqlite3 ?? _mod.default
112+
109113
console.log(grey(`Connecting to SQLite database at: ${resolvedUrl}`))
110114
return new PrismaBetterSQLite3({
111115
url: resolvedUrl,
@@ -129,9 +133,9 @@ function createAdapter(config: ZModelConfig, zmodelSchemaDir: string): any {
129133
}
130134
case 'mysql': {
131135
try {
132-
const { PrismaMariaDB } = require('@prisma/adapter-mariadb')
136+
const { PrismaMariaDb } = require('@prisma/adapter-mariadb')
133137
console.log(grey(`Connecting to MySQL/MariaDB database at: ${redactDatabaseUrl(url)}`))
134-
return new PrismaMariaDB({
138+
return new PrismaMariaDb({
135139
url,
136140
})
137141
} catch (error) {

0 commit comments

Comments
 (0)