chore: wip

glennmichael123 · glennmichael123 · commit d2258965cc4a · 2024-09-20T20:20:27.000+08:00
diff --git a/config/database.ts b/config/database.ts
@@ -13,7 +13,7 @@ export default {
 
   connections: {
     sqlite: {
-      database: env.DB_DATABASE || 'stacks',
+      database: env.DB_DATABASE || 'database/stacks.sqlite',
       prefix: '',
     },
 
diff --git a/database/migrations/1726834780810-create-projects-table.ts b/database/migrations/1726834780810-create-projects-table.ts
@@ -9,7 +9,7 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('url', 'varchar(255)')
     .addColumn('status', 'varchar(255)')
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780814-create-subscriber_emails-table.ts b/database/migrations/1726834780814-create-subscriber_emails-table.ts
@@ -6,8 +6,8 @@ export async function up(db: Database<any>) {
     .createTable('subscriber_emails')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('email', 'varchar(255)', col => col.unique())
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
-    .addColumn('deleted_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('deleted_at', 'text')
     .execute()
 }
diff --git a/database/migrations/1726834780818-create-personal_access_tokens-table.ts b/database/migrations/1726834780818-create-personal_access_tokens-table.ts
@@ -8,11 +8,8 @@ export async function up(db: Database<any>) {
     .addColumn('name', 'varchar(255)')
     .addColumn('token', 'varchar(512)', col => col.unique())
     .addColumn('plain_text_token', 'varchar(512)')
-    .addColumn('abilities', sql`enum('read', 'write', 'admin', 'read|write', 'read|admin', 'write|admin', 'read|write|admin')`)
-    .addColumn('team_id', 'integer', (col) =>
-        col.references('teams.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('abilities', 'text')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780822-create-team_personal_access_tokens-table.ts b/database/migrations/1726834780822-create-team_personal_access_tokens-table.ts
@@ -1,9 +1,9 @@
 import type { Database } from '@stacksjs/database'
 export async function up(db: Database<any>) {
   await db.schema
-    .createTable('personal_access_token_teams')
+    .createTable('team_personal_access_tokens')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
-    .addColumn('personal_access_token_id', 'integer')
+    .addColumn('accesstoken_id', 'integer')
     .execute()
     }
diff --git a/database/migrations/1726834780822-create-team_users-table.ts b/database/migrations/1726834780822-create-team_users-table.ts
diff --git a/database/migrations/1726834780823-create-teams-table.ts b/database/migrations/1726834780823-create-teams-table.ts
@@ -13,13 +13,7 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('path', 'varchar(255)')
     .addColumn('is_personal', 'boolean')
-    .addColumn('accesstoken_id', 'integer', (col) =>
-        col.references('personal_access_tokens.id').onDelete('cascade')
-      ) 
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780827-create-subscribers-table.ts b/database/migrations/1726834780827-create-subscribers-table.ts
@@ -6,10 +6,7 @@ export async function up(db: Database<any>) {
     .createTable('subscribers')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780830-create-deployments-table.ts b/database/migrations/1726834780830-create-deployments-table.ts
@@ -12,10 +12,7 @@ export async function up(db: Database<any>) {
     .addColumn('execution_time', 'integer')
     .addColumn('deploy_script', 'varchar(255)')
     .addColumn('terminal_output', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780832-create-releases-table.ts b/database/migrations/1726834780832-create-releases-table.ts
@@ -6,7 +6,7 @@ export async function up(db: Database<any>) {
     .createTable('releases')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('version', 'varchar(255)', col => col.unique())
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780834-create-user_teams-table.ts b/database/migrations/1726834780834-create-user_teams-table.ts
@@ -0,0 +1,9 @@
+import type { Database } from '@stacksjs/database'
+export async function up(db: Database<any>) {
+  await db.schema
+    .createTable('user_teams')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('user_id', 'integer')
+    .addColumn('team_id', 'integer')
+    .execute()
+    }
diff --git a/database/migrations/1726834780835-create-users-table.ts b/database/migrations/1726834780835-create-users-table.ts
@@ -7,14 +7,10 @@ export async function up(db: Database<any>) {
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('email', 'varchar(255)', col => col.unique().notNull())
     .addColumn('password', 'varchar(255)', col => col.notNull())
-    .addColumn('name', 'varchar(88)', col => col.notNull())
+    .addColumn('name', 'varchar(255)', col => col.notNull())
     .addColumn('job_title', 'varchar(255)', col => col.notNull())
     .addColumn('two_factor_secret', 'varchar(255)')
-    .addColumn('team_id', 'integer', (col) =>
-        col.references('teams.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
-    .addColumn('deleted_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/database/migrations/1726834780838-create-posts-table.ts b/database/migrations/1726834780838-create-posts-table.ts
@@ -7,10 +7,7 @@ export async function up(db: Database<any>) {
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'varchar(255)')
     .addColumn('body', 'varchar(255)')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
-    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
-    .addColumn('updated_at', 'timestamp')
+    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .execute()
 }
diff --git a/storage/framework/core/database/src/drivers/index.ts b/storage/framework/core/database/src/drivers/index.ts
@@ -53,8 +53,12 @@ function hasFunction(rule: VineType, functionName: string): boolean {
   return typeof rule[functionName] === 'function'
 }
 
-export function mapFieldTypeToColumnType(rule: VineType): string {
+export function mapFieldTypeToColumnType(rule: VineType, driver = 'mysql'): string {
   if (hasFunction(rule, 'getChoices')) {
+    if (driver === 'sqlite') {
+      return `'text'`
+    }
+
     // Condition checker if an attribute is enum, could not think any conditions atm
     const enumChoices = rule.getChoices() as string[]
 
diff --git a/storage/framework/core/database/src/drivers/mysql.ts b/storage/framework/core/database/src/drivers/mysql.ts
@@ -30,7 +30,7 @@ export async function resetMysqlDatabase() {
 
   const files = await fs.readdir(path.userMigrationsPath())
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
-  const userModelFiles = globSync([path.userModelsPath('*.ts')])
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
   for (const userModel of userModelFiles) {
     const model = (await import(userModel)).default as Model
@@ -129,7 +129,8 @@ async function createTableMigration(modelPath: string) {
   const model = (await import(modelPath)).default as Model
   const tableName = getTableName(model, modelPath)
 
-  const twoFactorEnabled = model.traits?.useAuth?.useTwoFactor
+  const twoFactorEnabled =
+    model.traits?.useAuth && typeof model.traits.useAuth !== 'boolean' ? model.traits.useAuth.useTwoFactor : false
 
   await createPivotTableMigration(model, modelPath)
   const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
@@ -189,6 +190,8 @@ async function createTableMigration(modelPath: string) {
   const migrationFileName = `${timestamp}-create-${tableName}-table.ts`
   const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
+  console.log(migrationFilePath)
+
   Bun.write(migrationFilePath, migrationContent)
 
   log.success(`Created migration: ${italic(migrationFileName)}`)
@@ -216,6 +219,7 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
 
     const timestamp = new Date().getTime().toString()
     const migrationFileName = `${timestamp}-create-${pivotTable.table}-table.ts`
+
     const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
     Bun.write(migrationFilePath, migrationContent)
diff --git a/storage/framework/core/database/src/drivers/postgres.ts b/storage/framework/core/database/src/drivers/postgres.ts
@@ -27,7 +27,7 @@ export async function resetPostgresDatabase() {
   const files = await fs.readdir(path.userMigrationsPath())
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
 
-  const userModelFiles = globSync([path.userModelsPath('*.ts')])
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
   for (const userModel of userModelFiles) {
     const userModelPath = (await import(userModel)).default
diff --git a/storage/framework/core/database/src/drivers/sqlite.ts b/storage/framework/core/database/src/drivers/sqlite.ts
@@ -5,7 +5,7 @@ import { ok } from '@stacksjs/error-handling'
 import { getModelName, getTableName } from '@stacksjs/orm'
 import { fetchOtherModelRelations, getPivotTables } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
-import { fs, glob, globSync } from '@stacksjs/storage'
+import { fs, globSync } from '@stacksjs/storage'
 import { snakeCase } from '@stacksjs/strings'
 import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import {
@@ -27,8 +27,10 @@ export async function resetSqliteDatabase() {
   const files = await fs.readdir(path.userMigrationsPath())
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
 
-  const userModelFiles = globSync([path.userModelsPath('*.ts')])
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
+
   for (const userModel of userModelFiles) {
+    console.log(userModel)
     const userModelPath = (await import(userModel)).default
     const pivotTables = await getPivotTables(userModelPath, userModel)
 
@@ -60,36 +62,33 @@ export async function resetSqliteDatabase() {
 
 export function fetchSqliteFile(): string {
   if (app.env === 'testing') {
+    return fetchTestSqliteFile()
   }
 
-  const dbPath = path.userDatabasePath('stacks.sqlite')
-
-  return dbPath
+  return path.userDatabasePath('stacks.sqlite')
 }
 
 export function fetchTestSqliteFile(): string {
-  const dbPath = path.userDatabasePath('stacks_testing.sqlite')
-
-  return dbPath
+  return path.userDatabasePath('stacks_testing.sqlite')
 }
 
 export async function generateSqliteMigration(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...')
+  // if (files.length === 0) {
+  //   log.debug('No migrations found in the database folder, deleting all framework/database/*.json files...')
 
-    // delete the *.ts files in the database/models folder
-    const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
+  //   // delete the *.ts files in the database/models folder
+  //   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
 
-    if (modelFiles.length) {
-      log.debug('No existing model files in framework path...')
+  //   if (modelFiles.length) {
+  //     log.debug('No existing model files in framework path...')
 
-      for (const file of modelFiles)
-        if (file.endsWith('.ts')) await fs.unlink(path.frameworkPath(`database/models/${file}`))
-    }
-  }
+  //     for (const file of modelFiles)
+  //       if (file.endsWith('.ts')) await fs.unlink(path.frameworkPath(`database/models/${file}`))
+  //   }
+  // }
 
   const model = (await import(modelPath)).default as Model
   const fileName = path.basename(modelPath)
@@ -139,7 +138,8 @@ async function createTableMigration(modelPath: string) {
   const model = (await import(modelPath)).default as Model
   const tableName = getTableName(model, modelPath)
 
-  const twoFactorEnabled = model.traits?.useAuth?.useTwoFactor
+  const twoFactorEnabled =
+    model.traits?.useAuth && typeof model.traits.useAuth !== 'boolean' ? model.traits.useAuth.useTwoFactor : false
 
   await createPivotTableMigration(model, modelPath)
   const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
@@ -157,7 +157,7 @@ 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.validation?.rule)
+    const columnType = mapFieldTypeToColumnType(fieldOptions.validation?.rule, 'sqlite')
     migrationContent += `    .addColumn('${fieldNameFormatted}', ${columnType}`
 
     // Check if there are configurations that require the lambda function
@@ -185,12 +185,12 @@ async function createTableMigration(modelPath: string) {
 
   // Append created_at and updated_at columns if useTimestamps is true
   if (useTimestamps) {
-    migrationContent += `    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))\n`
-    migrationContent += `    .addColumn('updated_at', 'timestamp')\n`
+    migrationContent += "    .addColumn('created_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))\n"
+    migrationContent += "    .addColumn('updated_at', 'text', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))\n"
   }
 
   // Append deleted_at column if useSoftDeletes is true
-  if (useSoftDeletes) migrationContent += `    .addColumn('deleted_at', 'timestamp')\n`
+  if (useSoftDeletes) migrationContent += `    .addColumn('deleted_at', 'text')\n`
 
   migrationContent += `    .execute()\n`
   migrationContent += `}\n`
@@ -199,6 +199,8 @@ async function createTableMigration(modelPath: string) {
   const migrationFileName = `${timestamp}-create-${tableName}-table.ts`
   const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
+  console.log(migrationFilePath)
+
   Bun.write(migrationFilePath, migrationContent)
 
   log.success(`Created migration: ${italic(migrationFileName)}`)
@@ -226,6 +228,7 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
 
     const timestamp = new Date().getTime().toString()
     const migrationFileName = `${timestamp}-create-${pivotTable.table}-table.ts`
+
     const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
     Bun.write(migrationFilePath, migrationContent)
@@ -279,7 +282,7 @@ async function createAlterTableMigration(modelPath: string) {
   // Add new fields
   for (const fieldName of fieldsToAdd) {
     const options = currentFields[fieldName] as Attribute
-    const columnType = mapFieldTypeToColumnType(options.validation?.rule)
+    const columnType = mapFieldTypeToColumnType(options.validation?.rule, 'sqlite')
     const formattedFieldName = snakeCase(fieldName)
 
     migrationContent += `    .addColumn('${formattedFieldName}', ${columnType}`
@@ -326,7 +329,7 @@ function reArrangeColumns(attributes: Attributes | undefined, tableName: string)
   let migrationContent = ''
 
   let previousField = ''
-  for (const [fieldName, options] of fields) {
+  for (const [fieldName] of fields) {
     const fieldNameFormatted = snakeCase(fieldName)
 
     if (previousField) {
diff --git a/storage/framework/core/database/src/migrations.ts b/storage/framework/core/database/src/migrations.ts
@@ -82,7 +82,7 @@ export async function generateMigrations() {
   try {
     log.info('Generating migrations...')
 
-    const modelFiles = globSync([path.userModelsPath('*.ts')])
+    const modelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
     for (const file of modelFiles) {
       log.debug('Generating migration for:', file)
diff --git a/storage/framework/core/database/src/utils.ts b/storage/framework/core/database/src/utils.ts
@@ -6,20 +6,13 @@ import { BunWorkerDialect } from 'kysely-bun-worker'
 import { createPool } from 'mysql2'
 import { Pool } from 'pg'
 
-const appEnv = app.env
+const appEnv = app.env || 'local'
 
 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 defaultName = appEnv !== 'testing' ? 'database/stacks.sqlite' : 'database/stacks_testing.sqlite'
     const path = database.connections?.sqlite.database ?? defaultName
@@ -32,7 +25,7 @@ export function getDialect() {
   if (driver === 'mysql') {
     return new MysqlDialect({
       pool: createPool({
-        database: dbName, // Use modified dbName
+        database: database.connections?.mysql?.name || 'stacks', // Use modified dbName
         host: database.connections?.mysql?.host ?? '127.0.0.1',
         user: database.connections?.mysql?.username ?? 'root',
         password: database.connections?.mysql?.password ?? '',
diff --git a/storage/framework/core/orm/src/utils.ts b/storage/framework/core/orm/src/utils.ts
diff --git a/storage/framework/core/testing/src/database.ts b/storage/framework/core/testing/src/database.ts
diff --git a/storage/framework/database/models/User.ts b/storage/framework/database/models/User.ts
