chore: wip

Author: glennmichael123

database/migrations/1715721404982-create-users-table.ts renamed to database/migrations/1715780028681-create-users-table.ts

@@ -6,7 +6,9 @@ export async function up(db: Database<any>) {
     .createTable('subscribers')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer') 
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade').notNull()
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1715721404981-create-subscribers-table.ts renamed to database/migrations/1715780028682-create-subscribers-table.ts

@@ -7,7 +7,9 @@ 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') 
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade').notNull()
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1715721404983-create-posts-table.ts renamed to database/migrations/1715780028683-create-posts-table.ts

@@ -2,6 +2,7 @@ import { log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
 import { path } from '@stacksjs/path'
 import { fs } from '@stacksjs/storage'
+import { isString } from '@stacksjs/validation'
 import type { Attributes, Model, RelationConfig } from '@stacksjs/types'
 
 export * from './mysql'
@@ -112,14 +113,22 @@ export async function getRelations(model: Model): Promise<RelationConfig[]> {
   for (const relation of relationsArray) {
     if (hasRelations(model, relation)) {
       for (const relationInstance of model[relation]) {
-        const modelRelationPath = path.userModelsPath(`${relationInstance.model}.ts`)
+        let relationModel = relationInstance.model
+
+        if (isString(relationInstance)) {
+          relationModel = relationInstance
+        }
+
+        const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
         const modelRelation = (await import(modelRelationPath)).default
         const formattedModelName = model.name.toLowerCase()
 
         relationships.push({
           relationship: relation,
-          model: relationInstance.model,
+          model: relationModel,
           table: modelRelation.table,
+          relationModel: model.name,
+          relationTable: model.table,
           foreignKey: relationInstance.foreignKey || `${formattedModelName}_id`,
           relationName: relationInstance.relationName || '',
           throughModel: relationInstance.through || '',

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

@@ -173,10 +173,12 @@ async function createTableMigration(modelPath: string) {
     migrationContent += `)\n`
   }
 
-
   if (otherModelRelations?.length) {
+    console.log(otherModelRelations)
     for (const modelRelation of otherModelRelations) {
-      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer') \n`
+      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer', (col) =>
+        col.references('${modelRelation.relationTable}.id').onDelete('cascade').notNull()
+      ) \n`
     }
   }
 

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

@@ -152,7 +152,9 @@ async function createTableMigration(modelPath: string) {
 
   if (otherModelRelations?.length) {
     for (const modelRelation of otherModelRelations) {
-      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer') \n`
+      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer', (col) =>
+        col.references('${modelRelation.relationTable}.id').onDelete('cascade').notNull()
+      ) \n`
     }
   }
 

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

@@ -173,7 +173,9 @@ async function createTableMigration(modelPath: string): Promise<void> {
 
   if (otherModelRelations?.length) {
     for (const modelRelation of otherModelRelations) {
-      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer') \n`
+      migrationContent += `    .addColumn('${modelRelation.foreignKey}', 'integer', (col) =>
+        col.references('${modelRelation.relationTable}.id').onDelete('cascade').notNull()
+      ) \n`
     }
   }
 

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

@@ -57,7 +57,7 @@ export async function runDatabaseMigration() {
 
     if (results) {
       log.success('Database migrated successfully.')
-      return ok(migration)
+      return ok(results)
     }
 
     log.success('Database migration completed with no new migrations.')

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

@@ -122,6 +122,8 @@ export interface RelationConfig {
   relationship: string
   model: string
   table: string
+  relationModel: string
+  relationTable: string,
   foreignKey: string
   relationName: string
   throughModel: string

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

@@ -38,17 +38,7 @@ export default {
     // useUuid: true, // defaults to false
   },
 
-  hasMany: [
-    {
-      model: 'Post',
-    },
-  ],
-
-  hasOne: [
-    {
-      model: 'Subscriber',
-    },
-  ],
+  hasOne: ['Post', 'Subscriber'],
 
   attributes: {
     name: {