From 4b594dee32d437ec893a972e55a7a13240cbac03 Mon Sep 17 00:00:00 2001 From: YuHyunO Date: Thu, 21 Aug 2025 13:41:09 +0900 Subject: [PATCH 1/2] fix: MySQL tinyint type not imported during drizzle-kit pull --- drizzle-kit/src/introspect-mysql.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drizzle-kit/src/introspect-mysql.ts b/drizzle-kit/src/introspect-mysql.ts index 8f1ddfd065..0f6c45fc5c 100644 --- a/drizzle-kit/src/introspect-mysql.ts +++ b/drizzle-kit/src/introspect-mysql.ts @@ -175,6 +175,7 @@ export const schemaToTypeScript = ( patched = patched.startsWith('datetime(') ? 'datetime' : patched; patched = patched.startsWith('varbinary(') ? 'varbinary' : patched; patched = patched.startsWith('int(') ? 'int' : patched; + patched = patched.startsWith('tinyint(') ? 'tinyint' : patched; patched = patched.startsWith('double(') ? 'double' : patched; patched = patched.startsWith('float(') ? 'float' : patched; patched = patched.startsWith('int unsigned') ? 'int' : patched; @@ -209,6 +210,7 @@ export const schemaToTypeScript = ( patched = patched.startsWith('datetime(') ? 'datetime' : patched; patched = patched.startsWith('varbinary(') ? 'varbinary' : patched; patched = patched.startsWith('int(') ? 'int' : patched; + patched = patched.startsWith('tinyint(') ? 'tinyint' : patched; patched = patched.startsWith('double(') ? 'double' : patched; patched = patched.startsWith('float(') ? 'float' : patched; patched = patched.startsWith('int unsigned') ? 'int' : patched; From effeefe19aa0994e9bbd396c00d1023568420c7f Mon Sep 17 00:00:00 2001 From: YuHyunO Date: Thu, 21 Aug 2025 13:56:49 +0900 Subject: [PATCH 2/2] fix: Handle empty string defaults for MySQL VARCHAR types to avoid syntax errors in drizzle-kit pull --- drizzle-kit/src/introspect-mysql.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drizzle-kit/src/introspect-mysql.ts b/drizzle-kit/src/introspect-mysql.ts index 0f6c45fc5c..47e8c116ae 100644 --- a/drizzle-kit/src/introspect-mysql.ts +++ b/drizzle-kit/src/introspect-mysql.ts @@ -669,9 +669,13 @@ const column = ( } })`; const mappedDefaultValue = mapColumnDefault(defaultValue, isExpression); - out += defaultValue - ? `.default(${isExpression ? mappedDefaultValue : unescapeSingleQuotes(mappedDefaultValue, true)})` - : ''; + if (defaultValue === "''") { + out += ".default('')"; + } else { + out += defaultValue + ? `.default(${isExpression ? mappedDefaultValue : unescapeSingleQuotes(mappedDefaultValue, true)})` + : ''; + } return out; }