chore: wip

stacksjs · May 18, 2024 · ff49b33 · ff49b33
1 parent c5e9b94
commit ff49b33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/storage/framework/core/database/src/drivers/mysql.ts b/storage/framework/core/database/src/drivers/mysql.ts
@@ -145,12 +145,10 @@ async function createTableMigration(modelPath: string) {
   await createPivotTableMigration(model)
 
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
-
   const otherModelRelations = await fetchOtherModelRelations(model, modelFiles)
-
-  const fields = model.attributes as Attributes
-  const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable
-  const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable
+  const fields = model.attributes
+  const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
+  const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
 
   let migrationContent = `import type { Database } from '@stacksjs/database'\n`
   migrationContent += `import { sql } from '@stacksjs/database'\n\n`

diff --git a/storage/framework/core/database/src/drivers/postgres.ts b/storage/framework/core/database/src/drivers/postgres.ts
@@ -123,8 +123,8 @@ async function createTableMigration(modelPath: string) {
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
   const otherModelRelations = await fetchOtherModelRelations(model, modelFiles)
   const fields = model.attributes
-  const useTimestamps = model.traits?.useTimestamps ?? model.traits?.timestampable
-  const useSoftDeletes = model.traits?.useSoftDeletes ?? model.traits?.softDeletable
+  const useTimestamps = model.traits?.useTimestamps ?? model.traits?.timestampable ?? true
+  const useSoftDeletes = model.traits?.useSoftDeletes ?? model.traits?.softDeletable ?? false
 
   let migrationContent = `import type { Database } from '@stacksjs/database'\n`
   migrationContent += `import { sql } from '@stacksjs/database'\n\n`

diff --git a/storage/framework/core/database/src/drivers/sqlite.ts b/storage/framework/core/database/src/drivers/sqlite.ts
@@ -142,12 +142,10 @@ async function createTableMigration(modelPath: string): Promise<void> {
 
   await createPivotTableMigration(model)
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
-
   const otherModelRelations = await fetchOtherModelRelations(model, modelFiles)
-
-  const fields = model.attributes as Attributes
-  const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable
-  const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable
+  const fields = model.attributes
+  const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
+  const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
 
   let migrationContent = `import type { Database } from '@stacksjs/database'\n`
   migrationContent += `import { sql } from '@stacksjs/database'\n\n`