@stacksjs/database 0.61.20 → 0.61.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/database",
   "type": "module",
-  "version": "0.61.20",
+  "version": "0.61.21",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -71,14 +71,14 @@
     "kysely-bun-worker": "^0.6.1"
   },
   "optionalDependencies": {
-    "mysql2": "^3.9.7"
+    "mysql2": "^3.10.0"
   },
   "devDependencies": {
     "@stacksjs/development": "latest",
     "@types/tar": "^6.1.13",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "mkdirp": "^3.0.1",
     "q": "^1.5.1",
-    "tar": "^7.1.0"
+    "tar": "^7.2.0"
   }
 }

package/src/drivers/index.ts

@@ -1,5 +1,6 @@
 import { log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
+import { getModelName, getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
 import { plural, snakeCase } from '@stacksjs/strings'
@@ -130,7 +131,7 @@ export async function checkPivotMigration(dynamicPart: string): Promise<boolean>
   })
 }
 
-export async function getRelations(model: Model): Promise<RelationConfig[]> {
+export async function getRelations(model: Model, modelPath: string): Promise<RelationConfig[]> {
   const relationsArray = ['hasOne', 'hasMany', 'belongsToMany', 'hasOneThrough']
   const relationships = []
 
@@ -145,19 +146,25 @@ export async function getRelations(model: Model): Promise<RelationConfig[]> {
 
         const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
         const modelRelation = (await import(modelRelationPath)).default
-        const formattedModelName = model.name?.toLowerCase()
+
+
+        const modelName = getModelName(model, modelPath)
+        const formattedModelName = modelName.toLowerCase()
+        const tableName = getTableName(model, modelPath)
+
+        const modelRelationTable = getModelName(modelRelation, modelRelationPath)
 
         relationships.push({
           relationship: relation,
           model: relationModel,
-          table: modelRelation.table,
-          relationModel: model.name,
-          relationTable: model.table,
+          table: modelRelationTable,
+          relationModel: modelName,
+          relationTable: tableName,
           foreignKey: relationInstance.foreignKey || `${formattedModelName}_id`,
           relationName: relationInstance.relationName || '',
           throughModel: relationInstance.through || '',
           throughForeignKey: relationInstance.throughForeignKey || '',
-          pivotTable: relationInstance?.pivotTable || `${formattedModelName}_${modelRelation.table}`,
+          pivotTable: relationInstance?.pivotTable || `${formattedModelName}_${modelRelationTable}`,
         })
       }
     }
@@ -166,7 +173,7 @@ export async function getRelations(model: Model): Promise<RelationConfig[]> {
   return relationships
 }
 
-export async function fetchOtherModelRelations(model: Model): Promise<RelationConfig[]> {
+export async function fetchOtherModelRelations(model: Model, modelPath: string): Promise<RelationConfig[]> {
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
 
   const modelRelations = []
@@ -174,15 +181,20 @@ export async function fetchOtherModelRelations(model: Model): Promise<RelationCo
   for (let i = 0; i < modelFiles.length; i++) {
     const modelFileElement = modelFiles[i] as string
 
-    const modelFile = await import(modelFileElement)
+    const modelFile = (await import(modelFileElement)).default as Model
+
+    const tableName = getTableName(model, modelPath)
+    const modelName = getModelName(model, modelPath)
 
-    if (model.name === modelFile.default.name) continue
+    const modelFileName = getTableName(modelFile, modelFileElement)
 
-    const relations = await getRelations(modelFile.default)
+    if (tableName === modelFileName) continue
+
+    const relations = await getRelations(modelFile, modelFileElement)
 
     if (!relations.length) continue
 
-    const relation = relations.find((relation) => relation.model === model.name)
+    const relation = relations.find((relation) => relation.model === modelName)
 
     if (relation) modelRelations.push(relation)
   }
@@ -192,23 +204,29 @@ export async function fetchOtherModelRelations(model: Model): Promise<RelationCo
 
 export async function getPivotTables(
   model: Model,
+  modelPath: string
 ): Promise<{ table: string; firstForeignKey: string | undefined; secondForeignKey: string | undefined }[]> {
   const pivotTable = []
 
-  if (model.belongsToMany && model.name) {
+  const modelName = getTableName(model, modelPath)
+
+  if (model.belongsToMany) {
     if ('belongsToMany' in model) {
       for (const belongsToManyRelation of model.belongsToMany) {
         const modelRelationPath = path.userModelsPath(`${belongsToManyRelation}.ts`)
         const modelRelation = (await import(modelRelationPath)).default
-        const formattedModelName = model.name.toLowerCase()
+        const formattedModelName = modelName.toLowerCase()
+
+        const modelRelationTable = getTableName(modelRelation, modelRelationPath)
+        const modelRelationModelName = getModelName(modelRelation, modelRelationPath)
 
         const firstForeignKey =
-          belongsToManyRelation.firstForeignKey || `${model.name?.toLowerCase()}_${model.primaryKey}`
+          belongsToManyRelation.firstForeignKey || `${modelName.toLowerCase()}_${model.primaryKey}`
         const secondForeignKey =
-          belongsToManyRelation.secondForeignKey || `${modelRelation.name?.toLowerCase()}_${model.primaryKey}`
+          belongsToManyRelation.secondForeignKey || `${modelRelationModelName.toLowerCase()}_${model.primaryKey}`
 
         pivotTable.push({
-          table: belongsToManyRelation?.pivotTable || `${formattedModelName}_${modelRelation.table}`,
+          table: belongsToManyRelation?.pivotTable || `${formattedModelName}_${modelRelationTable}`,
           firstForeignKey: firstForeignKey,
           secondForeignKey: secondForeignKey,
         })

package/src/drivers/mysql.ts

@@ -11,8 +11,8 @@ import {
   getPivotTables,
   hasTableBeenMigrated,
   mapFieldTypeToColumnType,
-  modelTableName,
 } from '.'
+import { getModelName, getTableName } from '@stacksjs/orm'
 
 export async function resetMysqlDatabase() {
   const tables = await fetchMysqlTables()
@@ -29,7 +29,7 @@ export async function resetMysqlDatabase() {
 
   for (const userModel of userModelFiles) {
     const model = (await import(userModel)).default as Model
-    const pivotTables = await getPivotTables(model)
+    const pivotTables = await getPivotTables(model, userModel)
 
     for (const pivotTable of pivotTables) await db.schema.dropTable(pivotTable.table).ifExists().execute()
   }
@@ -78,7 +78,7 @@ export async function generateMysqlMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const fileName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
   const fieldsString = JSON.stringify(model.attributes, null, 2) // Pretty print the JSON
   const copiedModelPath = path.frameworkPath(`database/models/${fileName}`)
@@ -122,11 +122,11 @@ async function createTableMigration(modelPath: string) {
   log.debug('createTableMigration modelPath:', modelPath)
 
   const model = (await import(modelPath)).default as Model
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
-  await createPivotTableMigration(model)
+  await createPivotTableMigration(model, modelPath)
 
-  const otherModelRelations = await fetchOtherModelRelations(model)
+  const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
 
   const fields = model.attributes
   const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
@@ -185,8 +185,8 @@ async function createTableMigration(modelPath: string) {
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-async function createPivotTableMigration(model: Model) {
-  const pivotTables = await getPivotTables(model)
+async function createPivotTableMigration(model: Model, modelPath: string) {
+  const pivotTables = await getPivotTables(model, modelPath)
 
   if (!pivotTables.length) return
 
@@ -220,8 +220,8 @@ export async function createAlterTableMigration(modelPath: string) {
   console.log('createAlterTableMigration')
 
   const model = (await import(modelPath)).default as Model
-  const modelName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const modelName = getModelName(model, modelPath)
+  const tableName = await getTableName(model, modelPath)
 
   // Assuming you have a function to get the fields from the last migration
   // For simplicity, this is not implemented here
@@ -267,7 +267,7 @@ export async function fetchMysqlTables(): Promise<string[]> {
 
   for (const modelPath of modelFiles) {
     const model = (await import(modelPath)).default as Model
-    const tableName = await modelTableName(model)
+    const tableName = await getTableName(model, modelPath)
 
     tables.push(tableName)
   }

package/src/drivers/postgres.ts

@@ -1,10 +1,10 @@
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
 import { ok } from '@stacksjs/error-handling'
-import { modelTableName } from '@stacksjs/orm'
+import { getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
-import type { Attribute, Attributes, Model } from '@stacksjs/types'
+import type { Attribute, Model } from '@stacksjs/types'
 import {
   checkPivotMigration,
   fetchOtherModelRelations,
@@ -28,9 +28,9 @@ export async function resetPostgresDatabase() {
   const userModelFiles = glob.sync(path.userModelsPath('*.ts'))
 
   for (const userModel of userModelFiles) {
-    const userModelPath = await import(userModel)
+    const userModelPath = (await import(userModel)).default
 
-    const pivotTables = await getPivotTables(userModelPath)
+    const pivotTables = await getPivotTables(userModelPath, userModelPath)
 
     for (const pivotTable of pivotTables) await db.schema.dropTable(pivotTable.table).ifExists().execute()
   }
@@ -79,7 +79,7 @@ export async function generatePostgresMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const fileName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const tableName = getTableName(model, modelPath)
 
   const fieldsString = JSON.stringify(model.attributes, null, 2) // Pretty print the JSON
   const copiedModelPath = path.frameworkPath(`database/models/${fileName}`)
@@ -123,11 +123,11 @@ async function createTableMigration(modelPath: string) {
   log.debug('createTableMigration modelPath:', modelPath)
 
   const model = (await import(modelPath)).default as Model
-  const tableName = await modelTableName(model)
+  const tableName = getTableName(model, modelPath)
 
-  await createPivotTableMigration(model)
+  await createPivotTableMigration(model, modelPath)
 
-  const otherModelRelations = await fetchOtherModelRelations(model)
+  const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
   const fields = model.attributes
   const useTimestamps = model.traits?.useTimestamps ?? model.traits?.timestampable ?? true
   const useSoftDeletes = model.traits?.useSoftDeletes ?? model.traits?.softDeletable ?? false
@@ -185,8 +185,8 @@ async function createTableMigration(modelPath: string) {
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-async function createPivotTableMigration(model: any) {
-  const pivotTables = await getPivotTables(model)
+async function createPivotTableMigration(model: Model, modelPath: string) {
+  const pivotTables = await getPivotTables(model, modelPath)
 
   if (!pivotTables.length) return
   for (const pivotTable of pivotTables) {
@@ -221,7 +221,7 @@ export async function createAlterTableMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const modelName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
   // Assuming you have a function to get the fields from the last migration
   // For simplicity, this is not implemented here
@@ -266,9 +266,9 @@ export async function fetchMysqlTables(): Promise<string[]> {
   const tables: string[] = []
 
   for (const modelPath of modelFiles) {
-    const model = await import(modelPath)
+    const model = (await import(modelPath)).default
 
-    const tableName = await modelTableName(model)
+    const tableName = await getTableName(model, modelPath)
 
     tables.push(tableName)
   }

package/src/drivers/sqlite.ts

@@ -1,7 +1,7 @@
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
 import { ok } from '@stacksjs/error-handling'
-import { modelTableName } from '@stacksjs/orm'
+import { getTableName, getModelName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
 import type { Attribute, Attributes, Model } from '@stacksjs/types'
@@ -25,9 +25,9 @@ export async function resetSqliteDatabase() {
   const userModelFiles = glob.sync(path.userModelsPath('*.ts'))
 
   for (const userModel of userModelFiles) {
-    const userModelPath = await import(userModel)
+    const userModelPath = (await import(userModel)).default
 
-    const pivotTables = await getPivotTables(userModelPath)
+    const pivotTables = await getPivotTables(userModelPath, userModel)
 
     for (const pivotTable of pivotTables) await db.schema.dropTable(pivotTable.table).ifExists().execute()
   }
@@ -75,7 +75,7 @@ export async function generateSqliteMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const fileName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
   const fieldsString = JSON.stringify(model.attributes, null, 2) // Pretty print the JSON
   const copiedModelPath = path.frameworkPath(`database/models/${fileName}`)
@@ -119,10 +119,10 @@ async function createTableMigration(modelPath: string): Promise<void> {
   log.debug('createTableMigration modelPath:', modelPath)
 
   const model = (await import(modelPath)).default as Model
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
-  await createPivotTableMigration(model)
-  const otherModelRelations = await fetchOtherModelRelations(model)
+  await createPivotTableMigration(model, modelPath)
+  const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
   const fields = model.attributes
   const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
   const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
@@ -180,8 +180,8 @@ async function createTableMigration(modelPath: string): Promise<void> {
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-async function createPivotTableMigration(model: Model) {
-  const pivotTables = await getPivotTables(model)
+async function createPivotTableMigration(model: Model, modelPath: string) {
+  const pivotTables = await getPivotTables(model, modelPath)
 
   if (!pivotTables.length) return
 
@@ -215,8 +215,8 @@ export async function createAlterTableMigration(modelPath: string) {
   console.log('createAlterTableMigration')
 
   const model = (await import(modelPath)).default as Model
-  const modelName = path.basename(modelPath)
-  const tableName = await modelTableName(model)
+  const modelName = getModelName(model, modelPath)
+  const tableName = await getTableName(model, modelPath)
 
   // Assuming you have a function to get the fields from the last migration
   // For simplicity, this is not implemented here