Merge pull request #2944 from drizzle-team/drizzle-kit/checks

Drizzle kit/checks

drizzle-kit/src/cli/commands/libSqlPushUtils.ts

@@ -40,9 +40,17 @@ export const _moveDataStatements = (
 	const compositePKs = Object.values(
 		json.tables[tableName].compositePrimaryKeys,
 	).map((it) => SQLiteSquasher.unsquashPK(it));
+	const checkConstraints = Object.values(json.tables[tableName].checkConstraints);
 
 	const fks = referenceData.map((it) => SQLiteSquasher.unsquashPushFK(it));
 
+	const mappedCheckConstraints: string[] = checkConstraints.map((it) =>
+		it.replaceAll(`"${tableName}".`, `"${newTableName}".`)
+			.replaceAll(`\`${tableName}\`.`, `\`${newTableName}\`.`)
+			.replaceAll(`${tableName}.`, `${newTableName}.`)
+			.replaceAll(`'${tableName}'.`, `\`${newTableName}\`.`)
+	);
+
 	// create new table
 	statements.push(
 		new SQLiteCreateTableConvertor().convert({
@@ -51,6 +59,7 @@ export const _moveDataStatements = (
 			columns: tableColumns,
 			referenceData: fks,
 			compositePKs,
+			checkConstraints: mappedCheckConstraints,
 		}),
 	);
 

drizzle-kit/src/cli/commands/sqlitePushUtils.ts

@@ -27,6 +27,14 @@ export const _moveDataStatements = (
 	const compositePKs = Object.values(
 		json.tables[tableName].compositePrimaryKeys,
 	).map((it) => SQLiteSquasher.unsquashPK(it));
+	const checkConstraints = Object.values(json.tables[tableName].checkConstraints);
+
+	const mappedCheckConstraints: string[] = checkConstraints.map((it) =>
+		it.replaceAll(`"${tableName}".`, `"${newTableName}".`)
+			.replaceAll(`\`${tableName}\`.`, `\`${newTableName}\`.`)
+			.replaceAll(`${tableName}.`, `${newTableName}.`)
+			.replaceAll(`'${tableName}'.`, `\`${newTableName}\`.`)
+	);
 
 	const fks = referenceData.map((it) => SQLiteSquasher.unsquashPushFK(it));
 
@@ -38,6 +46,7 @@ export const _moveDataStatements = (
 			columns: tableColumns,
 			referenceData: fks,
 			compositePKs,
+			checkConstraints: mappedCheckConstraints,
 		}),
 	);
 

drizzle-kit/src/cli/views.ts

@@ -330,6 +330,7 @@ export type IntrospectStage =
 	| 'columns'
 	| 'enums'
 	| 'indexes'
+	| 'checks'
 	| 'fks'
 	| 'views';
 type IntrospectState = {
@@ -370,6 +371,11 @@ export class IntrospectProgress extends TaskView {
 			name: 'foreign keys',
 			status: 'fetching',
 		},
+		checks: {
+			count: 0,
+			name: 'check constraints',
+			status: 'fetching',
+		},
 		views: {
 			count: 0,
 			name: 'views',
@@ -428,6 +434,7 @@ export class IntrospectProgress extends TaskView {
 		info += this.hasEnums ? this.statusText(spin, this.state.enums) : '';
 		info += this.statusText(spin, this.state.indexes);
 		info += this.statusText(spin, this.state.fks);
+		info += this.statusText(spin, this.state.checks);
 		info += this.statusText(spin, this.state.views);
 
 		return info;

drizzle-kit/src/introspect-mysql.ts

@@ -4,6 +4,7 @@ import './@types/utils';
 import type { Casing } from './cli/validations/common';
 import { assertUnreachable } from './global';
 import {
+	CheckConstraint,
 	Column,
 	ForeignKey,
 	Index,
@@ -155,11 +156,15 @@ export const schemaToTypeScript = (
 			const uniqueImports = Object.values(it.uniqueConstraints).map(
 				(it) => 'unique',
 			);
+			const checkImports = Object.values(it.checkConstraint).map(
+				(it) => 'check',
+			);
 
 			res.mysql.push(...idxImports);
 			res.mysql.push(...fkImpots);
 			res.mysql.push(...pkImports);
 			res.mysql.push(...uniqueImports);
+			res.mysql.push(...checkImports);
 
 			const columnImports = Object.values(it.columns)
 				.map((col) => {
@@ -242,6 +247,7 @@ export const schemaToTypeScript = (
 			|| filteredFKs.length > 0
 			|| Object.keys(table.compositePrimaryKeys).length > 0
 			|| Object.keys(table.uniqueConstraints).length > 0
+			|| Object.keys(table.checkConstraint).length > 0
 		) {
 			statement += ',\n';
 			statement += '(table) => {\n';
@@ -260,6 +266,10 @@ export const schemaToTypeScript = (
 				Object.values(table.uniqueConstraints),
 				withCasing,
 			);
+			statement += createTableChecks(
+				Object.values(table.checkConstraint),
+				withCasing,
+			);
 			statement += '\t}\n';
 			statement += '}';
 		}
@@ -913,6 +923,25 @@ const createTableUniques = (
 	return statement;
 };
 
+const createTableChecks = (
+	checks: CheckConstraint[],
+	casing: (value: string) => string,
+): string => {
+	let statement = '';
+
+	checks.forEach((it) => {
+		const checkKey = casing(it.name);
+
+		statement += `\t\t${checkKey}: `;
+		statement += 'check(';
+		statement += `"${it.name}", `;
+		statement += `sql\`${it.value.replace(/`/g, '\\`')}\`)`;
+		statement += `,\n`;
+	});
+
+	return statement;
+};
+
 const createTablePKs = (
 	pks: PrimaryKey[],
 	casing: (value: string) => string,

drizzle-kit/src/introspect-pg.ts

@@ -14,6 +14,7 @@ import { Casing } from './cli/validations/common';
 import { vectorOps } from './extensions/vector';
 import { assertUnreachable } from './global';
 import {
+	CheckConstraint,
 	Column,
 	ForeignKey,
 	Index,
@@ -334,6 +335,10 @@ export const schemaToTypeScript = (schema: PgSchemaInternal, casing: Casing) =>
 			const pkImports = Object.values(it.compositePrimaryKeys).map((it) => 'primaryKey');
 			const uniqueImports = Object.values(it.uniqueConstraints).map((it) => 'unique');
 
+			const checkImports = Object.values(it.checkConstraints).map(
+				(it) => 'check',
+			);
+
 			if (it.schema && it.schema !== 'public' && it.schema !== '') {
 				res.pg.push('pgSchema');
 			}
@@ -342,6 +347,7 @@ export const schemaToTypeScript = (schema: PgSchemaInternal, casing: Casing) =>
 			res.pg.push(...fkImpots);
 			res.pg.push(...pkImports);
 			res.pg.push(...uniqueImports);
+			res.pg.push(...checkImports);
 
 			const columnImports = Object.values(it.columns)
 				.map((col) => {
@@ -495,16 +501,29 @@ export const schemaToTypeScript = (schema: PgSchemaInternal, casing: Casing) =>
 		// });
 
 		if (
-			Object.keys(table.indexes).length > 0 || Object.values(table.foreignKeys).length > 0
-			|| Object.keys(table.compositePrimaryKeys).length > 0 || Object.keys(table.uniqueConstraints).length > 0
+			Object.keys(table.indexes).length > 0
+			|| Object.values(table.foreignKeys).length > 0
+			|| Object.keys(table.compositePrimaryKeys).length > 0
+			|| Object.keys(table.uniqueConstraints).length > 0
+			|| Object.keys(table.checkConstraints).length > 0
 		) {
 			statement += ',\n';
 			statement += '(table) => {\n';
 			statement += '\treturn {\n';
 			statement += createTableIndexes(table.name, Object.values(table.indexes), casing);
 			statement += createTableFKs(Object.values(table.foreignKeys), schemas, casing);
-			statement += createTablePKs(Object.values(table.compositePrimaryKeys), casing);
-			statement += createTableUniques(Object.values(table.uniqueConstraints), casing);
+			statement += createTablePKs(
+				Object.values(table.compositePrimaryKeys),
+				casing,
+			);
+			statement += createTableUniques(
+				Object.values(table.uniqueConstraints),
+				casing,
+			);
+			statement += createTableChecks(
+				Object.values(table.checkConstraints),
+				casing,
+			);
 			statement += '\t}\n';
 			statement += '}';
 		}
@@ -1225,6 +1244,24 @@ const createTableUniques = (unqs: UniqueConstraint[], casing: Casing): string =>
 	return statement;
 };
 
+const createTableChecks = (
+	checkConstraints: CheckConstraint[],
+	casing: Casing,
+) => {
+	let statement = '';
+
+	checkConstraints.forEach((it) => {
+		const checkKey = withCasing(it.name, casing);
+		statement += `\t\t${checkKey}: `;
+		statement += 'check(';
+		statement += `"${it.name}", `;
+		statement += `sql\`${it.value}\`)`;
+		statement += `,\n`;
+	});
+
+	return statement;
+};
+
 const createTableFKs = (fks: ForeignKey[], schemas: Record<string, string>, casing: Casing): string => {
 	let statement = '';
 

drizzle-kit/src/introspect-sqlite.ts

@@ -3,6 +3,7 @@ import { toCamelCase } from 'drizzle-orm/casing';
 import './@types/utils';
 import type { Casing } from './cli/validations/common';
 import { assertUnreachable } from './global';
+import { CheckConstraint } from './serializer/mysqlSchema';
 import type {
 	Column,
 	ForeignKey,
@@ -91,11 +92,15 @@ export const schemaToTypeScript = (
 			const uniqueImports = Object.values(it.uniqueConstraints).map(
 				(it) => 'unique',
 			);
+			const checkImports = Object.values(it.checkConstraints).map(
+				(it) => 'check',
+			);
 
 			res.sqlite.push(...idxImports);
 			res.sqlite.push(...fkImpots);
 			res.sqlite.push(...pkImports);
 			res.sqlite.push(...uniqueImports);
+			res.sqlite.push(...checkImports);
 
 			const columnImports = Object.values(it.columns)
 				.map((col) => {
@@ -154,6 +159,7 @@ export const schemaToTypeScript = (
 			|| filteredFKs.length > 0
 			|| Object.keys(table.compositePrimaryKeys).length > 0
 			|| Object.keys(table.uniqueConstraints).length > 0
+			|| Object.keys(table.checkConstraints).length > 0
 		) {
 			statement += ',\n';
 			statement += '(table) => {\n';
@@ -172,6 +178,10 @@ export const schemaToTypeScript = (
 				Object.values(table.uniqueConstraints),
 				casing,
 			);
+			statement += createTableChecks(
+				Object.values(table.checkConstraints),
+				casing,
+			);
 			statement += '\t}\n';
 			statement += '}';
 		}
@@ -457,6 +467,24 @@ const createTableUniques = (
 
 	return statement;
 };
+const createTableChecks = (
+	checks: CheckConstraint[],
+	casing: Casing,
+): string => {
+	let statement = '';
+
+	checks.forEach((it) => {
+		const checkKey = withCasing(it.name, casing);
+
+		statement += `\t\t${checkKey}: `;
+		statement += 'check(';
+		statement += `"${it.name}", `;
+		statement += `sql\`${it.value}\`)`;
+		statement += `,\n`;
+	});
+
+	return statement;
+};
 
 const createTablePKs = (pks: PrimaryKey[], casing: Casing): string => {
 	let statement = '';

drizzle-kit/src/jsonDiffer.js

@@ -427,6 +427,24 @@ const findAlternationsInTable = (table) => {
 		}),
 	);
 
+	const addedCheckConstraints = Object.fromEntries(
+		Object.entries(table.checkConstraints || {}).filter((it) => {
+			return it[0].endsWith('__added');
+		}),
+	);
+
+	const deletedCheckConstraints = Object.fromEntries(
+		Object.entries(table.checkConstraints || {}).filter((it) => {
+			return it[0].endsWith('__deleted');
+		}),
+	);
+
+	const alteredCheckConstraints = Object.fromEntries(
+		Object.entries(table.checkConstraints || {}).filter((it) => {
+			return !it[0].endsWith('__deleted') && !it[0].endsWith('__added');
+		}),
+	);
+
 	const mappedAltered = altered.map((it) => alternationsInColumn(it)).filter(Boolean);
 
 	return {
@@ -445,11 +463,15 @@ const findAlternationsInTable = (table) => {
 		addedUniqueConstraints,
 		deletedUniqueConstraints,
 		alteredUniqueConstraints,
+		addedCheckConstraints,
+		deletedCheckConstraints,
+		alteredCheckConstraints,
 	};
 };
 
 const alternationsInColumn = (column) => {
 	const altered = [column];
+
 	const result = altered
 		.filter((it) => {
 			if ('type' in it && it.type.__old.replace(' (', '(') === it.type.__new.replace(' (', '(')) {
@@ -713,6 +735,33 @@ const alternationsInColumn = (column) => {
 			}
 			return it;
 		})
+		.map((it) => {
+			if ('' in it) {
+				return {
+					...it,
+					autoincrement: {
+						type: 'changed',
+						old: it.autoincrement.__old,
+						new: it.autoincrement.__new,
+					},
+				};
+			}
+			if ('autoincrement__added' in it) {
+				const { autoincrement__added, ...others } = it;
+				return {
+					...others,
+					autoincrement: { type: 'added', value: it.autoincrement__added },
+				};
+			}
+			if ('autoincrement__deleted' in it) {
+				const { autoincrement__deleted, ...others } = it;
+				return {
+					...others,
+					autoincrement: { type: 'deleted', value: it.autoincrement__deleted },
+				};
+			}
+			return it;
+		})
 		.filter(Boolean);
 
 	return result[0];