@coursebuilder/adapter-drizzle 1.0.4 → 1.0.6

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

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getAccountsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -43,9 +43,13 @@ export function getAccountsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getAccountsRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getAccountsRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const accounts = getAccountsSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	return relations(accounts, ({ one }) => ({
 		user: one(users, {
 			fields: [accounts.userId],

package/src/lib/mysql/schemas/auth/device-access-token.ts

@@ -7,7 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getDeviceAccessTokenSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -30,9 +30,13 @@ export function getDeviceAccessTokenSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getDeviceAccessTokenRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getDeviceAccessTokenRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const deviceAccessToken = getDeviceAccessTokenSchema(mysqlTable)
-	const user = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const user = resolveUsersSchema(mysqlTable)
 	return relations(deviceAccessToken, ({ one }) => ({
 		verifiedBy: one(user, {
 			fields: [deviceAccessToken.userId],

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

@@ -7,7 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getDeviceVerificationSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -35,9 +35,13 @@ export function getDeviceVerificationSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getDeviceVerificationRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getDeviceVerificationRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const deviceVerification = getDeviceVerificationSchema(mysqlTable)
-	const user = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const user = resolveUsersSchema(mysqlTable)
 	return relations(deviceVerification, ({ one }) => ({
 		verifiedBy: one(user, {
 			fields: [deviceVerification.verifiedByUserId],

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

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getProfilesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -37,9 +37,13 @@ export function getProfilesSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getProfilesRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getProfilesRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const profiles = getProfilesSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	return relations(profiles, ({ one }) => ({
 		user: one(users, {
 			fields: [profiles.userId],

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

@@ -1,7 +1,7 @@
 import { relations } from 'drizzle-orm'
 import { index, MySqlTableFn, timestamp, varchar } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getSessionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -19,9 +19,13 @@ export function getSessionsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getSessionRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getSessionRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const sessions = getSessionsSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	return relations(sessions, ({ one }) => ({
 		user: one(users, {
 			fields: [sessions.userId],

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

@@ -9,7 +9,7 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getPermissionsSchema } from './permissions.js'
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getUserPermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -41,9 +41,13 @@ export function getUserPermissionsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getUserPermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getUserPermissionsRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const userPermissions = getUserPermissionsSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const permissions = getPermissionsSchema(mysqlTable)
 	return relations(userPermissions, ({ one }) => ({
 		user: one(users, {

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

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 
 export function getUserPrefsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -41,9 +41,13 @@ export function getUserPrefsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getUserPrefsRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getUserPrefsRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const userPrefs = getUserPrefsSchema(mysqlTable)
-	const user = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const user = resolveUsersSchema(mysqlTable)
 	return relations(userPrefs, ({ one }) => ({
 		user: one(user, {
 			fields: [userPrefs.userId],

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

@@ -9,7 +9,7 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getRolesSchema } from './roles.js'
-import { getUsersSchema } from './users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from './users.js'
 
 export function getUserRolesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -41,9 +41,13 @@ export function getUserRolesSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getUserRolesRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getUserRolesRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const userRoles = getUserRolesSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const roles = getRolesSchema(mysqlTable)
 	return relations(userRoles, ({ one }) => ({
 		user: one(users, {

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

@@ -2,7 +2,6 @@ import { relations, sql } from 'drizzle-orm'
 import {
 	index,
 	json,
-	mysqlEnum,
 	MySqlTableFn,
 	timestamp,
 	varchar,
@@ -47,8 +46,23 @@ export function getUsersSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getUsersRelationsSchema(mysqlTable: MySqlTableFn) {
-	const users = getUsersSchema(mysqlTable)
+export type UsersSchemaOverrides<
+	TUsers extends ReturnType<typeof getUsersSchema> = ReturnType<
+		typeof getUsersSchema
+	>,
+> = {
+	getUsersSchema?: (mysqlTable: MySqlTableFn) => TUsers
+}
+
+export function getUsersRelationsSchema<
+	TUsers extends ReturnType<typeof getUsersSchema> = ReturnType<
+		typeof getUsersSchema
+	>,
+>(mysqlTable: MySqlTableFn, overrides: UsersSchemaOverrides<TUsers> = {}) {
+	const resolveUsersSchema = (overrides.getUsersSchema ?? getUsersSchema) as (
+		mysqlTable: MySqlTableFn,
+	) => TUsers
+	const users = resolveUsersSchema(mysqlTable)
 	const profiles = getProfilesSchema(mysqlTable)
 	const accounts = getAccountsSchema(mysqlTable)
 	const communicationPreferences = getCommunicationPreferencesSchema(mysqlTable)

package/src/lib/mysql/schemas/commerce/coupon.ts

@@ -36,7 +36,8 @@ export function getCouponSchema(mysqlTable: MySqlTableFn) {
 			percentageDiscount: decimal('percentageDiscount', {
 				precision: 3,
 				scale: 2,
-			}).notNull(),
+			}),
+			amountDiscount: int('amountDiscount'),
 			restrictedToProductId: varchar('restrictedToProductId', { length: 191 }),
 		},
 		(table) => {

package/src/lib/mysql/schemas/commerce/merchant-coupon.ts

@@ -22,7 +22,8 @@ export function getMerchantCouponSchema(mysqlTable: MySqlTableFn) {
 			percentageDiscount: decimal('percentageDiscount', {
 				precision: 3,
 				scale: 2,
-			}).notNull(),
+			}),
+			amountDiscount: int('amountDiscount'),
 			type: varchar('type', { length: 191 }),
 		},
 		(table) => {

package/src/lib/mysql/schemas/commerce/merchant-events.ts

@@ -0,0 +1,62 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	json,
+	MySqlTableFn,
+	primaryKey,
+	timestamp,
+	unique,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getMerchantAccountSchema } from './merchant-account.js'
+
+/**
+ * MerchantEvents table for tracking webhook events from payment providers
+ * This provides an audit trail of what webhooks we received, regardless of
+ * whether Inngest successfully processed them or not.
+ */
+export function getMerchantEventsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'MerchantEvents',
+		{
+			id: varchar('id', { length: 191 }).notNull(),
+			merchantAccountId: varchar('merchantAccountId', {
+				length: 191,
+			}).notNull(),
+			identifier: varchar('identifier', { length: 191 }).notNull(),
+			payload: json('payload').notNull(),
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+		},
+		(table) => {
+			return {
+				merchantEventsId: primaryKey({
+					columns: [table.id],
+					name: 'MerchantEvents_id',
+				}),
+				merchantEventsIdentifierKey: unique('MerchantEvents_identifier_key').on(
+					table.identifier,
+				),
+				merchantAccountIdIdx: index('merchantAccountId_idx').on(
+					table.merchantAccountId,
+				),
+				createdAtIdx: index('createdAt_idx').on(table.createdAt),
+			}
+		},
+	)
+}
+
+export function getMerchantEventsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const merchantEvents = getMerchantEventsSchema(mysqlTable)
+	const merchantAccount = getMerchantAccountSchema(mysqlTable)
+
+	return relations(merchantEvents, ({ one }) => ({
+		merchantAccount: one(merchantAccount, {
+			fields: [merchantEvents.merchantAccountId],
+			references: [merchantAccount.id],
+			relationName: 'merchantAccount',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/commerce/purchase-user-transfer.ts

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getPurchaseSchema } from './purchase.js'
 
 export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
@@ -53,9 +53,11 @@ export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
 
 export function getPurchaseUserTransferRelationsSchema(
 	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
 ) {
 	const purchaseUserTransfer = getPurchaseUserTransferSchema(mysqlTable)
-	const user = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const user = resolveUsersSchema(mysqlTable)
 	const purchase = getPurchaseSchema(mysqlTable)
 	return relations(purchaseUserTransfer, ({ one }) => ({
 		sourceUser: one(user, {

package/src/lib/mysql/schemas/commerce/purchase.ts

@@ -10,7 +10,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getOrganizationsSchema } from '../org/organizations.js'
 import { getCouponSchema } from './coupon.js'
@@ -67,9 +67,13 @@ export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getPurchaseRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getPurchaseRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const purchases = getPurchaseSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const products = getProductSchema(mysqlTable)
 	const merchantCharges = getMerchantChargeSchema(mysqlTable)
 	const merchantSessions = getMerchantSessionSchema(mysqlTable)

package/src/lib/mysql/schemas/communication/comment.ts

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 
 export function getCommentsSchema(mysqlTable: MySqlTableFn) {
@@ -46,9 +46,13 @@ export function getCommentsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getCommentRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getCommentRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const comment = getCommentsSchema(mysqlTable)
-	const user = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const user = resolveUsersSchema(mysqlTable)
 	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 	return relations(comment, ({ one }) => ({
 		user: one(user, {

package/src/lib/mysql/schemas/communication/communication-preferences.ts

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getCommunicationChannelSchema } from './communication-channel.js'
 import { getCommunicationPreferenceTypesSchema } from './communication-preference-types.js'
@@ -63,9 +63,11 @@ export function getCommunicationPreferencesSchema(mysqlTable: MySqlTableFn) {
 
 export function getCommunicationPreferencesRelationsSchema(
 	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
 ) {
 	const communicationPreferences = getCommunicationPreferencesSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const communicationChannel = getCommunicationChannelSchema(mysqlTable)
 	const communicationPreferenceTypes =
 		getCommunicationPreferenceTypesSchema(mysqlTable)

package/src/lib/mysql/schemas/communication/question-response.ts

@@ -0,0 +1,90 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	json,
+	MySqlTableFn,
+	timestamp,
+	uniqueIndex,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
+import { getContentResourceSchema } from '../content/content-resource.js'
+
+/**
+ * Question response table - stores individual question responses
+ * Supports surveys, quizzes, polls, and other question-based interactions
+ * Works for both authenticated users and anonymous email subscribers
+ */
+export function getQuestionResponseSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'QuestionResponse',
+		{
+			id: varchar('id', { length: 255 }).notNull().primaryKey(),
+			surveyId: varchar('surveyId', { length: 255 }).notNull(),
+			questionId: varchar('questionId', { length: 255 }).notNull(),
+			respondentKey: varchar('respondentKey', { length: 255 }),
+			surveySessionId: varchar('surveySessionId', { length: 255 }),
+			userId: varchar('userId', { length: 255 }),
+			emailListSubscriberId: varchar('emailListSubscriberId', { length: 255 }),
+			fields: json('fields').$type<Record<string, any>>().default({}),
+			createdAt: timestamp('createdAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+			updatedAt: timestamp('updatedAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+			deletedAt: timestamp('deletedAt', {
+				mode: 'date',
+				fsp: 3,
+			}),
+		},
+		(qr) => ({
+			surveyIdIdx: index('surveyId_idx').on(qr.surveyId),
+			questionIdIdx: index('questionId_idx').on(qr.questionId),
+			respondentKeyIdx: index('respondent_key_idx').on(qr.respondentKey),
+			surveySessionIdIdx: index('survey_session_id_idx').on(qr.surveySessionId),
+			userIdIdx: index('userId_idx').on(qr.userId),
+			emailListSubscriberIdIdx: index('emailListSubscriberId_idx').on(
+				qr.emailListSubscriberId,
+			),
+			surveySubscriberIdx: index('survey_subscriber_idx').on(
+				qr.surveyId,
+				qr.emailListSubscriberId,
+			),
+			surveyQuestionRespondentIdx: uniqueIndex(
+				'survey_question_respondent_unique',
+			).on(qr.surveyId, qr.questionId, qr.respondentKey),
+		}),
+	)
+}
+
+export function getQuestionResponseRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
+	const questionResponse = getQuestionResponseSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
+	const contentResource = getContentResourceSchema(mysqlTable)
+
+	return relations(questionResponse, ({ one }) => ({
+		user: one(users, {
+			fields: [questionResponse.userId],
+			references: [users.id],
+			relationName: 'questionResponseUser',
+		}),
+		survey: one(contentResource, {
+			fields: [questionResponse.surveyId],
+			references: [contentResource.id],
+			relationName: 'questionResponseSurvey',
+		}),
+		question: one(contentResource, {
+			fields: [questionResponse.questionId],
+			references: [contentResource.id],
+			relationName: 'questionResponseQuestion',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/content/content-contributions.ts

@@ -7,7 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getContentResourceSchema } from './content-resource.js'
 import { getContributionTypesSchema } from './contribution-types.js'
@@ -55,9 +55,11 @@ export function getContentContributionsSchema(mysqlTable: MySqlTableFn) {
 
 export function getContentContributionRelationsSchema(
 	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
 ) {
 	const contentContributions = getContentContributionsSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const contentResource = getContentResourceSchema(mysqlTable)
 	const contributionTypes = getContributionTypesSchema(mysqlTable)
 	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)

package/src/lib/mysql/schemas/content/content-resource-version.ts

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getContentResourceSchema } from './content-resource.js'
 
 export function getContentResourceVersionSchema(mysqlTable: MySqlTableFn) {
@@ -46,10 +46,12 @@ export function getContentResourceVersionSchema(mysqlTable: MySqlTableFn) {
 
 export function getContentResourceVersionRelationsSchema(
 	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
 ) {
 	const contentResourceVersion = getContentResourceVersionSchema(mysqlTable)
 	const contentResource = getContentResourceSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 
 	return relations(contentResourceVersion, ({ one }) => ({
 		resource: one(contentResource, {

package/src/lib/mysql/schemas/content/content-resource.ts

@@ -7,7 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getContentContributionsSchema } from './content-contributions.js'
 import { getContentResourceProductSchema } from './content-resource-product.js'
@@ -31,6 +31,11 @@ export function getContentResourceSchema(mysqlTable: MySqlTableFn) {
 			type: varchar('type', { length: 255 }).notNull(),
 			createdById: varchar('createdById', { length: 255 }).notNull(),
 			fields: json('fields').$type<Record<string, any>>().default({}),
+			// Generated column for indexing JSON slug field
+			slug: varchar('slug', { length: 255 }).generatedAlwaysAs(
+				sql`(fields->>'$.slug')`,
+				{ mode: 'stored' },
+			),
 			currentVersionId: varchar('currentVersionId', { length: 255 }),
 			createdAt: timestamp('createdAt', {
 				mode: 'date',
@@ -55,13 +60,18 @@ export function getContentResourceSchema(mysqlTable: MySqlTableFn) {
 			createdByOrganizationMembershipIdIdx: index(
 				'createdByOrganizationMembershipId_idx',
 			).on(cm.createdByOrganizationMembershipId),
+			slugIdx: index('slug_idx').on(cm.slug),
 		}),
 	)
 }
 
-export function getContentResourceRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getContentResourceRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const contentResource = getContentResourceSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const contentResourceResource = getContentResourceResourceSchema(mysqlTable)
 	const contentResourceProduct = getContentResourceProductSchema(mysqlTable)
 	const contentContributions = getContentContributionsSchema(mysqlTable)

package/src/lib/mysql/schemas/entitlements/entitlement.ts

@@ -7,7 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getOrganizationsSchema } from '../org/organizations.js'
 
@@ -43,9 +43,13 @@ export function getEntitlementsSchema(mysqlTable: MySqlTableFn) {
 	)
 }
 
-export function getEntitlementRelationsSchema(mysqlTable: MySqlTableFn) {
+export function getEntitlementRelationsSchema(
+	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
+) {
 	const entitlements = getEntitlementsSchema(mysqlTable)
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 	const orgs = getOrganizationsSchema(mysqlTable)
 	const memberships = getOrganizationMembershipsSchema(mysqlTable)
 

package/src/lib/mysql/schemas/org/organization-memberships.ts

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users.js'
+import { getUsersSchema, type UsersSchemaOverrides } from '../auth/users.js'
 import { getPurchaseSchema } from '../commerce/purchase.js'
 import { getOrganizationMembershipRolesSchema } from './organization-membership-roles.js'
 import { getOrganizationsSchema } from './organizations.js'
@@ -42,8 +42,10 @@ export function getOrganizationMembershipsSchema(mysqlTable: MySqlTableFn) {
 
 export function getOrganizationMembershipsRelationsSchema(
 	mysqlTable: MySqlTableFn,
+	overrides: UsersSchemaOverrides = {},
 ) {
-	const users = getUsersSchema(mysqlTable)
+	const resolveUsersSchema = overrides.getUsersSchema ?? getUsersSchema
+	const users = resolveUsersSchema(mysqlTable)
 
 	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 	const purchases = getPurchaseSchema(mysqlTable)

package/dist/chunk-H736K5TN.js

@@ -1,7 +0,0 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
-export {
-  __name
-};
-//# sourceMappingURL=chunk-H736K5TN.js.map