chore: wip

Author: glennmichael123

storage/framework/core/database/src/drivers/mysql.ts

@@ -64,7 +64,7 @@ export async function resetMysqlDatabase() {
 
 export async function generateMysqlMigration(modelPath: string) {
   // check if any files are in the database folder
-  const files = await fs.readdir(path.userMigrationsPath())
+  // const files = await fs.readdir(path.userMigrationsPath())
 
   // if (files.length === 0) {
   //   log.debug('No migrations found in the database folder, deleting all framework/database/*.json files...')

storage/framework/core/database/src/drivers/postgres.ts

@@ -143,14 +143,14 @@ async function createTableMigration(modelPath: string) {
   for (const [fieldName, options] of arrangeColumns(model.attributes)) {
     const fieldOptions = options as Attribute
     const fieldNameFormatted = snakeCase(fieldName)
-    const columnType = mapFieldTypeToColumnType(fieldOptions.validations?.rule)
+    const columnType = mapFieldTypeToColumnType(fieldOptions.validation?.rule)
     migrationContent += `    .addColumn('${fieldNameFormatted}', '${columnType}'`
 
     // Check if there are configurations that require the lambda function
-    if (fieldOptions.unique || fieldOptions.validations?.rule?.required) {
+    if (fieldOptions.unique || fieldOptions.validation?.rule?.required) {
       migrationContent += `, col => col`
       if (fieldOptions.unique) migrationContent += `.unique()`
-      if (fieldOptions.validations?.rule?.required) migrationContent += `.notNull()`
+      if (fieldOptions.validation?.rule?.required) migrationContent += `.notNull()`
       migrationContent += ``
     }
 
@@ -245,7 +245,7 @@ async function createAlterTableMigration(modelPath: string) {
   // Add new fields
   for (const fieldName of fieldsToAdd) {
     const options = currentFields[fieldName] as Attribute
-    const columnType = mapFieldTypeToColumnType(options.validations?.rule)
+    const columnType = mapFieldTypeToColumnType(options.validation?.rule)
     migrationContent += `    .addColumn('${fieldName}', '${columnType}')\n`
   }
 

storage/framework/core/database/src/drivers/sqlite.ts

@@ -11,6 +11,7 @@ import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import {
   arrangeColumns,
   checkPivotMigration,
+  fetchTables,
   findDifferingKeys,
   getLastMigrationFields,
   hasTableBeenMigrated,
@@ -21,6 +22,13 @@ import {
 
 export async function resetSqliteDatabase() {
   await deleteFrameworkModels()
+  await deleteMigrationFiles()
+  await dropSqliteTables()
+
+  return ok('All tables dropped successfully!')
+}
+
+export async function deleteMigrationFiles() {
   const files = await fs.readdir(path.userMigrationsPath())
 
   if (files.length) {
@@ -32,26 +40,11 @@ export async function resetSqliteDatabase() {
       }
     }
   }
-
-  return ok('All tables dropped successfully!')
 }
 
 export async function deleteFrameworkModels() {
-  const dbPath = fetchSqliteFile()
-
-  if (fs.existsSync(dbPath)) await Bun.$`rm ${dbPath}`
-
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
 
-  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
-
-  for (const userModel of userModelFiles) {
-    const userModelPath = (await import(userModel)).default
-    const pivotTables = await getPivotTables(userModelPath, userModel)
-
-    for (const pivotTable of pivotTables) await db.schema.dropTable(pivotTable.table).ifExists().execute()
-  }
-
   if (modelFiles.length) {
     for (const modelFile of modelFiles) {
       if (modelFile.endsWith('.ts')) {
@@ -63,6 +56,22 @@ export async function deleteFrameworkModels() {
   }
 }
 
+export async function dropSqliteTables() {
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
+  const tables = await fetchTables()
+
+  for (const table of tables) await db.schema.dropTable(table).ifExists().execute()
+  await db.schema.dropTable('migrations').ifExists().execute()
+  await db.schema.dropTable('migration_locks').ifExists().execute()
+
+  for (const userModel of userModelFiles) {
+    const userModelPath = (await import(userModel)).default
+    const pivotTables = await getPivotTables(userModelPath, userModel)
+
+    for (const pivotTable of pivotTables) await db.schema.dropTable(pivotTable.table).ifExists().execute()
+  }
+}
+
 export function fetchSqliteFile(): string {
   if (app.env === 'testing') {
     return fetchTestSqliteFile()

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

@@ -1,24 +1,27 @@
 import { app, database } from '@stacksjs/config'
 import { log } from '@stacksjs/logging'
 import type { Database } from '@stacksjs/orm'
+import { path } from '@stacksjs/path'
 import { Kysely, MysqlDialect, PostgresDialect, sql } from 'kysely'
+import type { RawBuilder } from 'kysely'
 import { BunWorkerDialect } from 'kysely-bun-worker'
 import { createPool } from 'mysql2'
 import { Pool } from 'pg'
 
 const appEnv = app.env || 'local'
 
-export function getDialect() {
+export function getDialect(): MysqlDialect | PostgresDialect | BunWorkerDialect {
   const driver = database.default ?? 'sqlite'
 
   log.debug(`Using database driver: ${driver}`)
 
   if (driver === 'sqlite') {
     const defaultName = appEnv !== 'testing' ? 'database/stacks.sqlite' : 'database/stacks_testing.sqlite'
-    const path = database.connections?.sqlite.database ?? defaultName
+    const sqliteDbName = database.connections?.sqlite.database ?? defaultName
+    const dbPath = path.projectPath(sqliteDbName)
 
     return new BunWorkerDialect({
-      url: path,
+      url: dbPath,
     })
   }
 
@@ -52,8 +55,8 @@ export function getDialect() {
   throw new Error(`Unsupported driver: ${driver}`)
 }
 
-export const now = sql`now()`
+export const now: RawBuilder<any> = sql`now()`
 
-export const db = new Kysely<Database>({
+export const db: Kysely<Database> = new Kysely<Database>({
   dialect: getDialect(),
 })

storage/framework/core/storage/src/glob.ts

@@ -13,7 +13,7 @@ export interface GlobOptions {
   onlyFiles?: boolean
 }
 
-export const globSync = (patterns: string | string[], options?: Omit<GlobOptions, 'patterns'>) => {
+export const globSync = (patterns: string | string[], options?: Omit<GlobOptions, 'patterns'>): string[] => {
   if (typeof patterns === 'string') {
     return gs([patterns], options)
   }

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

@@ -1,7 +1,16 @@
 import { database } from '@stacksjs/config'
-import { copyModelFiles, db, deleteFrameworkModels, fetchTables, runDatabaseMigration, sql } from '@stacksjs/database'
+import {
+  copyModelFiles,
+  db,
+  deleteFrameworkModels,
+  dropSqliteTables,
+  fetchSqliteFile,
+  fetchTables,
+  runDatabaseMigration,
+  sql,
+} from '@stacksjs/database'
 import { path } from '@stacksjs/path'
-import { globSync } from '@stacksjs/storage'
+import { fs, globSync } from '@stacksjs/storage'
 
 const driver = database.default || ''
 
@@ -32,6 +41,11 @@ export async function truncateMysql() {
 }
 
 export async function truncateSqlite() {
+  const sqlitePath = fetchSqliteFile()
+
+  if (!fs.existsSync(sqlitePath)) await Bun.$`touch ${sqlitePath}`
+
+  await dropSqliteTables()
   await deleteFrameworkModels()
 
   const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })