@coursebuilder/adapter-drizzle 0.0.7 → 0.1.1

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

@@ -47,6 +47,10 @@ 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] }),
+		user: one(users, {
+			fields: [accounts.userId],
+			references: [users.id],
+			relationName: 'user',
+		}),
 	}))
 }

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

@@ -38,7 +38,5 @@ export function getPermissionsSchema(mysqlTable: MySqlTableFn) {
 }
 
 export function getPermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
-	return relations(getPermissionsSchema(mysqlTable), ({ many }) => ({
-		rolePermissions: many(getRolePermissionsSchema(mysqlTable)),
-	}))
+	return relations(getPermissionsSchema(mysqlTable), ({ many }) => ({}))
 }

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

@@ -47,10 +47,12 @@ export function getRolePermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
 		role: one(roles, {
 			fields: [rolePermissions.roleId],
 			references: [roles.id],
+			relationName: 'role',
 		}),
 		permission: one(permissions, {
 			fields: [rolePermissions.permissionId],
 			references: [permissions.id],
+			relationName: 'permission',
 		}),
 	}))
 }

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

@@ -41,6 +41,6 @@ export function getRolesRelationsSchema(mysqlTable: MySqlTableFn) {
 	const roles = getRolesSchema(mysqlTable)
 	const userRoles = getUserRolesSchema(mysqlTable)
 	return relations(roles, ({ many }) => ({
-		userRoles: many(userRoles),
+		userRoles: many(userRoles, { relationName: 'role' }),
 	}))
 }

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

@@ -23,6 +23,10 @@ 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] }),
+		user: one(users, {
+			fields: [sessions.userId],
+			references: [users.id],
+			relationName: 'user',
+		}),
 	}))
 }

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

@@ -47,10 +47,12 @@ export function getUserPermissionsRelationsSchema(mysqlTable: MySqlTableFn) {
 		user: one(users, {
 			fields: [userPermissions.userId],
 			references: [users.id],
+			relationName: 'user',
 		}),
 		permission: one(permissions, {
 			fields: [userPermissions.permissionId],
 			references: [permissions.id],
+			relationName: 'permission',
 		}),
 	}))
 }

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

@@ -47,10 +47,12 @@ export function getUserRolesRelationsSchema(mysqlTable: MySqlTableFn) {
 		user: one(users, {
 			fields: [userRoles.userId],
 			references: [users.id],
+			relationName: 'role',
 		}),
 		role: one(roles, {
 			fields: [userRoles.roleId],
 			references: [roles.id],
+			relationName: 'user',
 		}),
 	}))
 }

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

@@ -7,6 +7,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
+import { getPurchaseSchema } from '../commerce/purchase.js'
 import { getCommunicationPreferencesSchema } from '../communication/communication-preferences.js'
 import { getContentContributionsSchema } from '../content/content-contributions.js'
 import { getContentResourceSchema } from '../content/content-resource.js'
@@ -48,12 +49,28 @@ export function getUsersRelationsSchema(mysqlTable: MySqlTableFn) {
 	const userPermissions = getUserPermissionsSchema(mysqlTable)
 	const contentContributions = getContentContributionsSchema(mysqlTable)
 	const contentResource = getContentResourceSchema(mysqlTable)
+	const purchases = getPurchaseSchema(mysqlTable)
 	return relations(users, ({ many }) => ({
-		accounts: many(accounts),
-		communicationPreferences: many(communicationPreferences),
-		userRoles: many(userRoles),
-		userPermissions: many(userPermissions),
-		contributions: many(contentContributions),
-		createdContent: many(contentResource),
+		accounts: many(accounts, {
+			relationName: 'user',
+		}),
+		purchases: many(purchases, {
+			relationName: 'user',
+		}),
+		communicationPreferences: many(communicationPreferences, {
+			relationName: 'user',
+		}),
+		roles: many(userRoles, {
+			relationName: 'user',
+		}),
+		userPermissions: many(userPermissions, {
+			relationName: 'user',
+		}),
+		contributions: many(contentContributions, {
+			relationName: 'user',
+		}),
+		createdContent: many(contentResource, {
+			relationName: 'user',
+		}),
 	}))
 }

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

@@ -1,11 +1,11 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	decimal,
 	int,
 	json,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	tinyint,
 	unique,
 	varchar,
@@ -17,10 +17,10 @@ export function getCouponSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			code: varchar('code', { length: 191 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
-			expires: datetime('expires', { mode: 'string', fsp: 3 }),
+			expires: timestamp('expires', { mode: 'date', fsp: 3 }),
 			metadata: json('fields').$type<Record<string, any>>().default({}),
 			maxUses: int('maxUses').default(-1).notNull(),
 			default: tinyint('default').default(0).notNull(),

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
@@ -13,7 +13,7 @@ export function getMerchantAccountSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			status: int('status').default(0).notNull(),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			label: varchar('label', { length: 191 }),

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	unique,
 	varchar,
 } from 'drizzle-orm/mysql-core'
@@ -22,7 +22,7 @@ export function getMerchantChargeSchema(mysqlTable: MySqlTableFn) {
 			merchantProductId: varchar('merchantProductId', {
 				length: 191,
 			}).notNull(),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			merchantCustomerId: varchar('merchantCustomerId', {

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	unique,
 	varchar,
 } from 'drizzle-orm/mysql-core'
@@ -18,7 +18,7 @@ export function getMerchantCustomerSchema(mysqlTable: MySqlTableFn) {
 				length: 191,
 			}).notNull(),
 			identifier: varchar('identifier', { length: 191 }).notNull(),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			status: int('status').default(0),

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	unique,
 	varchar,
 } from 'drizzle-orm/mysql-core'
@@ -21,7 +21,7 @@ export function getMerchantPriceSchema(mysqlTable: MySqlTableFn) {
 			}).notNull(),
 			status: int('status').default(0),
 			identifier: varchar('identifier', { length: 191 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			priceId: varchar('priceId', { length: 191 }),

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	unique,
 	varchar,
 } from 'drizzle-orm/mysql-core'
@@ -19,7 +19,7 @@ export function getMerchantProductSchema(mysqlTable: MySqlTableFn) {
 			productId: varchar('productId', { length: 191 }).notNull(),
 			status: int('status').default(0).notNull(),
 			identifier: varchar('identifier', { length: 191 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 		},

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

@@ -1,11 +1,11 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	decimal,
 	int,
 	json,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
@@ -18,7 +18,7 @@ export function getPriceSchema(mysqlTable: MySqlTableFn) {
 			nickname: varchar('nickname', { length: 191 }),
 			status: int('status').default(0).notNull(),
 			unitAmount: decimal('unitAmount', { precision: 10, scale: 2 }).notNull(),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			metadata: json('fields').$type<Record<string, any>>().default({}),

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

@@ -1,10 +1,10 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	int,
 	json,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
@@ -16,7 +16,7 @@ export function getProductSchema(mysqlTable: MySqlTableFn) {
 			name: varchar('name', { length: 191 }).notNull(),
 			key: varchar('key', { length: 191 }),
 			metadata: json('fields').$type<Record<string, any>>().default({}),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			status: int('status').default(0).notNull(),

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

@@ -1,9 +1,9 @@
 import { sql } from 'drizzle-orm'
 import {
-	datetime,
 	mysqlEnum,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
@@ -26,13 +26,13 @@ export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
 			purchaseId: varchar('purchaseId', { length: 191 }).notNull(),
 			sourceUserId: varchar('sourceUserId', { length: 191 }).notNull(),
 			targetUserId: varchar('targetUserId', { length: 191 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
-			expiresAt: datetime('expiresAt', { mode: 'string', fsp: 3 }),
-			canceledAt: datetime('canceledAt', { mode: 'string', fsp: 3 }),
-			confirmedAt: datetime('confirmedAt', { mode: 'string', fsp: 3 }),
-			completedAt: datetime('completedAt', { mode: 'string', fsp: 3 }),
+			expiresAt: timestamp('expiresAt', { mode: 'date', fsp: 3 }),
+			canceledAt: timestamp('canceledAt', { mode: 'date', fsp: 3 }),
+			confirmedAt: timestamp('confirmedAt', { mode: 'date', fsp: 3 }),
+			completedAt: timestamp('completedAt', { mode: 'date', fsp: 3 }),
 		},
 		(table) => {
 			return {

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

@@ -1,21 +1,30 @@
-import { sql } from 'drizzle-orm'
+import { relations, sql } from 'drizzle-orm'
 import {
-	datetime,
 	decimal,
 	json,
 	MySqlTableFn,
 	primaryKey,
+	timestamp,
 	unique,
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
+import { getUsersSchema } from '../auth/users.js'
+import { getCouponSchema } from './coupon.js'
+import { getMerchantChargeSchema } from './merchant-charge.js'
+import { getMerchantCouponSchema } from './merchant-coupon.js'
+import { getMerchantCustomerSchema } from './merchant-customer.js'
+import { getMerchantProductSchema } from './merchant-product.js'
+import { getMerchantSessionSchema } from './merchant-session.js'
+import { getProductSchema } from './product.js'
+
 export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
 		'purchases',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 191 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 			totalAmount: decimal('totalAmount', {
@@ -46,3 +55,40 @@ export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 		},
 	)
 }
+
+export function getPurchaseRelationsSchema(mysqlTable: MySqlTableFn) {
+	const purchases = getPurchaseSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	const products = getProductSchema(mysqlTable)
+	const merchantCharges = getMerchantChargeSchema(mysqlTable)
+	const merchantSessions = getMerchantSessionSchema(mysqlTable)
+	const coupons = getCouponSchema(mysqlTable)
+
+	return relations(purchases, ({ many, one }) => ({
+		user: one(users, {
+			fields: [purchases.userId],
+			references: [users.id],
+			relationName: 'user',
+		}),
+		product: one(products, {
+			fields: [purchases.productId],
+			references: [products.id],
+			relationName: 'product',
+		}),
+		bulkCoupon: one(coupons, {
+			fields: [purchases.bulkCouponId],
+			references: [coupons.id],
+			relationName: 'bulkCoupon',
+		}),
+		merchantCharge: one(merchantCharges, {
+			fields: [purchases.merchantChargeId],
+			references: [merchantCharges.id],
+			relationName: 'merchantCharge',
+		}),
+		merchantSession: one(merchantSessions, {
+			fields: [purchases.merchantSessionId],
+			references: [merchantSessions.id],
+			relationName: 'merchantSession',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/commerce/upgradable-products.ts

@@ -0,0 +1,58 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	double,
+	index,
+	json,
+	MySqlTableFn,
+	primaryKey,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getProductSchema } from './product.js'
+
+export function getUpgradableProductsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'upgradableProducts',
+		{
+			upgradableToId: varchar('upgradableToId', { length: 255 }).notNull(),
+			upgradableFromId: varchar('upgradableFrom', { length: 255 }).notNull(),
+			position: double('position').notNull().default(0),
+			metadata: json('metadata').$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,
+			}),
+		},
+		(crr) => ({
+			pk: primaryKey({ columns: [crr.upgradableToId, crr.upgradableFromId] }),
+			upgradableToIdIdx: index('upgradableFromId_idx').on(crr.upgradableToId),
+			upgradableFromIdIdx: index('upgradableToId_idx').on(crr.upgradableFromId),
+		}),
+	)
+}
+
+export function getUpgradableProductsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const product = getProductSchema(mysqlTable)
+	const upgradableProduct = getUpgradableProductsSchema(mysqlTable)
+	return relations(upgradableProduct, ({ one }) => ({
+		upgradableTo: one(product, {
+			fields: [upgradableProduct.upgradableToId],
+			references: [product.id],
+			relationName: 'upgradableTo',
+		}),
+		upgradableFrom: one(product, {
+			fields: [upgradableProduct.upgradableFromId],
+			references: [product.id],
+			relationName: 'upgradableFrom',
+		}),
+	}))
+}

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

@@ -65,14 +65,17 @@ export function getCommunicationPreferencesRelationsSchema(
 		user: one(users, {
 			fields: [communicationPreferences.userId],
 			references: [users.id],
+			relationName: 'user',
 		}),
 		channel: one(communicationChannel, {
 			fields: [communicationPreferences.channelId],
 			references: [communicationChannel.id],
+			relationName: 'channel',
 		}),
 		preferenceType: one(communicationPreferenceTypes, {
 			fields: [communicationPreferences.preferenceTypeId],
 			references: [communicationPreferenceTypes.id],
+			relationName: 'preferenceType',
 		}),
 	}))
 }

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

@@ -57,14 +57,17 @@ export function getContentContributionRelationsSchema(
 		user: one(users, {
 			fields: [contentContributions.userId],
 			references: [users.id],
+			relationName: 'user',
 		}),
 		content: one(contentResource, {
 			fields: [contentContributions.contentId],
 			references: [contentResource.id],
+			relationName: 'contributions',
 		}),
 		contributionType: one(contributionTypes, {
 			fields: [contentContributions.contributionTypeId],
 			references: [contributionTypes.id],
+			relationName: 'contributionType',
 		}),
 	}))
 }

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

@@ -18,7 +18,7 @@ export function getContentResourceResourceSchema(mysqlTable: MySqlTableFn) {
 			resourceOfId: varchar('resourceOfId', { length: 255 }).notNull(),
 			resourceId: varchar('resourceId', { length: 255 }).notNull(),
 			position: double('position').notNull().default(0),
-			metadata: json('fields').$type<Record<string, any>>().default({}),
+			metadata: json('metadata').$type<Record<string, any>>().default({}),
 			createdAt: timestamp('createdAt', {
 				mode: 'date',
 				fsp: 3,

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

@@ -43,14 +43,13 @@ export function getContentResourceSchema(mysqlTable: MySqlTableFn) {
 export function getContentResourceRelationsSchema(mysqlTable: MySqlTableFn) {
 	const contentResource = getContentResourceSchema(mysqlTable)
 	const users = getUsersSchema(mysqlTable)
-	const contentContributions = getContentContributionsSchema(mysqlTable)
 	const contentResourceResource = getContentResourceResourceSchema(mysqlTable)
 	return relations(contentResource, ({ one, many }) => ({
 		createdBy: one(users, {
 			fields: [contentResource.createdById],
 			references: [users.id],
+			relationName: 'user',
 		}),
-		contributions: many(contentContributions),
 		resources: many(contentResourceResource, { relationName: 'resourceOf' }),
 		resourceOf: many(contentResourceResource, { relationName: 'resource' }),
 	}))

package/src/lib/mysql/schemas/content/contribution-types.ts

@@ -41,9 +41,6 @@ export function getContributionTypesSchema(mysqlTable: MySqlTableFn) {
 
 export function getContributionTypesRelationsSchema(mysqlTable: MySqlTableFn) {
 	const contributionTypes = getContributionTypesSchema(mysqlTable)
-	const contentContributions = getContentContributionsSchema(mysqlTable)
 
-	return relations(contributionTypes, ({ many }) => ({
-		contributions: many(contentContributions),
-	}))
+	return relations(contributionTypes, ({ many }) => ({}))
 }

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

@@ -15,9 +15,9 @@ export function getResourceProgressSchema(mysqlTable: MySqlTableFn) {
 			userId: varchar('userId', { length: 191 }).notNull(),
 			contentResourceId: varchar('contentResourceId', { length: 191 }),
 			metadata: json('fields').$type<Record<string, any>>().default({}),
-			completedAt: datetime('completedAt', { mode: 'string', fsp: 3 }),
-			updatedAt: datetime('updatedAt', { mode: 'string', fsp: 3 }),
-			createdAt: datetime('createdAt', { mode: 'string', fsp: 3 })
+			completedAt: datetime('completedAt', { mode: 'date', fsp: 3 }),
+			updatedAt: datetime('updatedAt', { mode: 'date', fsp: 3 }),
+			createdAt: datetime('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
 		},

package/src/lib/mysql/utils.ts

@@ -0,0 +1,23 @@
+import { customType } from 'drizzle-orm/mysql-core'
+
+export const datetimeUtc = (name: string, precision: number) =>
+	customType<{ data: Date; driverData: string }>({
+		dataType() {
+			return `datetime(${precision})`
+		},
+		toDriver(value: Date): string {
+			return mysqlDatetimeUtc(value)
+		},
+		fromDriver(value: string): Date {
+			return mysqlDatetimeUtcToDate(value)
+		},
+	})(name)
+
+function mysqlDatetimeUtc(date: Date = new Date()) {
+	return date.toISOString().slice(0, 19).replace('T', ' ')
+}
+// Use this function instead of new Date() when converting a MySQL datetime to a
+// Date object so that the date is interpreted as UTC instead of local time (default behavior)
+function mysqlDatetimeUtcToDate(mysqlDatetimeUtc: string) {
+	return new Date(mysqlDatetimeUtc.replace(' ', 'T') + 'Z')
+}