Converting to new drizzle version (queries)

app/lib/db.service.server.ts

@@ -1,6 +1,6 @@
-import { and, eq, gt } from "drizzle-orm";
 import type { DrizzleD1Database } from "drizzle-orm/d1";
 import { drizzle } from "drizzle-orm/d1";
+import * as schema from "./schema";
 
 const contextWithDb = (
   context: Record<string, unknown>
@@ -15,5 +15,7 @@ export const getDbFromContext = (
     throw new Error("No database in context");
   }
 
-  return drizzle(context.DB);
+  return drizzle(context.DB, {
+    schema,
+  });
 };

app/lib/schema.ts

@@ -1,6 +1,7 @@
-import type { InferModel } from "drizzle-orm";
+import { type InferModel, relations } from "drizzle-orm";
 import {
   integer,
+  primaryKey,
   sqliteTable,
   text,
   uniqueIndex,
@@ -22,8 +23,9 @@ export const users = sqliteTable(
   })
 );
 
-export type User = InferModel<typeof users>;
-export type NewUser = InferModel<typeof users, "insert">;
+export const usersRelations = relations(users, ({ many }) => ({
+  usersToGroups: many(usersToTeams),
+}));
 
 export const teams = sqliteTable("teams", {
   id: integer("id").primaryKey({
@@ -33,11 +35,32 @@ export const teams = sqliteTable("teams", {
   avatar: text("avatar"),
 });
 
-export const usersToTeams = sqliteTable("usersToTeams", {
-  userId: integer("userId")
-    .notNull()
-    .references(() => users.id),
-  teamId: integer("teamId")
-    .notNull()
-    .references(() => teams.id),
-});
+export const teamsRelations = relations(teams, ({ many }) => ({
+  usersToTeams: many(usersToTeams),
+}));
+
+export const usersToTeams = sqliteTable(
+  "usersToTeams",
+  {
+    userId: integer("userId")
+      .notNull()
+      .references(() => users.id),
+    teamId: integer("teamId")
+      .notNull()
+      .references(() => teams.id),
+  },
+  (t) => ({
+    pk: primaryKey(t.userId, t.teamId),
+  })
+);
+
+export const usersToTeamsRelations = relations(usersToTeams, ({ one }) => ({
+  team: one(teams, {
+    fields: [usersToTeams.teamId],
+    references: [teams.id],
+  }),
+  user: one(users, {
+    fields: [usersToTeams.userId],
+    references: [users.id],
+  }),
+}));

app/routes/app.tsx

@@ -38,6 +38,9 @@ export async function loader({ request, context }: LoaderArgs) {
   if (!user) {
     return redirect("/login");
   }
+
+  //const teams = await db.query 
+
   const userTeams = await db
     .select({
       id: teams.id,

app/routes/register.tsx

@@ -1,21 +1,19 @@
-import { Github, Loader2 } from "lucide-react";
+import { Loader2 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import {
   ActionArgs,
-  LoaderArgs,
   redirect,
 } from "@remix-run/cloudflare";
-import { getDbFromContext, getUsers } from "@/lib/db.service.server";
-import { Input } from "@/components/ui/input";
+import { getDbFromContext } from "@/lib/db.service.server";
 import { Label } from "@/components/ui/label";
-import { Form, Link, useActionData, useNavigation } from "@remix-run/react";
+import { Link, useActionData, useNavigation } from "@remix-run/react";
 import { withZod } from "@remix-validated-form/with-zod";
 import { z } from "zod";
 import { ValidatedForm, validationError } from "remix-validated-form";
 import { InputForm } from "@/components/ui/inputForm";
-import { NewUser, User, users } from "@/lib/schema";
 import { hash } from "@/lib/passwordHashing.server";
 import { generateRandomLinearGradient } from "@/lib/utils";
+import { users } from "@/lib/schema";
 
 export const validator = withZod(
   z
@@ -43,7 +41,7 @@ export async function action({ request, context }: ActionArgs) {
   const hashedPassword = await hash({
     password: result.data.password,
   });
-  const newUser: NewUser = {
+  const newUser = {
     email: result.data.email,
     password: hashedPassword,
     avatar: generateRandomLinearGradient(),