chore: wip

Author: glennmichael123

storage/framework/core/database/src/index.ts

@@ -1,4 +1,5 @@
 export * from './schema'
+export * from './drivers'
 export * from './migrations'
 export * from './seeder'
 export * from './types'

storage/framework/core/database/src/migrations.ts

@@ -1,10 +1,8 @@
-import { dim, italic, log } from '@stacksjs/cli'
+import { log } from '@stacksjs/cli'
 import { database } from '@stacksjs/config'
 import { err, ok } from '@stacksjs/error-handling'
-import { extractAttributesFromModel } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, globSync } from '@stacksjs/storage'
-import type { Attribute, Attributes } from '@stacksjs/types'
 import { $ } from 'bun'
 import { FileMigrationProvider, Migrator } from 'kysely'
 import { generateMysqlMigration, resetMysqlDatabase } from './drivers'
@@ -107,15 +105,6 @@ export async function generateMigration(modelPath: string) {
   if (driver === 'postgres') await generatePostgresMigration(modelPath)
 }
 
-export async function getExecutedMigrations() {
-  try {
-    // @ts-expect-error the migrations table is not typed yet
-    return await db.selectFrom('migrations').select('name').execute()
-  } catch (error) {
-    return []
-  }
-}
-
 export async function haveModelFieldsChangedSinceLastMigration(modelPath: string) {
   log.debug(`haveModelFieldsChangedSinceLastMigration for model: ${modelPath}`)
 
@@ -154,20 +143,3 @@ export async function lastMigrationDate(): Promise<string | undefined> {
     return undefined
   }
 }
-
-// This is a placeholder function. You need to implement the logic to
-// read the last migration file and extract the fields that were modified.
-export async function getLastMigrationFields(modelName: string): Promise<Attribute> {
-  const oldModelPath = path.frameworkPath(`database/models/${modelName}`)
-  const model = (await import(oldModelPath)).default as Model
-  let fields = {} as Attributes
-
-  if (typeof model.attributes === 'object') fields = model.attributes
-  else fields = JSON.parse(model.attributes) as Attributes
-
-  return fields
-}
-
-export async function getCurrentMigrationFields(modelPath: string): Promise<Attribute | undefined> {
-  return extractAttributesFromModel(modelPath)
-}

storage/framework/core/database/src/utils.ts

@@ -1,16 +1,25 @@
-import { database } from '@stacksjs/config'
+import { app, database } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
 import type { Database } from '@stacksjs/orm'
 import { Kysely, MysqlDialect, PostgresDialect, sql } from 'kysely'
 import { BunWorkerDialect } from 'kysely-bun-worker'
 import { createPool } from 'mysql2'
 import { Pool } from 'pg'
 
+const appEnv = app.env
+
 export function getDialect() {
   const driver = database.default ?? 'sqlite'
 
   log.debug(`Using database driver: ${driver}`)
 
+  let dbName = database.connections?.mysql?.name ?? 'stacks' // Default database name
+
+  // Check if appEnv is testing and modify dbName accordingly
+  if (appEnv === 'testing') {
+    dbName += '-testing' // Append '-testing' to the database name
+  }
+
   if (driver === 'sqlite') {
     const path = database.connections?.sqlite.database ?? 'database/stacks.sqlite'
     return new BunWorkerDialect({
@@ -21,7 +30,7 @@ export function getDialect() {
   if (driver === 'mysql') {
     return new MysqlDialect({
       pool: createPool({
-        database: database.connections?.mysql?.name ?? 'stacks',
+        database: dbName, // Use modified dbName
         host: database.connections?.mysql?.host ?? '127.0.0.1',
         user: database.connections?.mysql?.username ?? 'root',
         password: database.connections?.mysql?.password ?? '',
@@ -31,9 +40,12 @@ export function getDialect() {
   }
 
   if (driver === 'postgres') {
+    const pgDbName = database.connections?.postgres?.name ?? 'stacks' // Default Postgres database name
+    const finalPgDbName = appEnv === 'testing' ? `${pgDbName}-testing` : pgDbName // Modify if testing
+
     return new PostgresDialect({
       pool: new Pool({
-        database: database.connections?.postgres?.name ?? 'stacks',
+        database: finalPgDbName, // Use modified pgDbName
         host: database.connections?.postgres?.host ?? '127.0.0.1',
         user: database.connections?.postgres?.username ?? '',
         password: database.connections?.postgres?.password ?? '',

storage/framework/core/orm/src/utils.ts

@@ -783,6 +783,9 @@ export async function generateKyselyTypes() {
     }
   }
 
+  text += `\nexport interface MigrationsTable {\n`
+  text += `name: string\n timestamp: string \n }`
+
   text += `\nexport interface Database {\n`
 
   for (const modelFile of modelFiles) {
@@ -799,6 +802,8 @@ export async function generateKyselyTypes() {
     text += `  ${tableName}: ${formattedTableName}\n`
   }
 
+  text += `migrations: MigrationsTable`
+
   text += `}`
 
   const file = Bun.file(path.frameworkPath(`orm/src/types.ts`))

storage/framework/core/testing/package.json

@@ -48,6 +48,7 @@
   "devDependencies": {
     "@happy-dom/global-registrator": "^15.7.4",
     "@stacksjs/config": "workspace:*",
+    "@stacksjs/database": "workspace:*",
     "@stacksjs/development": "workspace:*"
   }
 }

storage/framework/core/testing/src/database.ts

@@ -1,28 +1,44 @@
 import { database } from '@stacksjs/config'
-import { db } from '@stacksjs/database'
+import { db, fetchTables, fetchTestSqliteFile, runDatabaseMigration, sql } from '@stacksjs/database'
 
 const driver = database.default || ''
 
-export async function refreshDatabase() {
+export async function setupDatabase() {
+  const dbName = `${database.connections?.mysql?.name ?? 'stacks'}_testing`
+
   if (driver === 'mysql') {
-    await refreshMysql()
+    await sql`CREATE DATABASE IF NOT EXISTS ${sql.raw(dbName)}`.execute(db)
+
+    await runDatabaseMigration()
   }
 
   if (driver === 'sqlite') {
-    await refreshMysql()
+    await sql`CREATE DATABASE IF NOT EXISTS ${sql.raw(dbName)}`.execute(db)
+
+    await runDatabaseMigration()
   }
 }
 
-export async function refreshMysql() {
-  const tables = await fetchTables()
+// export async function refreshDatabase() {
+//   if (driver === 'mysql') await truncateMysql()
 
-  for (const table of tables) {
-    await sql`TRUNCATE TABLE ${sql.raw(table)}`.execute(db)
-  }
-}
+//   if (driver === 'sqlite') await truncateSqlite()
+// }
 
-export async function refreshSqlite() {
-  const dbPath = await fetchTestSqliteFile()
+// export async function truncateMysql() {
+//   const tables = await fetchTables()
 
-  if (fs.existsSync(dbPath)) await Bun.$`rm ${dbPath}`
-}
+//   for (const table of tables) {
+//     await sql`TRUNCATE TABLE ${sql.raw(table)}`.execute(db)
+//   }
+// }
+
+// export async function truncateSqlite() {
+//   const dbPath = await fetchTestSqliteFile()
+
+//   if (fs.existsSync(dbPath)) await Bun.$`rm ${dbPath}`
+
+//   await runDatabaseMigration()
+// }
+
+await setupDatabase()

storage/framework/core/types/src/app.ts

@@ -1,4 +1,4 @@
-export type AppEnvType = 'local' | 'dev' | 'stage' | 'prod' | string
+export type AppEnvType = 'local' | 'dev' | 'stage' | 'prod' | 'testing' | string
 
 /**
  * **Application Options**

storage/framework/orm/src/types.ts

@@ -24,6 +24,10 @@ export interface UserTeamsTable {
   user_id: number
   team_id: number
 }
+export interface MigrationsTable {
+  name: string
+  timestamp: string
+}
 export interface Database {
   projects: ProjectsTable
   subscriber_emails: SubscriberEmailsTable
@@ -37,4 +41,5 @@ export interface Database {
   user_teams: UserTeamsTable
   users: UsersTable
   posts: PostsTable
+  migrations: MigrationsTable
 }