Merge branch 'main' into feat/issue-4873

Author: robingenz

changelogs/drizzle-kit/0.31.5.md

@@ -0,0 +1 @@
+- Add casing support to studio configuration and related functions

drizzle-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.31.4",
+	"version": "0.31.5",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

drizzle-kit/src/cli/commands/utils.ts

@@ -18,8 +18,7 @@ import {
 	Prefix,
 	wrapParam,
 } from '../validations/common';
-import { GelCredentials, gelCredentials } from '../validations/gel';
-import { printConfigConnectionIssues as printIssuesGel } from '../validations/gel';
+import { GelCredentials, gelCredentials, printConfigConnectionIssues as printIssuesGel } from '../validations/gel';
 import {
 	LibSQLCredentials,
 	libSQLCredentials,
@@ -47,7 +46,7 @@ import {
 	sqliteCredentials,
 } from '../validations/sqlite';
 import { studioCliParams, studioConfig } from '../validations/studio';
-import { error, grey } from '../views';
+import { error } from '../views';
 
 // NextJs default config is target: es5, which esbuild-register can't consume
 const assertES5 = async (unregister: () => void) => {
@@ -664,7 +663,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 		process.exit(1);
 	}
 	const { host, port } = params;
-	const { dialect, schema } = result.data;
+	const { dialect, schema, casing } = result.data;
 	const flattened = flattenDatabaseCredentials(config);
 
 	if (dialect === 'postgresql') {
@@ -680,6 +679,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 			host,
 			port,
 			credentials,
+			casing,
 		};
 	}
 
@@ -696,6 +696,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 			host,
 			port,
 			credentials,
+			casing,
 		};
 	}
 
@@ -712,6 +713,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 			host,
 			port,
 			credentials,
+			casing,
 		};
 	}
 
@@ -728,6 +730,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 			host,
 			port,
 			credentials,
+			casing,
 		};
 	}
 
@@ -744,6 +747,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
 			host,
 			port,
 			credentials,
+			casing,
 		};
 	}
 

drizzle-kit/src/cli/schema.ts

@@ -671,6 +671,7 @@ export const studio = command({
 			port,
 			host,
 			credentials,
+			casing,
 		} = await prepareStudioConfig(opts);
 
 		const {
@@ -712,22 +713,22 @@ export const studio = command({
 				const { schema, relations, files } = schemaPath
 					? await preparePgSchema(schemaPath)
 					: { schema: {}, relations: {}, files: [] };
-				setup = await drizzleForPostgres(credentials, schema, relations, files);
+				setup = await drizzleForPostgres(credentials, schema, relations, files, casing);
 			} else if (dialect === 'mysql') {
 				const { schema, relations, files } = schemaPath
 					? await prepareMySqlSchema(schemaPath)
 					: { schema: {}, relations: {}, files: [] };
-				setup = await drizzleForMySQL(credentials, schema, relations, files);
+				setup = await drizzleForMySQL(credentials, schema, relations, files, casing);
 			} else if (dialect === 'sqlite') {
 				const { schema, relations, files } = schemaPath
 					? await prepareSQLiteSchema(schemaPath)
 					: { schema: {}, relations: {}, files: [] };
-				setup = await drizzleForSQLite(credentials, schema, relations, files);
+				setup = await drizzleForSQLite(credentials, schema, relations, files, casing);
 			} else if (dialect === 'turso') {
 				const { schema, relations, files } = schemaPath
 					? await prepareSQLiteSchema(schemaPath)
 					: { schema: {}, relations: {}, files: [] };
-				setup = await drizzleForLibSQL(credentials, schema, relations, files);
+				setup = await drizzleForLibSQL(credentials, schema, relations, files, casing);
 			} else if (dialect === 'singlestore') {
 				const { schema, relations, files } = schemaPath
 					? await prepareSingleStoreSchema(schemaPath)
@@ -737,6 +738,7 @@ export const studio = command({
 					schema,
 					relations,
 					files,
+					casing,
 				);
 			} else if (dialect === 'gel') {
 				console.log(

drizzle-kit/src/cli/validations/studio.ts

@@ -1,5 +1,6 @@
 import { coerce, intersection, object, string, TypeOf, union } from 'zod';
 import { dialect } from '../../schemaValidator';
+import { casingType } from './common';
 import { mysqlCredentials } from './mysql';
 import { postgresCredentials } from './postgres';
 import { sqliteCredentials } from './sqlite';
@@ -21,4 +22,5 @@ export const studioCliParams = object({
 export const studioConfig = object({
 	dialect,
 	schema: union([string(), string().array()]).optional(),
+	casing: casingType.optional(),
 });