feat: move interface

goravel · Oct 5, 2023 · ac7e93d · ac7e93d
1 parent 3be061b
commit ac7e93d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/contracts/database/gorm/wire_interface.go b/contracts/database/gorm/wire_interface.go
@@ -6,28 +6,14 @@ import (
 	gormio "gorm.io/gorm"
 
 	"github.com/goravel/framework/contracts/config"
-	"github.com/goravel/framework/database/gorm"
+	"github.com/goravel/framework/contracts/database/orm"
 )
 
 type Gorm interface {
 	Make() (*gormio.DB, error)
 }
 
 type Initialize interface {
-	InitializeGorm(config config.Config, connection string) *gorm.GormImpl
-	InitializeQuery(ctx context.Context, config config.Config, connection string) (*gorm.QueryImpl, error)
-}
-
-type InitializeImpl struct{}
-
-func NewInitializeImpl() *InitializeImpl {
-	return &InitializeImpl{}
-}
-
-func (receive *InitializeImpl) InitializeGorm(config config.Config, connection string) *gorm.GormImpl {
-	return gorm.InitializeGorm(config, connection)
-}
-
-func (receive *InitializeImpl) InitializeQuery(ctx context.Context, config config.Config, connection string) (*gorm.QueryImpl, error) {
-	return gorm.InitializeQuery(ctx, config, connection)
+	InitializeGorm(config config.Config, connection string) Gorm
+	InitializeQuery(ctx context.Context, config config.Config, connection string) (orm.Query, error)
 }
diff --git a/database/wire_interface.go b/database/wire_interface.go
@@ -0,0 +1,24 @@
+package database
+
+import (
+	"context"
+
+	"github.com/goravel/framework/contracts/config"
+	contractsgorm "github.com/goravel/framework/contracts/database/gorm"
+	"github.com/goravel/framework/contracts/database/orm"
+	"github.com/goravel/framework/database/gorm"
+)
+
+type InitializeImpl struct{}
+
+func NewInitializeImpl() *InitializeImpl {
+	return &InitializeImpl{}
+}
+
+func (receive *InitializeImpl) InitializeGorm(config config.Config, connection string) contractsgorm.Gorm {
+	return gorm.InitializeGorm(config, connection)
+}
+
+func (receive *InitializeImpl) InitializeQuery(ctx context.Context, config config.Config, connection string) (orm.Query, error) {
+	return gorm.InitializeQuery(ctx, config, connection)
+}