@coursebuilder/adapter-drizzle 0.0.4 → 0.0.6

package/dist/lib/sqlite.js

@@ -1,8 +1,8 @@
 import {
   SQLiteDrizzleAdapter,
   createTables
-} from "../chunk-RMRO5TA7.js";
-import "../chunk-LLWSIKQV.js";
+} from "../chunk-22KIKVBY.js";
+import "../chunk-GFUUJRX7.js";
 import "../chunk-VNI36MMC.js";
 export {
   SQLiteDrizzleAdapter,

package/dist/lib/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/utils.ts"],"sourcesContent":["import { type MySqlDatabase } from 'drizzle-orm/mysql-core'\nimport type { AnyMySqlTable, MySqlTableFn } from 'drizzle-orm/mysql-core'\nimport { type PgDatabase } from 'drizzle-orm/pg-core'\nimport type { AnyPgTable, PgTableFn } from 'drizzle-orm/pg-core'\nimport { type BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core'\nimport type { AnySQLiteTable, SQLiteTableFn } from 'drizzle-orm/sqlite-core'\n\nimport type { DefaultSchema as MySqlSchema } from './mysql'\nimport type { DefaultSchema as PgSchema } from './pg.js'\nimport type { DefaultSchema as SQLiteSchema } from './sqlite.js'\n\nexport type AnyMySqlDatabase = MySqlDatabase<any, any>\nexport type AnyPgDatabase = PgDatabase<any, any, any>\nexport type AnySQLiteDatabase = BaseSQLiteDatabase<any, any, any, any>\n\nexport interface MinimumSchema {\n\tmysql: MySqlSchema & Record<string, AnyMySqlTable>\n\tpg: PgSchema & Record<string, AnyPgTable>\n\tsqlite: SQLiteSchema & Record<string, AnySQLiteTable>\n}\n\nexport type SqlFlavorOptions =\n\t| AnyMySqlDatabase\n\t| AnyPgDatabase\n\t| AnySQLiteDatabase\n\nexport type ClientFlavors<Flavor> = Flavor extends AnyMySqlDatabase\n\t? MinimumSchema['mysql']\n\t: Flavor extends AnyPgDatabase\n\t\t? MinimumSchema['pg']\n\t\t: Flavor extends AnySQLiteDatabase\n\t\t\t? MinimumSchema['sqlite']\n\t\t\t: never\n\nexport type TableFn<Flavor> = Flavor extends AnyMySqlDatabase\n\t? MySqlTableFn\n\t: Flavor extends AnyPgDatabase\n\t\t? PgTableFn\n\t\t: Flavor extends AnySQLiteDatabase\n\t\t\t? SQLiteTableFn\n\t\t\t: AnySQLiteTable\n\ntype NonNullableProps<T> = {\n\t[P in keyof T]: null extends T[P] ? never : P\n}[keyof T]\n\nexport function stripUndefined<T>(obj: T): Pick<T, NonNullableProps<T>> {\n\tconst result = {} as T\n\tfor (const key in obj) if (obj[key] !== undefined) result[key] = obj[key]\n\treturn result\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA8CA;;;;;AAAO,SAASA,eAAkBC,KAAM;AACvC,QAAMC,SAAS,CAAC;AAChB,aAAWC,OAAOF;AAAK,QAAIA,IAAIE,GAAAA,MAASC;AAAWF,aAAOC,GAAAA,IAAOF,IAAIE,GAAAA;AACrE,SAAOD;AACR;AAJgBF;","names":["stripUndefined","obj","result","key","undefined"]}
+{"version":3,"sources":["../../src/lib/utils.ts"],"sourcesContent":["import { type MySqlDatabase } from 'drizzle-orm/mysql-core'\nimport type { AnyMySqlTable, MySqlTableFn } from 'drizzle-orm/mysql-core'\nimport { type PgDatabase } from 'drizzle-orm/pg-core'\nimport type { AnyPgTable, PgTableFn } from 'drizzle-orm/pg-core'\nimport { type BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core'\nimport type { AnySQLiteTable, SQLiteTableFn } from 'drizzle-orm/sqlite-core'\n\nimport type { DefaultSchema as MySqlSchema } from './mysql/index.js'\nimport type { DefaultSchema as PgSchema } from './pg.js'\nimport type { DefaultSchema as SQLiteSchema } from './sqlite.js'\n\nexport type AnyMySqlDatabase = MySqlDatabase<any, any>\nexport type AnyPgDatabase = PgDatabase<any, any, any>\nexport type AnySQLiteDatabase = BaseSQLiteDatabase<any, any, any, any>\n\nexport interface MinimumSchema {\n\tmysql: MySqlSchema & Record<string, AnyMySqlTable>\n\tpg: PgSchema & Record<string, AnyPgTable>\n\tsqlite: SQLiteSchema & Record<string, AnySQLiteTable>\n}\n\nexport type SqlFlavorOptions =\n\t| AnyMySqlDatabase\n\t| AnyPgDatabase\n\t| AnySQLiteDatabase\n\nexport type ClientFlavors<Flavor> = Flavor extends AnyMySqlDatabase\n\t? MinimumSchema['mysql']\n\t: Flavor extends AnyPgDatabase\n\t\t? MinimumSchema['pg']\n\t\t: Flavor extends AnySQLiteDatabase\n\t\t\t? MinimumSchema['sqlite']\n\t\t\t: never\n\nexport type TableFn<Flavor> = Flavor extends AnyMySqlDatabase\n\t? MySqlTableFn\n\t: Flavor extends AnyPgDatabase\n\t\t? PgTableFn\n\t\t: Flavor extends AnySQLiteDatabase\n\t\t\t? SQLiteTableFn\n\t\t\t: AnySQLiteTable\n\ntype NonNullableProps<T> = {\n\t[P in keyof T]: null extends T[P] ? never : P\n}[keyof T]\n\nexport function stripUndefined<T>(obj: T): Pick<T, NonNullableProps<T>> {\n\tconst result = {} as T\n\tfor (const key in obj) if (obj[key] !== undefined) result[key] = obj[key]\n\treturn result\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA8CA;;;;;AAAO,SAASA,eAAkBC,KAAM;AACvC,QAAMC,SAAS,CAAC;AAChB,aAAWC,OAAOF;AAAK,QAAIA,IAAIE,GAAAA,MAASC;AAAWF,aAAOC,GAAAA,IAAOF,IAAIE,GAAAA;AACrE,SAAOD;AACR;AAJgBF;","names":["stripUndefined","obj","result","key","undefined"]}

package/dist/lib/utils.d.ts

@@ -4,38 +4,8 @@ import { BaseSQLiteDatabase, AnySQLiteTable, SQLiteTableFn } from 'drizzle-orm/s
 import { DefaultSchema } from './mysql/index.js';
 import { DefaultSchema as DefaultSchema$1 } from './pg.js';
 import { DefaultSchema as DefaultSchema$2 } from './sqlite.js';
+import 'drizzle-orm';
 import '@coursebuilder/core/adapters';
-import './mysql/schemas/auth/accounts.js';
-import './mysql/schemas/auth/permissions.js';
-import './mysql/schemas/auth/role-permissions.js';
-import './mysql/schemas/auth/roles.js';
-import './mysql/schemas/auth/sessions.js';
-import './mysql/schemas/auth/user-permissions.js';
-import './mysql/schemas/auth/user-roles.js';
-import './mysql/schemas/auth/users.js';
-import './mysql/schemas/auth/verification-tokens.js';
-import './mysql/schemas/commerce/coupon.js';
-import './mysql/schemas/commerce/merchant-account.js';
-import './mysql/schemas/commerce/merchant-charge.js';
-import './mysql/schemas/commerce/merchant-coupon.js';
-import './mysql/schemas/commerce/merchant-customer.js';
-import './mysql/schemas/commerce/merchant-price.js';
-import './mysql/schemas/commerce/merchant-product.js';
-import './mysql/schemas/commerce/merchant-session.js';
-import './mysql/schemas/commerce/price.js';
-import './mysql/schemas/commerce/product.js';
-import './mysql/schemas/commerce/purchase.js';
-import './mysql/schemas/commerce/purchase-user-transfer.js';
-import './mysql/schemas/communication/communication-channel.js';
-import './mysql/schemas/communication/communication-preference-types.js';
-import './mysql/schemas/communication/communication-preferences.js';
-import './mysql/schemas/content/content-contributions.js';
-import './mysql/schemas/content/content-resource.js';
-import './mysql/schemas/content/content-resource-resource.js';
-import './mysql/schemas/content/contribution-types.js';
-import './mysql/schemas/content/resource-progress.js';
-import 'drizzle-orm/sqlite-core/table.js';
-import 'drizzle-orm/sqlite-core/index.js';
 
 type AnyMySqlDatabase = MySqlDatabase<any, any>;
 type AnyPgDatabase = PgDatabase<any, any, any>;

package/dist/lib/utils.js

@@ -1,6 +1,6 @@
 import {
   stripUndefined
-} from "../chunk-LLWSIKQV.js";
+} from "../chunk-GFUUJRX7.js";
 import "../chunk-VNI36MMC.js";
 export {
   stripUndefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coursebuilder/adapter-drizzle",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Drizzle adapter for Course Builder.",
   "keywords": [
     "coursebuilder",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@auth/core": "^0.28.0",
-    "@coursebuilder/core": "0.0.7",
+    "@coursebuilder/core": "0.0.8",
     "@libsql/client": "0.5.6",
     "@types/better-sqlite3": "7.6.9",
     "@types/uuid": "9.0.8",
@@ -48,14 +48,18 @@
     "drizzle-orm": "0.30.2",
     "mysql2": "^3.6.1",
     "postgres": "^3.3.4",
-    "tsup": "6.7.0"
+    "tsup": "6.7.0",
+    "tsx": "^4.7.1"
   },
   "peerDependencies": {
     "drizzle-orm": "0.30.x"
   },
   "scripts": {
-    "clean": "rm -rf ./dist",
+    "clean": "find . -type d -name \".drizzle\" | xargs rm -rf",
     "build": "tsup",
-    "dev": "tsup --watch"
+    "dev": "tsup --watch",
+    "test": "pnpm test:mysql",
+    "test:mysql": "pnpm clean && ./test/mysql/test.sh",
+    "test:mysql:watch": "pnpm clean && ./test/mysql/test.sh watch"
   }
 }

package/src/index.ts

@@ -8,7 +8,7 @@ import { type CourseBuilderAdapter } from '@coursebuilder/core/adapters'
 import {
 	createTables as createMySqlTables,
 	mySqlDrizzleAdapter,
-} from './lib/mysql'
+} from './lib/mysql/index.js'
 import { pgDrizzleAdapter } from './lib/pg.js'
 import { SQLiteDrizzleAdapter } from './lib/sqlite.js'
 import { type SqlFlavorOptions, type TableFn } from './lib/utils.js'

package/src/lib/mysql/index.ts

@@ -10,92 +10,128 @@ import {
 import { type CourseBuilderAdapter } from '@coursebuilder/core/adapters'
 import { VideoResourceSchema } from '@coursebuilder/core/schemas/video-resource'
 
-import { getAccountsSchema } from './schemas/auth/accounts'
-import { getPermissionsSchema } from './schemas/auth/permissions'
-import { getRolePermissionsSchema } from './schemas/auth/role-permissions'
-import { getRolesSchema } from './schemas/auth/roles'
-import { getSessionsSchema } from './schemas/auth/sessions'
-import { getUserPermissionsSchema } from './schemas/auth/user-permissions'
-import { getUserRolesSchema } from './schemas/auth/user-roles'
-import { getUsersSchema } from './schemas/auth/users'
-import { getVerificationTokensSchema } from './schemas/auth/verification-tokens'
-import { getCouponSchema } from './schemas/commerce/coupon'
-import { getMerchantAccountSchema } from './schemas/commerce/merchant-account'
-import { getMerchantChargeSchema } from './schemas/commerce/merchant-charge'
-import { getMerchantCouponSchema } from './schemas/commerce/merchant-coupon'
-import { getMerchantCustomerSchema } from './schemas/commerce/merchant-customer'
-import { getMerchantPriceSchema } from './schemas/commerce/merchant-price'
-import { getMerchantProductSchema } from './schemas/commerce/merchant-product'
-import { getMerchantSessionSchema } from './schemas/commerce/merchant-session'
-import { getPriceSchema } from './schemas/commerce/price'
-import { getProductSchema } from './schemas/commerce/product'
-import { getPurchaseSchema } from './schemas/commerce/purchase'
-import { getPurchaseUserTransferSchema } from './schemas/commerce/purchase-user-transfer'
-import { getCommunicationChannelSchema } from './schemas/communication/communication-channel'
-import { getCommunicationPreferenceTypesSchema } from './schemas/communication/communication-preference-types'
-import { getCommunicationPreferencesSchema } from './schemas/communication/communication-preferences'
-import { getContentContributionsSchema } from './schemas/content/content-contributions'
-import { getContentResourceSchema } from './schemas/content/content-resource'
-import { getContentResourceResourceSchema } from './schemas/content/content-resource-resource'
-import { getContributionTypesSchema } from './schemas/content/contribution-types'
-import { getResourceProgressSchema } from './schemas/content/resource-progress'
-
-export {
+import {
+	getAccountsRelationsSchema,
 	getAccountsSchema,
-	getSessionsSchema,
-	getUsersSchema,
-	getVerificationTokensSchema,
-	getCouponSchema,
-	getMerchantAccountSchema,
-	getMerchantChargeSchema,
-	getMerchantCouponSchema,
-	getMerchantCustomerSchema,
-	getMerchantPriceSchema,
-	getMerchantProductSchema,
-	getMerchantSessionSchema,
-	getPriceSchema,
-	getProductSchema,
-	getPurchaseSchema,
-	getPurchaseUserTransferSchema,
-	getContentResourceSchema,
-	getContentResourceResourceSchema,
+} from './schemas/auth/accounts.js'
+import {
+	getPermissionsRelationsSchema,
 	getPermissionsSchema,
+} from './schemas/auth/permissions.js'
+import {
+	getRolePermissionsRelationsSchema,
 	getRolePermissionsSchema,
+} from './schemas/auth/role-permissions.js'
+import {
+	getRolesRelationsSchema,
 	getRolesSchema,
+} from './schemas/auth/roles.js'
+import {
+	getSessionRelationsSchema,
+	getSessionsSchema,
+} from './schemas/auth/sessions.js'
+import {
+	getUserPermissionsRelationsSchema,
 	getUserPermissionsSchema,
+} from './schemas/auth/user-permissions.js'
+import {
+	getUserRolesRelationsSchema,
 	getUserRolesSchema,
-	getCommunicationChannelSchema,
-	getCommunicationPreferenceTypesSchema,
+} from './schemas/auth/user-roles.js'
+import {
+	getUsersRelationsSchema,
+	getUsersSchema,
+} from './schemas/auth/users.js'
+import { getVerificationTokensSchema } from './schemas/auth/verification-tokens.js'
+import { getCouponSchema } from './schemas/commerce/coupon.js'
+import { getMerchantAccountSchema } from './schemas/commerce/merchant-account.js'
+import { getMerchantChargeSchema } from './schemas/commerce/merchant-charge.js'
+import { getMerchantCouponSchema } from './schemas/commerce/merchant-coupon.js'
+import { getMerchantCustomerSchema } from './schemas/commerce/merchant-customer.js'
+import { getMerchantPriceSchema } from './schemas/commerce/merchant-price.js'
+import { getMerchantProductSchema } from './schemas/commerce/merchant-product.js'
+import { getMerchantSessionSchema } from './schemas/commerce/merchant-session.js'
+import { getPriceSchema } from './schemas/commerce/price.js'
+import { getProductSchema } from './schemas/commerce/product.js'
+import { getPurchaseUserTransferSchema } from './schemas/commerce/purchase-user-transfer.js'
+import { getPurchaseSchema } from './schemas/commerce/purchase.js'
+import { getCommunicationChannelSchema } from './schemas/communication/communication-channel.js'
+import { getCommunicationPreferenceTypesSchema } from './schemas/communication/communication-preference-types.js'
+import {
+	getCommunicationPreferencesRelationsSchema,
 	getCommunicationPreferencesSchema,
+} from './schemas/communication/communication-preferences.js'
+import {
+	getContentContributionRelationsSchema,
 	getContentContributionsSchema,
+} from './schemas/content/content-contributions.js'
+import {
+	getContentResourceResourceRelationsSchema,
+	getContentResourceResourceSchema,
+} from './schemas/content/content-resource-resource.js'
+import {
+	getContentResourceRelationsSchema,
+	getContentResourceSchema,
+} from './schemas/content/content-resource.js'
+import {
+	getContributionTypesRelationsSchema,
 	getContributionTypesSchema,
-	getResourceProgressSchema,
+} from './schemas/content/contribution-types.js'
+import { getResourceProgressSchema } from './schemas/content/resource-progress.js'
+
+export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
+	return {
+		accounts: getAccountsSchema(mysqlTable),
+		accountsRelations: getAccountsRelationsSchema(mysqlTable),
+		permissions: getPermissionsSchema(mysqlTable),
+		permissionsRelations: getPermissionsRelationsSchema(mysqlTable),
+		rolePermissions: getRolePermissionsSchema(mysqlTable),
+		rolePermissionsRelations: getRolePermissionsRelationsSchema(mysqlTable),
+		roles: getRolesSchema(mysqlTable),
+		rolesRelations: getRolesRelationsSchema(mysqlTable),
+		sessions: getSessionsSchema(mysqlTable),
+		sessionsRelations: getSessionRelationsSchema(mysqlTable),
+		userPermissions: getUserPermissionsSchema(mysqlTable),
+		userPermissionsRelations: getUserPermissionsRelationsSchema(mysqlTable),
+		userRoles: getUserRolesSchema(mysqlTable),
+		userRolesRelations: getUserRolesRelationsSchema(mysqlTable),
+		users: getUsersSchema(mysqlTable),
+		usersRelations: getUsersRelationsSchema(mysqlTable),
+		verificationTokens: getVerificationTokensSchema(mysqlTable),
+		coupon: getCouponSchema(mysqlTable),
+		merchantAccount: getMerchantAccountSchema(mysqlTable),
+		merchantCharge: getMerchantChargeSchema(mysqlTable),
+		merchantCoupon: getMerchantCouponSchema(mysqlTable),
+		merchantCustomer: getMerchantCustomerSchema(mysqlTable),
+		merchantPrice: getMerchantPriceSchema(mysqlTable),
+		merchantProduct: getMerchantProductSchema(mysqlTable),
+		merchantSession: getMerchantSessionSchema(mysqlTable),
+		price: getPriceSchema(mysqlTable),
+		product: getProductSchema(mysqlTable),
+		purchase: getPurchaseSchema(mysqlTable),
+		purchaseUserTransfer: getPurchaseUserTransferSchema(mysqlTable),
+		communicationChannel: getCommunicationChannelSchema(mysqlTable),
+		communicationPreferenceTypes:
+			getCommunicationPreferenceTypesSchema(mysqlTable),
+		communicationPreferences: getCommunicationPreferencesSchema(mysqlTable),
+		communicationPreferencesRelations:
+			getCommunicationPreferencesRelationsSchema(mysqlTable),
+		contentContributions: getContentContributionsSchema(mysqlTable),
+		contentContributionRelations:
+			getContentContributionRelationsSchema(mysqlTable),
+		contentResource: getContentResourceSchema(mysqlTable),
+		contentResourceRelations: getContentResourceRelationsSchema(mysqlTable),
+		contentResourceResource: getContentResourceResourceSchema(mysqlTable),
+		contentResourceResourceRelations:
+			getContentResourceResourceRelationsSchema(mysqlTable),
+		contributionTypes: getContributionTypesSchema(mysqlTable),
+		contributionTypesRelations: getContributionTypesRelationsSchema(mysqlTable),
+		resourceProgress: getResourceProgressSchema(mysqlTable),
+	} as const
 }
 
 export function createTables(mySqlTable: MySqlTableFn) {
-	return {
-		users: getUsersSchema(mySqlTable).users,
-		accounts: getAccountsSchema(mySqlTable).accounts,
-		sessions: getSessionsSchema(mySqlTable).sessions,
-		verificationTokens:
-			getVerificationTokensSchema(mySqlTable).verificationTokens,
-		contentResource: getContentResourceSchema(mySqlTable).contentResource,
-		contentResourceResource:
-			getContentResourceResourceSchema(mySqlTable).contentResourceResource,
-		purchase: getPurchaseSchema(mySqlTable).purchase,
-		price: getPriceSchema(mySqlTable).price,
-		product: getProductSchema(mySqlTable).product,
-		purchaseUserTransfer:
-			getPurchaseUserTransferSchema(mySqlTable).purchaseUserTransfer,
-		merchantSession: getMerchantSessionSchema(mySqlTable).merchantSession,
-		merchantProduct: getMerchantProductSchema(mySqlTable).merchantProduct,
-		merchantPrice: getMerchantPriceSchema(mySqlTable).merchantPrice,
-		merchantCustomer: getMerchantCustomerSchema(mySqlTable).merchantCustomer,
-		merchantCoupon: getMerchantCouponSchema(mySqlTable).merchantCoupon,
-		merchantCharge: getMerchantChargeSchema(mySqlTable).merchantCharge,
-		merchantAccount: getMerchantAccountSchema(mySqlTable).merchantAccount,
-		coupon: getCouponSchema(mySqlTable).coupon,
-	}
+	return getCourseBuilderSchema(mySqlTable)
 }
 
 export type DefaultSchema = ReturnType<typeof createTables>
@@ -155,9 +191,9 @@ export function mySqlDrizzleAdapter(
 
 			const query = sql`
     SELECT
-      id as _id,
-      CAST(updatedAt AS DATETIME) as _updatedAt,
-      CAST(createdAt AS DATETIME) as _createdAt,
+      id as id,
+      CAST(updatedAt AS DATETIME) as updatedAt,
+      CAST(createdAt AS DATETIME) as createdAt,
       JSON_EXTRACT (${contentResource.fields}, "$.state") AS state,
       JSON_EXTRACT (${contentResource.fields}, "$.duration") AS duration,
       JSON_EXTRACT (${contentResource.fields}, "$.muxPlaybackId") AS muxPlaybackId,
@@ -375,6 +411,8 @@ export function mySqlDrizzleAdapter(
 				.then((res) => res[0] ?? null)
 
 			await client.delete(users).where(eq(users.id, id))
+			await client.delete(sessions).where(eq(sessions.userId, id))
+			await client.delete(accounts).where(eq(accounts.userId, id))
 
 			return user
 		},

package/src/lib/mysql/schemas/auth/accounts.ts

@@ -1,4 +1,5 @@
 import { AdapterAccount } from '@auth/core/adapters'
+import { relations } from 'drizzle-orm'
 import {
 	index,
 	int,
@@ -8,8 +9,10 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getAccountsSchema = (mysqlTable: MySqlTableFn) => {
-	const accounts = mysqlTable(
+import { getUsersSchema } from './users.js'
+
+export function getAccountsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'account',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
@@ -38,6 +41,12 @@ export const getAccountsSchema = (mysqlTable: MySqlTableFn) => {
 			userIdIdx: index('userId_idx').on(account.userId),
 		}),
 	)
+}
 
-	return { accounts }
+export function getAccountsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const accounts = getAccountsSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	return relations(accounts, ({ one }) => ({
+		user: one(users, { fields: [accounts.userId], references: [users.id] }),
+	}))
 }

package/src/lib/mysql/schemas/auth/permissions.ts

@@ -1,3 +1,4 @@
+import { relations } from 'drizzle-orm'
 import {
 	boolean,
 	index,
@@ -7,8 +8,10 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getPermissionsSchema = (mysqlTable: MySqlTableFn) => {
-	const permissions = mysqlTable(
+import { getRolePermissionsSchema } from './role-permissions.js'
+
+export function getPermissionsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'permission',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
@@ -32,6 +35,10 @@ export const getPermissionsSchema = (mysqlTable: MySqlTableFn) => {
 			nameIdx: index('name_idx').on(permission.name),
 		}),
 	)
+}
 
-	return { permissions }
+export function getPermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
+	return relations(getPermissionsSchema(mysqlTable), ({ many }) => ({
+		rolePermissions: many(getRolePermissionsSchema(mysqlTable)),
+	}))
 }

package/src/lib/mysql/schemas/auth/role-permissions.ts

@@ -1,3 +1,4 @@
+import { relations } from 'drizzle-orm'
 import {
 	boolean,
 	index,
@@ -7,8 +8,11 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getRolePermissionsSchema = (mysqlTable: MySqlTableFn) => {
-	const rolePermissions = mysqlTable(
+import { getPermissionsSchema } from './permissions.js'
+import { getRolesSchema } from './roles.js'
+
+export function getRolePermissionsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'rolePermission',
 		{
 			roleId: varchar('roleId', { length: 255 }).notNull(),
@@ -33,6 +37,20 @@ export const getRolePermissionsSchema = (mysqlTable: MySqlTableFn) => {
 			permissionIdIdx: index('permissionId_idx').on(rp.permissionId),
 		}),
 	)
+}
 
-	return { rolePermissions }
+export function getRolePermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const permissions = getPermissionsSchema(mysqlTable)
+	const roles = getRolesSchema(mysqlTable)
+	const rolePermissions = getRolePermissionsSchema(mysqlTable)
+	return relations(rolePermissions, ({ one }) => ({
+		role: one(roles, {
+			fields: [rolePermissions.roleId],
+			references: [roles.id],
+		}),
+		permission: one(permissions, {
+			fields: [rolePermissions.permissionId],
+			references: [permissions.id],
+		}),
+	}))
 }

package/src/lib/mysql/schemas/auth/roles.ts

@@ -1,3 +1,4 @@
+import { relations } from 'drizzle-orm'
 import {
 	boolean,
 	index,
@@ -7,8 +8,10 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getRolesSchema = (mysqlTable: MySqlTableFn) => {
-	const roles = mysqlTable(
+import { getUserRolesSchema } from './user-roles.js'
+
+export function getRolesSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'role',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
@@ -32,6 +35,12 @@ export const getRolesSchema = (mysqlTable: MySqlTableFn) => {
 			nameIdx: index('name_idx').on(role.name),
 		}),
 	)
+}
 
-	return { roles }
+export function getRolesRelationsSchema(mysqlTable: MySqlTableFn) {
+	const roles = getRolesSchema(mysqlTable)
+	const userRoles = getUserRolesSchema(mysqlTable)
+	return relations(roles, ({ many }) => ({
+		userRoles: many(userRoles),
+	}))
 }

package/src/lib/mysql/schemas/auth/sessions.ts

@@ -1,7 +1,10 @@
+import { relations } from 'drizzle-orm'
 import { index, MySqlTableFn, timestamp, varchar } from 'drizzle-orm/mysql-core'
 
-export const getSessionsSchema = (mysqlTable: MySqlTableFn) => {
-	const sessions = mysqlTable(
+import { getUsersSchema } from './users.js'
+
+export function getSessionsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'session',
 		{
 			sessionToken: varchar('sessionToken', { length: 255 })
@@ -14,6 +17,12 @@ export const getSessionsSchema = (mysqlTable: MySqlTableFn) => {
 			userIdIdx: index('userId_idx').on(session.userId),
 		}),
 	)
+}
 
-	return { sessions }
+export function getSessionRelationsSchema(mysqlTable: MySqlTableFn) {
+	const sessions = getSessionsSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	return relations(sessions, ({ one }) => ({
+		user: one(users, { fields: [sessions.userId], references: [users.id] }),
+	}))
 }

package/src/lib/mysql/schemas/auth/user-permissions.ts

@@ -1,3 +1,4 @@
+import { relations } from 'drizzle-orm'
 import {
 	boolean,
 	index,
@@ -7,8 +8,11 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getUserPermissionsSchema = (mysqlTable: MySqlTableFn) => {
-	const userPermissions = mysqlTable(
+import { getPermissionsSchema } from './permissions.js'
+import { getUsersSchema } from './users.js'
+
+export function getUserPermissionsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'userPermission',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
@@ -33,6 +37,20 @@ export const getUserPermissionsSchema = (mysqlTable: MySqlTableFn) => {
 			permissionIdIdx: index('permissionId_idx').on(up.permissionId),
 		}),
 	)
+}
 
-	return { userPermissions }
+export function getUserPermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const userPermissions = getUserPermissionsSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	const permissions = getPermissionsSchema(mysqlTable)
+	return relations(userPermissions, ({ one }) => ({
+		user: one(users, {
+			fields: [userPermissions.userId],
+			references: [users.id],
+		}),
+		permission: one(permissions, {
+			fields: [userPermissions.permissionId],
+			references: [permissions.id],
+		}),
+	}))
 }

package/src/lib/mysql/schemas/auth/user-roles.ts

@@ -1,3 +1,4 @@
+import { relations } from 'drizzle-orm'
 import {
 	boolean,
 	index,
@@ -7,8 +8,11 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getUserRolesSchema = (mysqlTable: MySqlTableFn) => {
-	const userRoles = mysqlTable(
+import { getRolesSchema } from './roles.js'
+import { getUsersSchema } from './users.js'
+
+export function getUserRolesSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'userRole',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
@@ -33,6 +37,20 @@ export const getUserRolesSchema = (mysqlTable: MySqlTableFn) => {
 			roleIdIdx: index('roleId_idx').on(ur.roleId),
 		}),
 	)
+}
 
-	return { userRoles }
+export function getUserRolesRelationsSchema(mysqlTable: MySqlTableFn) {
+	const userRoles = getUserRolesSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	const roles = getRolesSchema(mysqlTable)
+	return relations(userRoles, ({ one }) => ({
+		user: one(users, {
+			fields: [userRoles.userId],
+			references: [users.id],
+		}),
+		role: one(roles, {
+			fields: [userRoles.roleId],
+			references: [roles.id],
+		}),
+	}))
 }

package/src/lib/mysql/schemas/auth/users.ts

@@ -1,4 +1,4 @@
-import { sql } from 'drizzle-orm'
+import { relations, sql } from 'drizzle-orm'
 import {
 	index,
 	mysqlEnum,
@@ -7,8 +7,15 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
+import { getCommunicationPreferencesSchema } from '../communication/communication-preferences.js'
+import { getContentContributionsSchema } from '../content/content-contributions.js'
+import { getContentResourceSchema } from '../content/content-resource.js'
+import { getAccountsSchema } from './accounts.js'
+import { getUserPermissionsSchema } from './user-permissions.js'
+import { getUserRolesSchema } from './user-roles.js'
+
 export function getUsersSchema(mysqlTable: MySqlTableFn) {
-	const users = mysqlTable(
+	return mysqlTable(
 		'user',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
@@ -28,8 +35,25 @@ export function getUsersSchema(mysqlTable: MySqlTableFn) {
 		(user) => ({
 			emailIdx: index('email_idx').on(user.email),
 			roleIdx: index('role_idx').on(user.role),
+			createdAtIdx: index('created_at_idx').on(user.createdAt),
 		}),
 	)
+}
 
-	return { users }
+export function getUsersRelationsSchema(mysqlTable: MySqlTableFn) {
+	const users = getUsersSchema(mysqlTable)
+	const accounts = getAccountsSchema(mysqlTable)
+	const communicationPreferences = getCommunicationPreferencesSchema(mysqlTable)
+	const userRoles = getUserRolesSchema(mysqlTable)
+	const userPermissions = getUserPermissionsSchema(mysqlTable)
+	const contentContributions = getContentContributionsSchema(mysqlTable)
+	const contentResource = getContentResourceSchema(mysqlTable)
+	return relations(users, ({ many }) => ({
+		accounts: many(accounts),
+		communicationPreferences: many(communicationPreferences),
+		userRoles: many(userRoles),
+		userPermissions: many(userPermissions),
+		contributions: many(contentContributions),
+		createdContent: many(contentResource),
+	}))
 }

package/src/lib/mysql/schemas/auth/verification-tokens.ts

@@ -5,8 +5,8 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-export const getVerificationTokensSchema = (mysqlTable: MySqlTableFn) => {
-	const verificationTokens = mysqlTable(
+export function getVerificationTokensSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
 		'verificationToken',
 		{
 			identifier: varchar('identifier', { length: 255 }).notNull(),
@@ -21,6 +21,4 @@ export const getVerificationTokensSchema = (mysqlTable: MySqlTableFn) => {
 			pk: primaryKey({ columns: [vt.identifier, vt.token] }),
 		}),
 	)
-
-	return { verificationTokens }
 }