Insert parameters in check constraint

drizzle-kit/src/serializer/mysqlSerializer.ts

@@ -26,7 +26,7 @@ import {
 	UniqueConstraint,
 	View,
 } from '../serializer/mysqlSchema';
-import { type DB, escapeSingleQuotes } from '../utils';
+import { type DB, escapeSingleQuotes, replaceQueryParams } from '../utils';
 import { getColumnCasing, sqlToStr } from './utils';
 
 export const indexName = (tableName: string, columns: string[]) => {
@@ -399,7 +399,7 @@ export const generateMySqlSnapshot = (
 
 			checkConstraintObject[checkName] = {
 				name: checkName,
-				value: dialect.sqlToQuery(check.value).sql,
+				value: replaceQueryParams('mysql', dialect.sqlToQuery(check.value)),
 			};
 		});
 

drizzle-kit/src/serializer/pgSerializer.ts

@@ -39,7 +39,7 @@ import type {
 	UniqueConstraint,
 	View,
 } from '../serializer/pgSchema';
-import { type DB, escapeSingleQuotes, isPgArrayType } from '../utils';
+import { type DB, escapeSingleQuotes, isPgArrayType, replaceQueryParams } from '../utils';
 import { getColumnCasing, sqlToStr } from './utils';
 
 export const indexName = (tableName: string, columns: string[]) => {
@@ -559,7 +559,7 @@ export const generatePgSnapshot = (
 
 			checksObject[checkName] = {
 				name: checkName,
-				value: dialect.sqlToQuery(check.value).sql,
+				value: replaceQueryParams('postgresql', dialect.sqlToQuery(check.value)),
 			};
 		});
 

drizzle-kit/src/serializer/sqliteSerializer.ts

@@ -25,7 +25,7 @@ import type {
 	UniqueConstraint,
 	View,
 } from '../serializer/sqliteSchema';
-import { escapeSingleQuotes, type SQLiteDB } from '../utils';
+import { escapeSingleQuotes, replaceQueryParams, type SQLiteDB } from '../utils';
 import { getColumnCasing, sqlToStr } from './utils';
 
 export const generateSqliteSnapshot = (
@@ -309,7 +309,7 @@ export const generateSqliteSnapshot = (
 
 			checkConstraintObject[checkName] = {
 				name: checkName,
-				value: dialect.sqlToQuery(check.value).sql,
+				value: replaceQueryParams('sqlite', dialect.sqlToQuery(check.value)),
 			};
 		});
 

drizzle-kit/src/utils.ts

@@ -1,5 +1,6 @@
 import type { RunResult } from 'better-sqlite3';
 import chalk from 'chalk';
+import type { Query } from 'drizzle-orm';
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { parse } from 'url';
@@ -368,3 +369,26 @@ export function unescapeSingleQuotes(str: string, ignoreFirstAndLastChar: boolea
 	const regex = ignoreFirstAndLastChar ? /(?<!^)'(?!$)/g : /'/g;
 	return str.replace(/''/g, "'").replace(regex, "\\'");
 }
+
+export function replaceQueryParams(dialect: Dialect, query: Query): string {
+	let str = query.sql;
+	const params = query.params.map((p) => {
+		try {
+			return JSON.stringify(p);
+		} catch {
+			return String(p);
+		}
+	});
+
+	if (dialect === 'postgresql') {
+		for (let i = 0; i < params.length; i++) {
+			str = str.replace(`$${i + 1}`, params[i]);
+		}
+		return str;
+	}
+
+	for (const param of params) {
+		str = str.replace('?', param);
+	}
+	return str;
+}

drizzle-kit/tests/mysql-checks.test.ts

@@ -289,3 +289,28 @@ test('create checks with same names', async (t) => {
 
 	await expect(diffTestSchemasMysql({}, to, [])).rejects.toThrowError();
 });
+
+test('check with param', async (t) => {
+	const from = {
+		users: mysqlTable('users', {
+			id: serial('id').primaryKey(),
+			age: int('age'),
+		}),
+	};
+
+	const to = {
+		users: mysqlTable('users', {
+			id: serial('id').primaryKey(),
+			age: int('age'),
+		}, (table) => [
+			check('name', sql`${table.age} > ${21}`),
+		]),
+	};
+
+	const { sqlStatements } = await diffTestSchemasMysql(from, to, []);
+
+	expect(sqlStatements.length).toBe(1);
+	expect(sqlStatements[0]).toBe(
+		`ALTER TABLE \`users\` ADD CONSTRAINT \`name\` CHECK (\`users\`.\`age\` > 21);`,
+	);
+});

drizzle-kit/tests/pg-checks.test.ts

@@ -280,3 +280,28 @@ test('create checks with same names', async (t) => {
 
 	await expect(diffTestSchemas({}, to, [])).rejects.toThrowError();
 });
+
+test('check with param', async (t) => {
+	const from = {
+		users: pgTable('users', {
+			id: serial('id').primaryKey(),
+			age: integer('age'),
+		}),
+	};
+
+	const to = {
+		users: pgTable('users', {
+			id: serial('id').primaryKey(),
+			age: integer('age'),
+		}, (table) => [
+			check('name', sql`${table.age} > ${21}`),
+		]),
+	};
+
+	const { sqlStatements } = await diffTestSchemas(from, to, []);
+
+	expect(sqlStatements.length).toBe(1);
+	expect(sqlStatements[0]).toBe(
+		`ALTER TABLE "users" ADD CONSTRAINT "name" CHECK ("users"."age" > 21);`,
+	);
+});

drizzle-kit/tests/sqlite-checks.test.ts

@@ -306,3 +306,33 @@ test('create checks with same names', async (t) => {
 
 	await expect(diffTestSchemasSqlite({}, to, [])).rejects.toThrowError();
 });
+
+test('check with param', async (t) => {
+	const from = {
+		users: sqliteTable('users', {
+			id: int('id').primaryKey(),
+			age: int('age'),
+		}),
+	};
+
+	const to = {
+		users: sqliteTable('users', {
+			id: int('id').primaryKey(),
+			age: int('age'),
+		}, (table) => [
+			check('name', sql`${table.age} > ${21}`),
+		]),
+	};
+
+	const { sqlStatements } = await diffTestSchemasSqlite(from, to, []);
+
+	expect(sqlStatements.length).toBe(6);
+	expect(sqlStatements).toStrictEqual([
+		'PRAGMA foreign_keys=OFF;',
+		'CREATE TABLE `__new_users` (\n\t`id` integer PRIMARY KEY NOT NULL,\n\t`age` integer,\n\tCONSTRAINT "name" CHECK("__new_users"."age" > 21)\n);\n',
+		'INSERT INTO `__new_users`("id", "age") SELECT "id", "age" FROM `users`;',
+		'DROP TABLE `users`;',
+		'ALTER TABLE `__new_users` RENAME TO `users`;',
+		'PRAGMA foreign_keys=ON;',
+	]);
+});