diff --git a/pkg/common/adapters/database/bun.go b/pkg/common/adapters/database/bun.go
index db50ec5..c64f3b4 100644
--- a/pkg/common/adapters/database/bun.go
+++ b/pkg/common/adapters/database/bun.go
@@ -208,9 +208,9 @@ type BunSelectQuery struct {
 	schema         string  // Separated schema name
 	tableName      string  // Just the table name, without schema
 	tableAlias     string
-	inJoinContext  bool   // Track if we're in a JOIN relation context
-	joinTableAlias string // Alias to use for JOIN conditions
-	skipAutoDetect bool   // Skip auto-detection to prevent circular calls
+	inJoinContext  bool                                                     // Track if we're in a JOIN relation context
+	joinTableAlias string                                                   // Alias to use for JOIN conditions
+	skipAutoDetect bool                                                     // Skip auto-detection to prevent circular calls
 	customPreloads map[string][]func(common.SelectQuery) common.SelectQuery // Relations to load with custom implementation
 }
 
diff --git a/pkg/common/adapters/database/utils.go b/pkg/common/adapters/database/utils.go
index 6235f44..981e716 100644
--- a/pkg/common/adapters/database/utils.go
+++ b/pkg/common/adapters/database/utils.go
@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"strings"
 
-	"github.com/bitechdev/ResolveSpec/pkg/logger"
 	"github.com/uptrace/bun/dialect/mssqldialect"
 	"github.com/uptrace/bun/dialect/pgdialect"
 	"github.com/uptrace/bun/dialect/sqlitedialect"
@@ -12,6 +11,8 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
+
+	"github.com/bitechdev/ResolveSpec/pkg/logger"
 )
 
 // PostgreSQL identifier length limit (63 bytes + null terminator = 64 bytes total)