fixes import issue with indexes

ADRlANO · Mar 6, 2024 · 87de270 · 87de270
1 parent 0fbaa43
commit 87de270
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/commands/generate/generators/model/schema/index.ts b/src/commands/generate/generators/model/schema/index.ts
@@ -86,7 +86,7 @@ const generateImportStatement = (
       .join(", ")
       .concat(
         `, ${mappings.tableFunc}`
-      )} } from "drizzle-orm/${dbType}-core";\nimport { createInsertSchema, createSelectSchema } from "drizzle-zod";\nimport { z } from "zod";\n${
+      )}${schema.index ? ", uniqueIndex" : ""} } from "drizzle-orm/${dbType}-core";\nimport { createInsertSchema, createSelectSchema } from "drizzle-zod";\nimport { z } from "zod";\n${
       referenceImports.length > 0 ? referenceImports.join("\n") : ""
     }${
       belongsToUser && provider !== "planetscale" && authSubType !== "managed"
@@ -139,13 +139,14 @@ const generateFieldsForSchema = (fields: DBField[], mappings: TypeMap) => {
 
 const generateIndex = (schema: Schema) => {
   const { tableName, index } = schema;
-  const { tableNameCamelCase } = formatTableName(tableName);
+  const { tableNameCamelCase, tableNameSingularSnake } =
+    formatTableName(tableName);
   return index
     ? `, (${tableNameCamelCase}) => {
   return {
     ${toCamelCase(
       index
-    )}Index: uniqueIndex('${index}_idx').on(${tableNameCamelCase}.${toCamelCase(
+    )}Index: uniqueIndex('${tableNameSingularSnake}_${index}_idx').on(${tableNameCamelCase}.${toCamelCase(
       index
     )}),
   }

diff --git a/src/commands/generate/utils.ts b/src/commands/generate/utils.ts
@@ -80,6 +80,8 @@ export const formatTableName = (tableName: string) => {
   );
   const tableNameKebabCase = snakeToKebab(tableName);
 
+  const tableNameSingularSnake = pluralize.singular(tableName);
+
   return {
     tableNameCamelCase,
     tableNameSingular,
@@ -92,6 +94,7 @@ export const formatTableName = (tableName: string) => {
     tableNameNormalEnglishLowerCase,
     tableNameNormalEnglishSingularLowerCase,
     tableNameKebabCase,
+    tableNameSingularSnake,
   };
 };