fix(drizzle-zod): add generated column type to zod ts schema type (#4554)

* fix(drizzle-zod): add generated column type to zod ts schema type

* Update version

---------

Co-authored-by: AndriiSherman <[email protected]>

Author: valerii15298

changelogs/drizzle-zod/0.8.2.md

@@ -0,0 +1 @@
+- [[BUG]: drizzle-zod: incorrect inferred types for columns .generatedAlwaysAsIdentity()](https://github.com/drizzle-team/drizzle-orm/issues/4553)

drizzle-zod/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-zod",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"description": "Generate Zod schemas from Drizzle ORM schemas",
 	"type": "module",
 	"scripts": {

drizzle-zod/src/schema.types.internal.ts

@@ -45,8 +45,11 @@ export type BuildSchema<
 > = z.ZodObject<
 	Simplify<
 		{
-			[K in keyof TColumns as ColumnIsGeneratedAlwaysAs<TColumns[K]> extends true ? never : K]: TColumns[K] extends
-				infer TColumn extends Column
+			[
+				K in keyof TColumns as ColumnIsGeneratedAlwaysAs<TColumns[K]> extends true ? TType extends 'select' ? K
+					: never
+					: K
+			]: TColumns[K] extends infer TColumn extends Column
 				? IsRefinementDefined<TRefinements, K> extends true
 					? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, z.ZodType>
 				: HandleColumn<TType, TColumn, TCoerce>

drizzle-zod/tests/mysql.test.ts

@@ -15,11 +15,12 @@ const textSchema = z.string().max(CONSTANTS.INT16_UNSIGNED_MAX);
 test('table - select', (t) => {
 	const table = mysqlTable('test', {
 		id: serial().primaryKey(),
+		generated: int().generatedAlwaysAs(1).notNull(),
 		name: text().notNull(),
 	});
 
 	const result = createSelectSchema(table);
-	const expected = z.object({ id: serialNumberModeSchema, name: textSchema });
+	const expected = z.object({ id: serialNumberModeSchema, generated: intSchema, name: textSchema });
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
 });

drizzle-zod/tests/pg.test.ts

@@ -25,12 +25,13 @@ const textSchema = z.string();
 
 test('table - select', (t) => {
 	const table = pgTable('test', {
-		id: serial().primaryKey(),
+		id: integer().primaryKey(),
+		generated: integer().generatedAlwaysAsIdentity(),
 		name: text().notNull(),
 	});
 
 	const result = createSelectSchema(table);
-	const expected = z.object({ id: integerSchema, name: textSchema });
+	const expected = z.object({ id: integerSchema, generated: integerSchema, name: textSchema });
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
 });

drizzle-zod/tests/singlestore.test.ts

@@ -15,11 +15,12 @@ const textSchema = z.string().max(CONSTANTS.INT16_UNSIGNED_MAX);
 test('table - select', (t) => {
 	const table = singlestoreTable('test', {
 		id: serial().primaryKey(),
+		generated: int().generatedAlwaysAs(1).notNull(),
 		name: text().notNull(),
 	});
 
 	const result = createSelectSchema(table);
-	const expected = z.object({ id: serialNumberModeSchema, name: textSchema });
+	const expected = z.object({ id: serialNumberModeSchema, generated: intSchema, name: textSchema });
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
 });

drizzle-zod/tests/sqlite.test.ts

@@ -14,11 +14,12 @@ const textSchema = z.string();
 test('table - select', (t) => {
 	const table = sqliteTable('test', {
 		id: int().primaryKey({ autoIncrement: true }),
+		generated: int().generatedAlwaysAs(1).notNull(),
 		name: text().notNull(),
 	});
 
 	const result = createSelectSchema(table);
-	const expected = z.object({ id: intSchema, name: textSchema });
+	const expected = z.object({ id: intSchema, generated: intSchema, name: textSchema });
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
 });