Skip to content

Commit 93545f3

Browse files
authored
fix(db-postgres, db-sqlite)!: bump drizzle-kit drizzle-orm @libsql/client (#8617)
Inheriting all the fixes from drizzle moving to latest versions ## BREAKING CHANGES If you have a prior version of @libsql/client installed in your project, you must upgrade to 0.14.0
1 parent 8d10737 commit 93545f3

File tree

12 files changed

+166
-128
lines changed

12 files changed

+166
-128
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
},
105105
"devDependencies": {
106106
"@jest/globals": "29.7.0",
107-
"@libsql/client": "0.6.2",
107+
"@libsql/client": "0.14.0",
108108
"@next/bundle-analyzer": "15.0.0-canary.173",
109109
"@payloadcms/db-postgres": "workspace:*",
110110
"@payloadcms/eslint-config": "workspace:*",
@@ -132,8 +132,8 @@
132132
"create-payload-app": "workspace:*",
133133
"cross-env": "7.0.3",
134134
"dotenv": "16.4.5",
135-
"drizzle-kit": "0.23.2-df9e596",
136-
"drizzle-orm": "0.32.1",
135+
"drizzle-kit": "0.26.0",
136+
"drizzle-orm": "0.35.0",
137137
"escape-html": "^1.0.3",
138138
"execa": "5.1.1",
139139
"form-data": "3.0.1",

packages/db-postgres/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"@payloadcms/drizzle": "workspace:*",
5151
"@types/pg": "8.10.2",
5252
"console-table-printer": "2.11.2",
53-
"drizzle-kit": "0.23.2-df9e596",
54-
"drizzle-orm": "0.32.1",
53+
"drizzle-kit": "0.26.0",
54+
"drizzle-orm": "0.35.0",
5555
"pg": "8.11.3",
5656
"prompts": "2.4.2",
5757
"to-snake-case": "1.0.0",

packages/db-sqlite/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
"prepublishOnly": "pnpm clean && pnpm turbo build"
4646
},
4747
"dependencies": {
48-
"@libsql/client": "^0.6.2",
48+
"@libsql/client": "0.14.0",
4949
"@payloadcms/drizzle": "workspace:*",
5050
"console-table-printer": "2.11.2",
51-
"drizzle-kit": "0.23.2-df9e596",
52-
"drizzle-orm": "0.32.1",
51+
"drizzle-kit": "0.26.0",
52+
"drizzle-orm": "0.35.0",
5353
"prompts": "2.4.2",
5454
"to-snake-case": "1.0.0",
5555
"uuid": "9.0.0"

packages/db-sqlite/src/connect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const connect: Connect = async function connect(
2727
}
2828

2929
const logger = this.logger || false
30-
this.drizzle = drizzle(this.client, { logger, schema: this.schema }) as LibSQLDatabase
30+
this.drizzle = drizzle(this.client, { logger, schema: this.schema })
3131

3232
if (!hotReload) {
3333
if (process.env.PAYLOAD_DROP_DATABASE === 'true') {

packages/db-sqlite/src/defaultSnapshot.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ export const defaultDrizzleSnapshot: DrizzleSQLiteSnapshotJSON = {
1111
prevId: '00000000-0000-0000-0000-00000000000',
1212
tables: {},
1313
version: '6',
14+
views: {},
1415
}

packages/db-sqlite/src/types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ export type SQLiteAdapter = {
117117
countDistinct: CountDistinct
118118
defaultDrizzleSnapshot: any
119119
deleteWhere: DeleteWhere
120-
drizzle: LibSQLDatabase
120+
drizzle: { $client: Client } & LibSQLDatabase<
121+
Record<string, GenericRelation | GenericTable> & Record<string, unknown>
122+
>
121123
dropDatabase: DropDatabase
122124
execute: Execute<unknown>
123125
/**

packages/db-vercel-postgres/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"@payloadcms/drizzle": "workspace:*",
5151
"@vercel/postgres": "^0.9.0",
5252
"console-table-printer": "2.11.2",
53-
"drizzle-kit": "0.23.2-df9e596",
54-
"drizzle-orm": "0.32.1",
53+
"drizzle-kit": "0.26.0",
54+
"drizzle-orm": "0.35.0",
5555
"pg": "8.11.3",
5656
"prompts": "2.4.2",
5757
"to-snake-case": "1.0.0",

packages/drizzle/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
},
4747
"dependencies": {
4848
"console-table-printer": "2.11.2",
49-
"drizzle-orm": "0.32.1",
49+
"drizzle-orm": "0.34.1-1f15bfd",
5050
"prompts": "2.4.2",
5151
"to-snake-case": "1.0.0",
5252
"uuid": "9.0.0"
5353
},
5454
"devDependencies": {
55-
"@libsql/client": "^0.6.2",
55+
"@libsql/client": "0.14.0",
5656
"@payloadcms/eslint-config": "workspace:*",
5757
"@types/pg": "8.10.2",
5858
"@types/to-snake-case": "1.0.0",

packages/drizzle/src/postgres/defaultSnapshot.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ export const defaultDrizzleSnapshot: DrizzleSnapshotJSON = {
1414
sequences: {},
1515
tables: {},
1616
version: '7',
17+
views: {},
1718
}

packages/drizzle/src/postgres/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export type CreateDatabase = (args?: {
106106
type Schema =
107107
| {
108108
enum: typeof pgEnum
109-
table: PgTableFn
109+
table: PgTableFn<string>
110110
}
111111
| PgSchema
112112

@@ -149,7 +149,7 @@ export type BasePostgresAdapter = {
149149
localesSuffix?: string
150150
logger: DrizzleConfig['logger']
151151
operators: Operators
152-
pgSchema?: Schema
152+
pgSchema: Schema
153153
poolOptions?: ClientConfig
154154
prodMigrations?: {
155155
down: (args: MigrateDownArgs) => Promise<void>

0 commit comments

Comments
 (0)