@coursebuilder/adapter-drizzle 0.0.5 → 0.0.6

package/dist/lib/utils.d.ts

@@ -6,8 +6,6 @@ import { DefaultSchema as DefaultSchema$1 } from './pg.js';
 import { DefaultSchema as DefaultSchema$2 } from './sqlite.js';
 import 'drizzle-orm';
 import '@coursebuilder/core/adapters';
-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.5",
+  "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

@@ -13,65 +13,71 @@ import { VideoResourceSchema } from '@coursebuilder/core/schemas/video-resource'
 import {
 	getAccountsRelationsSchema,
 	getAccountsSchema,
-} from './schemas/auth/accounts'
+} from './schemas/auth/accounts.js'
 import {
 	getPermissionsRelationsSchema,
 	getPermissionsSchema,
-} from './schemas/auth/permissions'
+} from './schemas/auth/permissions.js'
 import {
 	getRolePermissionsRelationsSchema,
 	getRolePermissionsSchema,
-} from './schemas/auth/role-permissions'
-import { getRolesRelationsSchema, getRolesSchema } from './schemas/auth/roles'
+} from './schemas/auth/role-permissions.js'
+import {
+	getRolesRelationsSchema,
+	getRolesSchema,
+} from './schemas/auth/roles.js'
 import {
 	getSessionRelationsSchema,
 	getSessionsSchema,
-} from './schemas/auth/sessions'
+} from './schemas/auth/sessions.js'
 import {
 	getUserPermissionsRelationsSchema,
 	getUserPermissionsSchema,
-} from './schemas/auth/user-permissions'
+} from './schemas/auth/user-permissions.js'
 import {
 	getUserRolesRelationsSchema,
 	getUserRolesSchema,
-} from './schemas/auth/user-roles'
-import { getUsersRelationsSchema, 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'
+} 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'
+} from './schemas/communication/communication-preferences.js'
 import {
 	getContentContributionRelationsSchema,
 	getContentContributionsSchema,
-} from './schemas/content/content-contributions'
-import {
-	getContentResourceRelationsSchema,
-	getContentResourceSchema,
-} from './schemas/content/content-resource'
+} from './schemas/content/content-contributions.js'
 import {
 	getContentResourceResourceRelationsSchema,
 	getContentResourceResourceSchema,
-} from './schemas/content/content-resource-resource'
+} from './schemas/content/content-resource-resource.js'
+import {
+	getContentResourceRelationsSchema,
+	getContentResourceSchema,
+} from './schemas/content/content-resource.js'
 import {
 	getContributionTypesRelationsSchema,
 	getContributionTypesSchema,
-} from './schemas/content/contribution-types'
-import { getResourceProgressSchema } from './schemas/content/resource-progress'
+} from './schemas/content/contribution-types.js'
+import { getResourceProgressSchema } from './schemas/content/resource-progress.js'
 
 export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
 	return {
@@ -185,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,
@@ -405,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

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from './users'
+import { getUsersSchema } from './users.js'
 
 export function getAccountsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getRolePermissionsSchema } from './role-permissions'
+import { getRolePermissionsSchema } from './role-permissions.js'
 
 export function getPermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,8 +8,8 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getPermissionsSchema } from './permissions'
-import { getRolesSchema } from './roles'
+import { getPermissionsSchema } from './permissions.js'
+import { getRolesSchema } from './roles.js'
 
 export function getRolePermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUserRolesSchema } from './user-roles'
+import { getUserRolesSchema } from './user-roles.js'
 
 export function getRolesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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'
+import { getUsersSchema } from './users.js'
 
 export function getSessionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,8 +8,8 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getPermissionsSchema } from './permissions'
-import { getUsersSchema } from './users'
+import { getPermissionsSchema } from './permissions.js'
+import { getUsersSchema } from './users.js'
 
 export function getUserPermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,8 +8,8 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getRolesSchema } from './roles'
-import { getUsersSchema } from './users'
+import { getRolesSchema } from './roles.js'
+import { getUsersSchema } from './users.js'
 
 export function getUserRolesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -7,12 +7,12 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getCommunicationPreferencesSchema } from '../communication/communication-preferences'
-import { getContentContributionsSchema } from '../content/content-contributions'
-import { getContentResourceSchema } from '../content/content-resource'
-import { getAccountsSchema } from './accounts'
-import { getUserPermissionsSchema } from './user-permissions'
-import { getUserRolesSchema } from './user-roles'
+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) {
 	return mysqlTable(
@@ -35,6 +35,7 @@ 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),
 		}),
 	)
 }

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

@@ -8,9 +8,9 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users'
-import { getCommunicationChannelSchema } from './communication-channel'
-import { getCommunicationPreferenceTypesSchema } from './communication-preference-types'
+import { getUsersSchema } from '../auth/users.js'
+import { getCommunicationChannelSchema } from './communication-channel.js'
+import { getCommunicationPreferenceTypesSchema } from './communication-preference-types.js'
 
 export function getCommunicationPreferencesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -7,9 +7,9 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users'
-import { getContentResourceSchema } from './content-resource'
-import { getContributionTypesSchema } from './contribution-types'
+import { getUsersSchema } from '../auth/users.js'
+import { getContentResourceSchema } from './content-resource.js'
+import { getContributionTypesSchema } from './contribution-types.js'
 
 export function getContentContributionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -9,7 +9,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getContentResourceSchema } from './content-resource'
+import { getContentResourceSchema } from './content-resource.js'
 
 export function getContentResourceResourceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -7,9 +7,9 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getUsersSchema } from '../auth/users'
-import { getContentContributionsSchema } from './content-contributions'
-import { getContentResourceResourceSchema } from './content-resource-resource'
+import { getUsersSchema } from '../auth/users.js'
+import { getContentContributionsSchema } from './content-contributions.js'
+import { getContentResourceResourceSchema } from './content-resource-resource.js'
 
 export function getContentResourceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

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

@@ -8,7 +8,7 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getContentContributionsSchema } from './content-contributions'
+import { getContentContributionsSchema } from './content-contributions.js'
 
 export function getContributionTypesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(

package/src/lib/utils.ts

@@ -5,7 +5,7 @@ import type { AnyPgTable, PgTableFn } from 'drizzle-orm/pg-core'
 import { type BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core'
 import type { AnySQLiteTable, SQLiteTableFn } from 'drizzle-orm/sqlite-core'
 
-import type { DefaultSchema as MySqlSchema } from './mysql'
+import type { DefaultSchema as MySqlSchema } from './mysql/index.js'
 import type { DefaultSchema as PgSchema } from './pg.js'
 import type { DefaultSchema as SQLiteSchema } from './sqlite.js'