Skip to content

Commit d104e94

Browse files
committed
update schema
1 parent 9482d20 commit d104e94

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drizzle-kit/src/cli/schema.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ const optionCasing = string()
5050
.desc('Casing for serialization');
5151
const optionIgnoreConflicts = boolean('ignore-conflicts')
5252
.desc('Skip commutativity conflict checks');
53-
// .default(false);
5453

5554
export const generate = command({
5655
name: 'generate',
@@ -128,7 +127,7 @@ export const migrate = command({
128127
},
129128
transform: async (opts) => {
130129
const migrateConf = await prepareMigrateConfig(opts.config);
131-
return { ...migrateConf, ignoreConflicts: opts.ignoreConflicts };
130+
return { ...migrateConf, ...(opts.ignoreConflicts !== undefined && { ignoreConflicts: opts.ignoreConflicts }) };
132131
},
133132
handler: async (opts) => {
134133
await assertOrmCoreVersion();

0 commit comments

Comments
 (0)