Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use uuid datatype for Drizzle/Postgres user_id #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use uuid datatype for Drizzle/Postgres user_id #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/commands/add/auth/lucia/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const DrizzleAdapterDriverMappings: {
};

export const DrizzleLuciaSchema: { [k in DBType]: string } = {
pg: `import { pgTable, bigint, varchar } from "drizzle-orm/pg-core";
pg: `import { pgTable, bigint, varchar, uuid } from "drizzle-orm/pg-core";

export const users = pgTable("auth_user", {
id: varchar("id", {
Expand All @@ -122,9 +122,7 @@ export const sessions = pgTable("user_session", {
id: varchar("id", {
length: 128
}).primaryKey(),
userId: varchar("user_id", {
length: 15
})
userId: uuid("user_id")
.notNull()
.references(() => users.id),
activeExpires: bigint("active_expires", {
Expand All @@ -139,9 +137,7 @@ export const keys = pgTable("user_key", {
id: varchar("id", {
length: 255
}).primaryKey(),
userId: varchar("user_id", {
length: 15
})
userId: uuid("user_id")
.notNull()
.references(() => users.id),
hashedPassword: varchar("hashed_password", {
Expand Down
7 changes: 4 additions & 3 deletions src/commands/add/auth/next-auth/generators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,12 @@ export const createDrizzleAuthSchema = (dbType: DBType) => {
text,
primaryKey,
integer,
uuid,
} from "drizzle-orm/pg-core";
import type { AdapterAccount } from "@auth/core/adapters";

export const users = pgTable("user", {
id: text("id").notNull().primaryKey(),
id: uuid("id").notNull().primaryKey(),
name: text("name"),
email: text("email").notNull(),
emailVerified: timestamp("emailVerified", { mode: "date" }),
Expand All @@ -129,7 +130,7 @@ export const users = pgTable("user", {
export const accounts = pgTable(
"account",
{
userId: text("userId")
userId: uuid("userId")
.notNull()
.references(() => users.id, { onDelete: "cascade" }),
type: text("type").$type<AdapterAccount["type"]>().notNull(),
Expand All @@ -150,7 +151,7 @@ export const accounts = pgTable(

export const sessions = pgTable("session", {
sessionToken: text("sessionToken").notNull().primaryKey(),
userId: text("userId")
userId: uuid("userId")
.notNull()
.references(() => users.id, { onDelete: "cascade" }),
expires: timestamp("expires", { mode: "date" }).notNull(),
Expand Down
3 changes: 2 additions & 1 deletion src/commands/add/misc/stripe/generators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,14 +880,15 @@ export const generateSubscriptionsDrizzleSchema = (
primaryKey,
timestamp,
varchar,
uuid,
} from "drizzle-orm/pg-core";${
auth !== "clerk" ? `\nimport { users } from "./auth";` : ""
}

export const subscriptions = pgTable(
"subscriptions",
{
userId: varchar("user_id", { length: 255 })
userId: uuid("user_id")
.unique()${auth !== "clerk" ? `\n .references(() => users.id)` : ""},
stripeCustomerId: varchar("stripe_customer_id", { length: 255 }).unique(),
stripeSubscriptionId: varchar("stripe_subscription_id", {
Expand Down
30 changes: 15 additions & 15 deletions src/commands/add/orm/drizzle/generators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ import { drizzle } from 'drizzle-orm/neon-http';
import { env } from "@/lib/env.mjs";

neonConfig.fetchConnectionCache = true;

export const sql = neon(env.DATABASE_URL);
export const db = drizzle(sql);
`;
Expand All @@ -90,15 +90,15 @@ export const db = drizzle(sql);
indexTS = `import { sql } from '@vercel/postgres';
import { drizzle } from 'drizzle-orm/vercel-postgres';
import { env } from "@/lib/env.mjs";

export const db = drizzle(sql)
`;
break;
case "supabase":
indexTS = `import { drizzle } from 'drizzle-orm/postgres-js'
import postgres from 'postgres'
import { env } from "@/lib/env.mjs";

const connectionString = env.DATABASE_URL
const client = postgres(connectionString)
export const db = drizzle(client);
Expand All @@ -110,12 +110,12 @@ import { RDSDataClient } from '@aws-sdk/client-rds-data';
import { fromIni } from '@aws-sdk/credential-providers';
import "dotenv/config";


const rdsClient = new RDSDataClient({
credentials: fromIni({ profile: env['PROFILE'] }),
region: 'us-east-1',
});

export const db = drizzle(rdsClient, {
database: env['DATABASE']!,
secretArn: env['SECRET_ARN']!,
Expand All @@ -127,29 +127,29 @@ export const db = drizzle(rdsClient, {
indexTS = `import { drizzle } from "drizzle-orm/planetscale-serverless";
import { connect } from "@planetscale/database";
import { env } from "@/lib/env.mjs";

// create the connection
export const connection = connect({
url: env.DATABASE_URL
});

export const db = drizzle(connection);
`;
break;
case "mysql-2":
indexTS = `import { drizzle } from "drizzle-orm/mysql2";
import mysql from "mysql2/promise";
import { env } from "@/lib/env.mjs";

export const poolConnection = mysql.createPool(env.DATABASE_URL);

export const db = drizzle(poolConnection);
`;
break;
case "better-sqlite3":
indexTS = `import { drizzle, BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
import Database from 'better-sqlite3';

export const sqlite = new Database('sqlite.db');
export const db: BetterSQLite3Database = drizzle(sqlite);
`;
Expand Down Expand Up @@ -216,7 +216,7 @@ import { neon, neonConfig } from '@neondatabase/serverless';
`;
connectionLogic = `
neonConfig.fetchConnectionCache = true;

const sql = neon(env.DATABASE_URL);
const db = drizzle(sql);
`;
Expand Down Expand Up @@ -257,7 +257,7 @@ const rdsClient = new RDSDataClient({
credentials: fromIni({ profile: process.env['PROFILE'] }),
region: 'us-east-1',
});

const db = drizzle(rdsClient, {
database: process.env['DATABASE']!,
secretArn: process.env['SECRET_ARN']!,
Expand All @@ -274,7 +274,7 @@ import { connect } from "@planetscale/database";
`;
connectionLogic = `
const connection = connect({ url: env.DATABASE_URL });

const db = drizzle(connection);
`;
break;
Expand Down Expand Up @@ -345,7 +345,7 @@ export const createInitSchema = (libPath?: string, dbType?: DBType) => {
let initModel = "";
switch (dbDriver) {
case "pg":
initModel = `import { pgTable, serial, text, integer } from "drizzle-orm/pg-core";${
initModel = `import { pgTable, serial, text, integer, uuid } from "drizzle-orm/pg-core";${
packages.includes("next-auth")
? '\nimport { users } from "./auth";'
: ""
Expand All @@ -356,7 +356,7 @@ export const computers = pgTable("computers", {
brand: text("brand").notNull(),
cores: integer("cores").notNull(),${
packages.includes("next-auth")
? '\nuserId: integer("user_id").notNull().references(() => users.id)'
? '\nuserId: uuid("user_id").notNull().references(() => users.id)'
: ""
}
});`;
Expand Down