Skip to content

Commit 8e8a9e9

Browse files
[Drizzle Kit]: Add casing support to studio configuration and related functions (#4940)
* Add casing support to studio configuration and related functions * Bump version to 0.31.5 and add changelog entry for casing support in studio configuration
1 parent 37d059f commit 8e8a9e9

File tree

6 files changed

+115
-38
lines changed

6 files changed

+115
-38
lines changed

changelogs/drizzle-kit/0.31.5.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add casing support to studio configuration and related functions

drizzle-kit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drizzle-kit",
3-
"version": "0.31.4",
3+
"version": "0.31.5",
44
"homepage": "https://orm.drizzle.team",
55
"keywords": [
66
"drizzle",

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import {
1818
Prefix,
1919
wrapParam,
2020
} from '../validations/common';
21-
import { GelCredentials, gelCredentials } from '../validations/gel';
22-
import { printConfigConnectionIssues as printIssuesGel } from '../validations/gel';
21+
import { GelCredentials, gelCredentials, printConfigConnectionIssues as printIssuesGel } from '../validations/gel';
2322
import {
2423
LibSQLCredentials,
2524
libSQLCredentials,
@@ -47,7 +46,7 @@ import {
4746
sqliteCredentials,
4847
} from '../validations/sqlite';
4948
import { studioCliParams, studioConfig } from '../validations/studio';
50-
import { error, grey } from '../views';
49+
import { error } from '../views';
5150

5251
// NextJs default config is target: es5, which esbuild-register can't consume
5352
const assertES5 = async (unregister: () => void) => {
@@ -664,7 +663,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
664663
process.exit(1);
665664
}
666665
const { host, port } = params;
667-
const { dialect, schema } = result.data;
666+
const { dialect, schema, casing } = result.data;
668667
const flattened = flattenDatabaseCredentials(config);
669668

670669
if (dialect === 'postgresql') {
@@ -680,6 +679,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
680679
host,
681680
port,
682681
credentials,
682+
casing,
683683
};
684684
}
685685

@@ -696,6 +696,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
696696
host,
697697
port,
698698
credentials,
699+
casing,
699700
};
700701
}
701702

@@ -712,6 +713,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
712713
host,
713714
port,
714715
credentials,
716+
casing,
715717
};
716718
}
717719

@@ -728,6 +730,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
728730
host,
729731
port,
730732
credentials,
733+
casing,
731734
};
732735
}
733736

@@ -744,6 +747,7 @@ export const prepareStudioConfig = async (options: Record<string, unknown>) => {
744747
host,
745748
port,
746749
credentials,
750+
casing,
747751
};
748752
}
749753

drizzle-kit/src/cli/schema.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ export const studio = command({
671671
port,
672672
host,
673673
credentials,
674+
casing,
674675
} = await prepareStudioConfig(opts);
675676

676677
const {
@@ -712,22 +713,22 @@ export const studio = command({
712713
const { schema, relations, files } = schemaPath
713714
? await preparePgSchema(schemaPath)
714715
: { schema: {}, relations: {}, files: [] };
715-
setup = await drizzleForPostgres(credentials, schema, relations, files);
716+
setup = await drizzleForPostgres(credentials, schema, relations, files, casing);
716717
} else if (dialect === 'mysql') {
717718
const { schema, relations, files } = schemaPath
718719
? await prepareMySqlSchema(schemaPath)
719720
: { schema: {}, relations: {}, files: [] };
720-
setup = await drizzleForMySQL(credentials, schema, relations, files);
721+
setup = await drizzleForMySQL(credentials, schema, relations, files, casing);
721722
} else if (dialect === 'sqlite') {
722723
const { schema, relations, files } = schemaPath
723724
? await prepareSQLiteSchema(schemaPath)
724725
: { schema: {}, relations: {}, files: [] };
725-
setup = await drizzleForSQLite(credentials, schema, relations, files);
726+
setup = await drizzleForSQLite(credentials, schema, relations, files, casing);
726727
} else if (dialect === 'turso') {
727728
const { schema, relations, files } = schemaPath
728729
? await prepareSQLiteSchema(schemaPath)
729730
: { schema: {}, relations: {}, files: [] };
730-
setup = await drizzleForLibSQL(credentials, schema, relations, files);
731+
setup = await drizzleForLibSQL(credentials, schema, relations, files, casing);
731732
} else if (dialect === 'singlestore') {
732733
const { schema, relations, files } = schemaPath
733734
? await prepareSingleStoreSchema(schemaPath)
@@ -737,6 +738,7 @@ export const studio = command({
737738
schema,
738739
relations,
739740
files,
741+
casing,
740742
);
741743
} else if (dialect === 'gel') {
742744
console.log(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { coerce, intersection, object, string, TypeOf, union } from 'zod';
22
import { dialect } from '../../schemaValidator';
3+
import { casingType } from './common';
34
import { mysqlCredentials } from './mysql';
45
import { postgresCredentials } from './postgres';
56
import { sqliteCredentials } from './sqlite';
@@ -21,4 +22,5 @@ export const studioCliParams = object({
2122
export const studioConfig = object({
2223
dialect,
2324
schema: union([string(), string().array()]).optional(),
25+
casing: casingType.optional(),
2426
});

0 commit comments

Comments
 (0)