Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
"overrides": {
"cookie@<0.7.0": ">=0.7.0",
"lodash-es@>=4.0.0 <=4.17.22": ">=4.17.23",
"lodash@>=4.0.0 <=4.17.22": ">=4.17.23"
"lodash@>=4.0.0 <=4.17.22": ">=4.17.23",
"@better-auth/core": "1.4.19"
}
},
"funding": "https://github.com/sponsors/zenstackhq"
Expand Down
5 changes: 2 additions & 3 deletions packages/auth-adapters/better-auth/src/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { BetterAuthOptions } from '@better-auth/core';
import type { DBAdapter, Where } from '@better-auth/core/db/adapter';
import type { BetterAuthOptions, Where } from 'better-auth';
import { BetterAuthError } from '@better-auth/core/error';
import type { ClientContract, ModelOperations, UpdateInput } from '@zenstackhq/orm';
import type { GetModels, SchemaDef } from '@zenstackhq/orm/schema';
Expand Down Expand Up @@ -213,7 +212,7 @@ export const zenstackAdapter = <Schema extends SchemaDef>(db: ClientContract<Sch
};

const adapter = createAdapterFactory(adapterOptions);
return (options: BetterAuthOptions): DBAdapter<BetterAuthOptions> => {
return (options: BetterAuthOptions) => {
lazyOptions = options;
return adapter(options);
};
Expand Down
12 changes: 12 additions & 0 deletions packages/orm/src/utils/kysely-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import {
AddColumnNode,
AddConstraintNode,
AddIndexNode,
AddValueNode,
AggregateFunctionNode,
AliasNode,
AlterColumnNode,
AlterTableNode,
AlterTypeNode,
AndNode,
BinaryOperationNode,
CaseNode,
Expand Down Expand Up @@ -77,6 +79,7 @@ import {
RefreshMaterializedViewNode,
RenameColumnNode,
RenameConstraintNode,
RenameValueNode,
ReturningNode,
SchemableIdentifierNode,
SelectAllNode,
Expand Down Expand Up @@ -407,6 +410,15 @@ export class DefaultOperationNodeVisitor extends OperationNodeVisitor {
protected override visitCollate(node: CollateNode): void {
this.defaultVisit(node);
}
protected override visitAlterType(node: AlterTypeNode): void {
this.defaultVisit(node);
}
protected override visitAddValue(node: AddValueNode): void {
this.defaultVisit(node);
}
protected override visitRenameValue(node: RenameValueNode): void {
this.defaultVisit(node);
}
}

export type AnyKysely = Kysely<any>;
89 changes: 61 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ catalog:
'@types/tmp': ^0.2.6
better-sqlite3: ^12.5.0
decimal.js: ^10.4.3
kysely: ~0.28.16
kysely: 0.29.0-rc.0
langium: 3.5.0
langium-cli: 3.5.0
next: 16.1.6
Expand Down
Loading