@easy-cms/drizzle 0.43.0 → 0.45.0

package/dist/index.d.ts

@@ -38,10 +38,10 @@ interface Dialect {
     readonly singleWriter?: boolean;
     table(name: string, columns: Record<string, ColumnBuilder>, indexes: (t: Record<string, AnyColumn>) => IndexBuilder[]): AnyTable;
     index(name: string): {
-        on(column: AnyColumn): IndexBuilder;
+        on(...columns: AnyColumn[]): IndexBuilder;
     };
     uniqueIndex(name: string): {
-        on(column: AnyColumn): IndexBuilder;
+        on(...columns: AnyColumn[]): IndexBuilder;
     };
     /** Auto-incrementing integer primary key. */
     serial(name: string): ColumnBuilder;

package/dist/index.js

@@ -386,7 +386,15 @@ function buildTable(builder, name, kind, fields, options) {
               defaultLocale: locale === localization?.defaultLocale
             }
           );
-          if (topLevel && kind === "root" && (field.unique || field.type === "slug" && field.uniqueWithin === void 0)) {
+          if (topLevel && kind === "root" && (field.unique || field.type === "slug") && field.uniqueWithin !== void 0) {
+            const within = [field.uniqueWithin].flat().map(snake);
+            indexes.push({
+              column,
+              unique: true,
+              within: within.length === 1 ? within[0] : within
+            });
+            indexes.push({ column, unique: false });
+          } else if (topLevel && kind === "root" && (field.unique || field.type === "slug")) {
             indexes.push({ column, unique: true });
           } else if (field.index || field.unique || field.type === "slug" || field.type === "relationship" || field.type === "upload") {
             indexes.push({ column, unique: false });
@@ -399,8 +407,12 @@ function buildTable(builder, name, kind, fields, options) {
   const table = dialect.table(
     name,
     columns,
-    (t) => indexes.map(({ column, unique }) => {
+    (t) => indexes.map(({ column, unique, within }) => {
       const col3 = t[column];
+      if (within) {
+        const columns2 = [within].flat();
+        return dialect.uniqueIndex(`${name}_${columns2.join("_")}_${column}_unique`).on(...columns2.map((w) => t[w]), col3);
+      }
       return unique ? dialect.uniqueIndex(`${name}_${column}_unique`).on(col3) : dialect.index(`${name}_${column}_idx`).on(col3);
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/drizzle",
-  "version": "0.43.0",
+  "version": "0.45.0",
   "description": "Shared Drizzle ORM layer for Easy CMS database adapters",
   "license": "MIT",
   "type": "module",
@@ -23,10 +23,10 @@
     "drizzle-orm": "0.45.3"
   },
   "peerDependencies": {
-    "@easy-cms/core": "^0.43.0"
+    "@easy-cms/core": "^0.45.0"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.43.0"
+    "@easy-cms/core": "^0.45.0"
   },
   "publishConfig": {
     "access": "public"