update and migrate drizzle

t3-oss · Nov 6, 2024 · 318b4bf · 318b4bf
1 parent 867d30a
commit 318b4bf
Show file tree

Hide file tree

Showing 13 changed files with 248 additions and 309 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -76,8 +76,8 @@
     "@trpc/server": "11.0.0-rc.608",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.17.6",
-    "drizzle-kit": "^0.24.2",
-    "drizzle-orm": "^0.33.0",
+    "drizzle-kit": "^0.28.0",
+    "drizzle-orm": "^0.36.1",
     "mysql2": "^3.11.3",
     "next": "^15.0.2",
     "next-auth": "5.0.0-beta.25",

diff --git a/cli/template/extras/config/drizzle-config-mysql.ts b/cli/template/extras/config/drizzle-config-mysql.ts
@@ -8,5 +8,6 @@ export default {
   dbCredentials: {
     url: env.DATABASE_URL,
   },
+  casing: "snake_case",
   tablesFilter: ["project1_*"],
 } satisfies Config;
diff --git a/cli/template/extras/config/drizzle-config-postgres.ts b/cli/template/extras/config/drizzle-config-postgres.ts
@@ -8,5 +8,6 @@ export default {
   dbCredentials: {
     url: env.DATABASE_URL,
   },
+  casing: "snake_case",
   tablesFilter: ["project1_*"],
 } satisfies Config;
diff --git a/cli/template/extras/config/drizzle-config-sqlite.ts b/cli/template/extras/config/drizzle-config-sqlite.ts
@@ -8,5 +8,6 @@ export default {
   dbCredentials: {
     url: env.DATABASE_URL,
   },
+  casing: "snake_case",
   tablesFilter: ["project1_*"],
 } satisfies Config;
diff --git a/cli/template/extras/src/server/db/schema-drizzle/base-mysql.ts b/cli/template/extras/src/server/db/schema-drizzle/base-mysql.ts
@@ -2,13 +2,7 @@
 // https://orm.drizzle.team/docs/sql-schema-declaration
 
 import { sql } from "drizzle-orm";
-import {
-  bigint,
-  index,
-  mysqlTableCreator,
-  timestamp,
-  varchar,
-} from "drizzle-orm/mysql-core";
+import { index, mysqlTableCreator } from "drizzle-orm/mysql-core";
 
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
@@ -20,14 +14,15 @@ export const createTable = mysqlTableCreator((name) => `project1_${name}`);
 
 export const posts = createTable(
   "post",
-  {
-    id: bigint("id", { mode: "number" }).primaryKey().autoincrement(),
-    name: varchar("name", { length: 256 }),
-    createdAt: timestamp("created_at")
+  (t) => ({
+    id: t.bigint({ mode: "number" }).primaryKey().autoincrement(),
+    name: t.varchar({ length: 256 }),
+    createdAt: t
+      .timestamp()
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull(),
-    updatedAt: timestamp("updated_at").onUpdateNow(),
-  },
+    updatedAt: t.timestamp().onUpdateNow(),
+  }),
   (example) => ({
     nameIndex: index("name_idx").on(example.name),
   })

diff --git a/cli/template/extras/src/server/db/schema-drizzle/base-planetscale.ts b/cli/template/extras/src/server/db/schema-drizzle/base-planetscale.ts
@@ -2,13 +2,7 @@
 // https://orm.drizzle.team/docs/sql-schema-declaration
 
 import { sql } from "drizzle-orm";
-import {
-  bigint,
-  index,
-  mysqlTableCreator,
-  timestamp,
-  varchar,
-} from "drizzle-orm/mysql-core";
+import { index, mysqlTableCreator } from "drizzle-orm/mysql-core";
 
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
@@ -20,14 +14,15 @@ export const createTable = mysqlTableCreator((name) => `project1_${name}`);
 
 export const posts = createTable(
   "post",
-  {
-    id: bigint("id", { mode: "number" }).primaryKey().autoincrement(),
-    name: varchar("name", { length: 256 }),
-    createdAt: timestamp("created_at")
+  (t) => ({
+    id: t.bigint({ mode: "number" }).primaryKey().autoincrement(),
+    name: t.varchar({ length: 256 }),
+    createdAt: t
+      .timestamp()
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull(),
-    updatedAt: timestamp("updated_at").onUpdateNow(),
-  },
+    updatedAt: t.timestamp().onUpdateNow(),
+  }),
   (example) => ({
     nameIndex: index("name_idx").on(example.name),
   })

diff --git a/cli/template/extras/src/server/db/schema-drizzle/base-postgres.ts b/cli/template/extras/src/server/db/schema-drizzle/base-postgres.ts
@@ -2,13 +2,7 @@
 // https://orm.drizzle.team/docs/sql-schema-declaration
 
 import { sql } from "drizzle-orm";
-import {
-  index,
-  integer,
-  pgTableCreator,
-  timestamp,
-  varchar,
-} from "drizzle-orm/pg-core";
+import { index, pgTableCreator } from "drizzle-orm/pg-core";
 
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
@@ -20,17 +14,14 @@ export const createTable = pgTableCreator((name) => `project1_${name}`);
 
 export const posts = createTable(
   "post",
-  {
-    id: integer("id").primaryKey().generatedByDefaultAsIdentity(),
-    name: varchar("name", { length: 256 }),
-    createdAt: timestamp("created_at", { withTimezone: true })
+  (t) => ({
+    id: t.integer().primaryKey().generatedByDefaultAsIdentity(),
+    name: t.varchar({ length: 256 }),
+    createdAt: t
+      .timestamp({ withTimezone: true })
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull(),
-    updatedAt: timestamp("updated_at", { withTimezone: true }).$onUpdate(
-      () => new Date()
-    ),
-  },
-  (example) => ({
-    nameIndex: index("name_idx").on(example.name),
-  })
+    updatedAt: t.timestamp({ withTimezone: true }).$onUpdate(() => new Date()),
+  }),
+  (example) => [index("name_idx").on(example.name)]
 );
diff --git a/cli/template/extras/src/server/db/schema-drizzle/base-sqlite.ts b/cli/template/extras/src/server/db/schema-drizzle/base-sqlite.ts
@@ -2,7 +2,7 @@
 // https://orm.drizzle.team/docs/sql-schema-declaration
 
 import { sql } from "drizzle-orm";
-import { index, int, sqliteTableCreator, text } from "drizzle-orm/sqlite-core";
+import { index, sqliteTableCreator } from "drizzle-orm/sqlite-core";
 
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
@@ -14,16 +14,15 @@ export const createTable = sqliteTableCreator((name) => `project1_${name}`);
 
 export const posts = createTable(
   "post",
-  {
-    id: int("id", { mode: "number" }).primaryKey({ autoIncrement: true }),
-    name: text("name", { length: 256 }),
-    createdAt: int("created_at", { mode: "timestamp" })
+  (t) => ({
+    id: t.integer({ mode: "number" }).primaryKey({ autoIncrement: true }),
+    name: t.text({ length: 256 }),
+    createdAt: t
+      .integer({ mode: "timestamp" })
       .default(sql`(unixepoch())`)
       .notNull(),
-    updatedAt: int("updated_at", { mode: "timestamp" }).$onUpdate(
-      () => new Date()
-    ),
-  },
+    updatedAt: t.integer({ mode: "timestamp" }).$onUpdate(() => new Date()),
+  }),
   (example) => ({
     nameIndex: index("name_idx").on(example.name),
   })

diff --git a/cli/template/extras/src/server/db/schema-drizzle/with-auth-mysql.ts b/cli/template/extras/src/server/db/schema-drizzle/with-auth-mysql.ts
@@ -1,14 +1,5 @@
 import { relations, sql } from "drizzle-orm";
-import {
-  bigint,
-  index,
-  int,
-  mysqlTableCreator,
-  primaryKey,
-  text,
-  timestamp,
-  varchar,
-} from "drizzle-orm/mysql-core";
+import { index, mysqlTableCreator, primaryKey } from "drizzle-orm/mysql-core";
 import { type AdapterAccount } from "next-auth/adapters";
 
 /**
@@ -21,36 +12,41 @@ export const createTable = mysqlTableCreator((name) => `project1_${name}`);
 
 export const posts = createTable(
   "post",
-  {
-    id: bigint("id", { mode: "number" }).primaryKey().autoincrement(),
-    name: varchar("name", { length: 256 }),
-    createdById: varchar("created_by", { length: 255 })
+  (t) => ({
+    id: t.bigint({ mode: "number" }).primaryKey().autoincrement(),
+    name: t.varchar({ length: 256 }),
+    createdById: t
+      .varchar("created_by", { length: 255 })
       .notNull()
       .references(() => users.id),
-    createdAt: timestamp("created_at")
+    createdAt: t
+      .timestamp()
       .default(sql`CURRENT_TIMESTAMP`)
       .notNull(),
-    updatedAt: timestamp("updated_at").onUpdateNow(),
-  },
+    updatedAt: t.timestamp().onUpdateNow(),
+  }),
   (example) => ({
     createdByIdIdx: index("created_by_idx").on(example.createdById),
     nameIndex: index("name_idx").on(example.name),
   })
 );
 
-export const users = createTable("user", {
-  id: varchar("id", { length: 255 })
+export const users = createTable("user", (t) => ({
+  id: t
+    .varchar({ length: 255 })
     .notNull()
     .primaryKey()
     .$defaultFn(() => crypto.randomUUID()),
-  name: varchar("name", { length: 255 }),
-  email: varchar("email", { length: 255 }).notNull(),
-  emailVerified: timestamp("email_verified", {
-    mode: "date",
-    fsp: 3,
-  }).default(sql`CURRENT_TIMESTAMP(3)`),
-  image: varchar("image", { length: 255 }),
-});
+  name: t.varchar({ length: 255 }),
+  email: t.varchar({ length: 255 }).notNull(),
+  emailVerified: t
+    .timestamp({
+      mode: "date",
+      fsp: 3,
+    })
+    .default(sql`CURRENT_TIMESTAMP(3)`),
+  image: t.varchar({ length: 255 }),
+}));
 
 export const usersRelations = relations(users, ({ many }) => ({
   accounts: many(accounts),
@@ -59,25 +55,22 @@ export const usersRelations = relations(users, ({ many }) => ({
 
 export const accounts = createTable(
   "account",
-  {
-    userId: varchar("user_id", { length: 255 })
+  (t) => ({
+    userId: t
+      .varchar({ length: 255 })
       .notNull()
       .references(() => users.id),
-    type: varchar("type", { length: 255 })
-      .$type<AdapterAccount["type"]>()
-      .notNull(),
-    provider: varchar("provider", { length: 255 }).notNull(),
-    providerAccountId: varchar("provider_account_id", {
-      length: 255,
-    }).notNull(),
-    refresh_token: text("refresh_token"),
-    access_token: text("access_token"),
-    expires_at: int("expires_at"),
-    token_type: varchar("token_type", { length: 255 }),
-    scope: varchar("scope", { length: 255 }),
-    id_token: text("id_token"),
-    session_state: varchar("session_state", { length: 255 }),
-  },
+    type: t.varchar({ length: 255 }).$type<AdapterAccount["type"]>().notNull(),
+    provider: t.varchar({ length: 255 }).notNull(),
+    providerAccountId: t.varchar({ length: 255 }).notNull(),
+    refresh_token: t.text(),
+    access_token: t.text(),
+    expires_at: t.int(),
+    token_type: t.varchar({ length: 255 }),
+    scope: t.varchar({ length: 255 }),
+    id_token: t.text(),
+    session_state: t.varchar({ length: 255 }),
+  }),
   (account) => ({
     compoundKey: primaryKey({
       columns: [account.provider, account.providerAccountId],
@@ -92,15 +85,14 @@ export const accountsRelations = relations(accounts, ({ one }) => ({
 
 export const sessions = createTable(
   "session",
-  {
-    sessionToken: varchar("session_token", { length: 255 })
-      .notNull()
-      .primaryKey(),
-    userId: varchar("user_id", { length: 255 })
+  (t) => ({
+    sessionToken: t.varchar({ length: 255 }).notNull().primaryKey(),
+    userId: t
+      .varchar({ length: 255 })
       .notNull()
       .references(() => users.id),
-    expires: timestamp("expires", { mode: "date" }).notNull(),
-  },
+    expires: t.timestamp({ mode: "date" }).notNull(),
+  }),
   (session) => ({
     userIdIdx: index("session_user_id_idx").on(session.userId),
   })
@@ -112,11 +104,11 @@ export const sessionsRelations = relations(sessions, ({ one }) => ({
 
 export const verificationTokens = createTable(
   "verification_token",
-  {
-    identifier: varchar("identifier", { length: 255 }).notNull(),
-    token: varchar("token", { length: 255 }).notNull(),
-    expires: timestamp("expires", { mode: "date" }).notNull(),
-  },
+  (t) => ({
+    identifier: t.varchar({ length: 255 }).notNull(),
+    token: t.varchar({ length: 255 }).notNull(),
+    expires: t.timestamp({ mode: "date" }).notNull(),
+  }),
   (vt) => ({
     compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }),
   })