Skip to content

fix: pass 'indexes' invokeSource for MSSQL filtered index WHERE clause #5596

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
funsaized wants to merge 1 commit into
base: beta
Choose a base branch
from
Open

fix: pass 'indexes' invokeSource for MSSQL filtered index WHERE clause #5596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion drizzle-kit/src/dialects/mssql/drizzle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export const fromDrizzleSchema = (
}
}

let where = index.config.where ? dialect.sqlToQuery(index.config.where).sql : '';
let where = index.config.where ? dialect.sqlToQuery(index.config.where, 'indexes').sql : '';
where = where === 'true' ? '' : where;

result.indexes.push({
Expand Down
4 changes: 2 additions & 2 deletions drizzle-kit/tests/mssql/indexes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ test('indexes #0', async (t) => {
'CREATE INDEX [removeColumn] ON [users] ([name]);',
'CREATE INDEX [addColumn] ON [users] ([name],[id]);',
'CREATE INDEX [removeWhere] ON [users] ([name]);',
"CREATE INDEX [addWhere] ON [users] ([name]) WHERE [users].[name] != 'name';",
"CREATE INDEX [addWhere] ON [users] ([name]) WHERE [name] != 'name';",
]);
expect(pst).toStrictEqual([
'DROP INDEX [changeName] ON [users];',
Expand All @@ -83,7 +83,7 @@ test('indexes #0', async (t) => {
'DROP INDEX [removeWhere] ON [users];',
'CREATE INDEX [newName] ON [users] ([name]);',
'CREATE INDEX [addColumn] ON [users] ([name],[id]);',
"CREATE INDEX [addWhere] ON [users] ([name]) WHERE [users].[name] != 'name';",
"CREATE INDEX [addWhere] ON [users] ([name]) WHERE [name] != 'name';",
'CREATE INDEX [removeColumn] ON [users] ([name]);',
'CREATE INDEX [removeWhere] ON [users] ([name]);',
]);
Expand Down
4 changes: 2 additions & 2 deletions drizzle-kit/tests/mssql/tables.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ test('optional db aliases (snake case)', async () => {

const st6 = `CREATE UNIQUE INDEX [t1_uni_idx] ON [t1] ([t1_uni_idx]);`;

const st7 = `CREATE INDEX [t1_idx] ON [t1] ([t1_idx]) WHERE [t1].[t1_idx] > 0;`;
const st7 = `CREATE INDEX [t1_idx] ON [t1] ([t1_idx]) WHERE [t1_idx] > 0;`;

expect(st).toStrictEqual([st1, st2, st3, st4, st5, st6, st7]);
expect(pst).toStrictEqual([st1, st2, st3, st4, st5, st6, st7]);
Expand Down Expand Up @@ -948,7 +948,7 @@ test('optional db aliases (camel case)', async () => {

const st6 = `CREATE UNIQUE INDEX [t1UniIdx] ON [t1] ([t1UniIdx]);`;

const st7 = `CREATE INDEX [t1Idx] ON [t1] ([t1Idx]) WHERE [t1].[t1Idx] > 0;`;
const st7 = `CREATE INDEX [t1Idx] ON [t1] ([t1Idx]) WHERE [t1Idx] > 0;`;

expect(st).toStrictEqual([st1, st2, st3, st4, st5, st6, st7]);
expect(pst).toStrictEqual([st1, st2, st3, st4, st5, st6, st7]);
Expand Down