src/app/_components/AllRegions.tsx

@@ -2,7 +2,6 @@ import { db } from "~/server/db";
 
 export default async function AllRegions() {
   const allRegions = await db.query.regions.findMany();
-  const allCountries = await db.query.countries.findMany();
   return (
     <div className="pt-4">
       <h1 className="text-2xl">All Regions:</h1>
@@ -10,14 +9,7 @@ export default async function AllRegions() {
         <>
           <ul>
             {allRegions.map((region) => (
-              <li key={region.id}>
+              <li key={region.id}>{region.name}</li>
-                {region.name} -{" "}
-                {
-                  allCountries.find(
-                    (country) => country.id === region.countryId,
-                  )?.name
-                }
-              </li>
             ))}
           </ul>
         </>

src/app/_components/admin/CreateRegionForm.tsx

@@ -11,6 +11,7 @@ import {
   SelectValue,
 } from "~/components/ui/select";
 import { useFormState } from "react-dom";
+import { init } from "next/dist/compiled/webpack/webpack";
 
 interface Country {
   id: string;

src/server/actions/addRegion.ts

@@ -25,7 +25,7 @@ export const addRegion = async (prevstate: any, formData: FormData) => {
   const confirmedRegion = await db
     .insert(regions)
     .values(newRegion.data)
-    .onConflictDoNothing()
+    .onConflictDoNothing({ target: regions.name })
     .returning({ name: regions.name });
   if (!confirmedRegion[0]?.name) {
     return {

src/server/db/schema.ts

@@ -7,7 +7,6 @@ import {
   text,
   timestamp,
   uuid,
-  unique,
 } from "drizzle-orm/pg-core";
 import { relations } from "drizzle-orm";
 
@@ -96,17 +95,11 @@ export const subRegionsRelations = relations(subRegions, ({ many, one }) => ({
   }),
 }));
 
-export const regions = createTable(
+export const regions = createTable("region", {
-  "region",
+  id: uuid("id").primaryKey().notNull().defaultRandom(),
-  {
+  name: text("name").notNull().unique(),
-    id: uuid("id").primaryKey().notNull().defaultRandom(),
+  countryId: uuid("countryId").notNull(),
-    name: text("name").notNull(),
+});
-    countryId: uuid("countryId").notNull(),
-  },
-  (t) => ({
-    uniqueRegion: unique().on(t.name, t.countryId),
-  }),
-);
 
 export const regionsRelations = relations(regions, ({ many, one }) => ({
   wines: many(wines),