Skip to content

Fix handleColumns usage of factory.zodInstance #4865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix handleColumns usage of factory.zodInstance #4865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65b104e
Fix `handleColumns` use of `factory.zodInstance`
zanellig Aug 19, 2025
66d3d62
Use `zodInstance` on undefined columns
zanellig Aug 19, 2025
44db0b3
Fix usage of `zod` instance on `columnToSchema`
zanellig Aug 19, 2025
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
4 changes: 2 additions & 2 deletions drizzle-zod/src/column.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ export function columnToSchema(
} else if (column.dataType === 'string') {
schema = stringColumnToSchema(column, z, coerce);
} else if (column.dataType === 'json') {
schema = jsonSchema;
schema = z.union([z.union([z.string(), z.number(), z.boolean(), z.null()]), z.record(z.string(), z.any()), z.array(z.any())]);
} else if (column.dataType === 'custom') {
schema = z.any();
} else if (column.dataType === 'buffer') {
schema = bufferSchema;
schema = z.custom<Buffer>((v) => v instanceof Buffer);
}
}

Expand Down
8 changes: 4 additions & 4 deletions drizzle-zod/src/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ function handleColumns(
refinements: Record<string, any>,
conditions: Conditions,
factory?: CreateSchemaFactoryOptions<
Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined
Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined
>,
): z.ZodType {
const columnSchemas: Record<string, z.ZodType> = {};
const zod: typeof z = factory?.zodInstance ?? z;

for (const [key, selected] of Object.entries(columns)) {
if (!is(selected, Column) && !is(selected, SQL) && !is(selected, SQL.Aliased) && typeof selected === 'object') {
Expand All @@ -40,7 +41,7 @@ function handleColumns(
}

const column = is(selected, Column) ? selected : undefined;
const schema = column ? columnToSchema(column, factory) : z.any();
const schema = column ? columnToSchema(column, factory) : zod.any();
const refined = typeof refinement === 'function' ? refinement(schema) : schema;

if (conditions.never(column)) {
Expand All @@ -59,8 +60,7 @@ function handleColumns(
}
}
}

return z.object(columnSchemas) as any;
return zod.object(columnSchemas) as any;
}

function handleEnum(
Expand Down