Schema-accurate field names for relations (resolves #2)

drizzle-team · Jul 2, 2024 · 6760c28 · 6760c28
1 parent a5bb5d6
commit 6760c28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/util/generators/mysql.ts b/src/util/generators/mysql.ts
@@ -232,7 +232,7 @@ export const generateMySqlSchema = (options: GeneratorOptions) => {
 			relationArgs.add(field.relationFromFields?.length ? 'one' : 'many');
 			const relName = s(field.relationName ?? '');
 
-			return `\t'${relName}': ${
+			return `\t${field.name}: ${
 				field.relationFromFields?.length
 					? `one(${field.type}, {\n\t\trelationName: '${relName}',\n\t\tfields: [${
 						field.relationFromFields.map((e) => `${schemaTable.name}.${e}`).join(', ')

diff --git a/src/util/generators/pg.ts b/src/util/generators/pg.ts
@@ -252,7 +252,7 @@ export const generatePgSchema = (options: GeneratorOptions) => {
 			relationArgs.add(field.relationFromFields?.length ? 'one' : 'many');
 			const relName = s(field.relationName ?? '');
 
-			return `\t'${relName}': ${
+			return `\t${field.name}: ${
 				field.relationFromFields?.length
 					? `one(${field.type}, {\n\t\trelationName: '${relName}',\n\t\tfields: [${
 						field.relationFromFields.map((e) => `${schemaTable.name}.${e}`).join(', ')

diff --git a/src/util/generators/sqlite.ts b/src/util/generators/sqlite.ts
@@ -222,7 +222,7 @@ export const generateSQLiteSchema = (options: GeneratorOptions) => {
 			relationArgs.add(field.relationFromFields?.length ? 'one' : 'many');
 			const relName = s(field.relationName ?? '');
 
-			return `\t'${relName}': ${
+			return `\t${field.name}: ${
 				field.relationFromFields?.length
 					? `one(${field.type}, {\n\t\trelationName: '${relName}',\n\t\tfields: [${
 						field.relationFromFields.map((e) => `${schemaTable.name}.${e}`).join(', ')