[mssql]: index bug fix in kit

Author: AleksandrSherman

drizzle-kit/src/dialects/mssql/convertor.ts

@@ -218,7 +218,11 @@ const createIndex = convertor('create_index', (st) => {
 	const { name, table, columns, isUnique, where, schema } = st.index;
 	const indexPart = isUnique ? 'UNIQUE INDEX' : 'INDEX';
 
-	const uniqueString = `[${columns.join('],[')}]`;
+	const uniqueString = `${
+		columns.map((it) => {
+			return it.isExpression ? it.value : `[${it.value}]`;
+		})
+	}`;
 
 	const whereClause = where ? ` WHERE ${where}` : '';
 

drizzle-kit/src/dialects/mssql/ddl.ts

@@ -39,7 +39,13 @@ export const createDDL = () => {
 		indexes: {
 			schema: 'required',
 			table: 'required',
-			columns: 'string[]', // does not supported indexing expressions
+			// TODO add asc/desc: asc and desc feature exists in mssql
+			columns: [
+				{
+					value: 'string',
+					isExpression: 'boolean',
+				},
+			],
 			isUnique: 'boolean',
 			where: 'string?',
 		},

drizzle-kit/src/dialects/mssql/drizzle.ts

@@ -272,9 +272,9 @@ export const fromDrizzleSchema = (
 				columns: columns.map((it) => {
 					if (is(it, SQL)) {
 						const sql = dialect.sqlToQuery(it, 'indexes').sql;
-						return sql;
+						return { value: sql, isExpression: true };
 					} else {
-						return getColumnCasing(it, casing);
+						return { value: getColumnCasing(it, casing), isExpression: false };
 					}
 				}),
 				isUnique: index.config.unique ?? false,

drizzle-kit/src/dialects/mssql/introspect.ts

@@ -535,7 +535,7 @@ WHERE obj.type in ('U', 'V')
 			const column = columnsList.find((column) =>
 				column.table_object_id === index.table_id && column.column_id === it
 			)!;
-			return column.name;
+			return { value: column.name, isExpression: false };
 		});
 
 		indexes.push({

drizzle-kit/src/dialects/mssql/typescript.ts

@@ -442,7 +442,11 @@ const createTableIndexes = (tableName: string, idxs: Index[], casing: Casing): s
 		statement += `.on(${
 			it.columns
 				.map((it) => {
-					return `table.${withCasing(it, casing)}`;
+					if (it.isExpression) {
+						return `sql\`${it.value}\``;
+					} else {
+						return `table.${withCasing(it.value, casing)}`;
+					}
 				})
 				.join(', ')
 		})`;

drizzle-kit/tests/mssql/indexes.test.ts

@@ -116,16 +116,16 @@ test('indexes #2', async () => {
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 
 	const expectedSt1 = [
-		'CREATE TABLE `table1` (\n'
-		+ '\t`col1` int,\n'
-		+ '\t`col2` int,\n'
-		+ '\tCONSTRAINT `index1` UNIQUE INDEX(`col1`),\n'
-		+ '\tCONSTRAINT `index2` UNIQUE INDEX(`col1`,`col2`)\n'
+		'CREATE TABLE [table1] (\n'
+		+ '\t[col1] int,\n'
+		+ '\t[col2] int\n'
 		+ ');\n',
-		'CREATE INDEX `index3` ON `table1` (`col1`);',
-		'CREATE INDEX `index4` ON `table1` (`col1`,`col2`);',
-		'CREATE INDEX `index5` ON `table1` (`col1` asc);',
-		'CREATE INDEX `index6` ON `table1` (`col1` asc,`col2` desc);',
+		`CREATE UNIQUE INDEX [index1] ON [table1] ([col1]);`,
+		`CREATE UNIQUE INDEX [index2] ON [table1] ([col1],[col2]);`,
+		'CREATE INDEX [index3] ON [table1] ([col1]);',
+		'CREATE INDEX [index4] ON [table1] ([col1],[col2]);',
+		'CREATE INDEX [index5] ON [table1] ([col1] asc);',
+		'CREATE INDEX [index6] ON [table1] ([col1] asc,[col2] desc);',
 	];
 	expect(st1).toStrictEqual(expectedSt1);
 	expect(pst1).toStrictEqual(expectedSt1);

drizzle-kit/tests/mssql/pull.test.ts

@@ -491,3 +491,31 @@ test('introspect empty db', async () => {
 
 	expect(introspectDDL.entities.list().length).toBe(0);
 });
+
+test('indexes #2', async () => {
+	const table1 = mssqlTable('table1', {
+		col1: int(),
+		col2: int(),
+	}, () => [
+		index1,
+		index2,
+		index3,
+		index4,
+		index5,
+		index6,
+	]);
+
+	const index1 = uniqueIndex('index1').on(table1.col1);
+	const index2 = uniqueIndex('index2').on(table1.col1, table1.col2);
+	const index3 = index('index3').on(table1.col1);
+	const index4 = index('index4').on(table1.col1, table1.col2);
+	const index5 = index('index5').on(sql`${table1.col1} asc`);
+	const index6 = index('index6').on(sql`${table1.col1} asc`, sql`${table1.col2} desc`);
+
+	const schema = { table1 };
+
+	const { statements, sqlStatements } = await diffIntrospect(db, schema, 'sql-in-index');
+
+	expect(statements).toStrictEqual([]);
+	expect(sqlStatements).toStrictEqual([]);
+});