update test cases

database/schema/mysql_schema.go

@@ -36,23 +36,25 @@ func (r *MysqlSchema) DropAllTables() error {
 		return nil
 	}
 
-	if _, err = r.orm.Query().Exec(r.grammar.CompileDisableForeignKeyConstraints()); err != nil {
-		return err
-	}
+	return r.orm.Transaction(func(tx orm.Query) error {
+		if _, err = tx.Exec(r.grammar.CompileDisableForeignKeyConstraints()); err != nil {
+			return err
+		}
+
+		var dropTables []string
+		for _, table := range tables {
+			dropTables = append(dropTables, table.Name)
+		}
+		if _, err = tx.Exec(r.grammar.CompileDropAllTables(dropTables)); err != nil {
+			return err
+		}
+
+		if _, err = tx.Exec(r.grammar.CompileEnableForeignKeyConstraints()); err != nil {
+			return err
+		}
 
-	var dropTables []string
-	for _, table := range tables {
-		dropTables = append(dropTables, table.Name)
-	}
-	if _, err = r.orm.Query().Exec(r.grammar.CompileDropAllTables(dropTables)); err != nil {
 		return err
-	}
-
-	if _, err = r.orm.Query().Exec(r.grammar.CompileEnableForeignKeyConstraints()); err != nil {
-		return err
-	}
-
-	return err
+	})
 }
 
 func (r *MysqlSchema) DropAllTypes() error {

database/schema/postgres_schema.go

@@ -2,13 +2,11 @@ package schema
 
 import (
 	"fmt"
-	"slices"
-	"strings"
-
 	"github.com/goravel/framework/contracts/database/orm"
 	contractsschema "github.com/goravel/framework/contracts/database/schema"
 	"github.com/goravel/framework/database/schema/grammars"
 	"github.com/goravel/framework/database/schema/processors"
+	"slices"
 )
 
 type PostgresSchema struct {
@@ -81,19 +79,21 @@ func (r *PostgresSchema) DropAllTypes() error {
 		}
 	}
 
-	if len(dropTypes) > 0 {
-		if _, err := r.orm.Query().Exec(r.grammar.CompileDropAllTypes(dropTypes)); err != nil {
-			return err
+	return r.orm.Transaction(func(tx orm.Query) error {
+		if len(dropTypes) > 0 {
+			if _, err := tx.Exec(r.grammar.CompileDropAllTypes(dropTypes)); err != nil {
+				return err
+			}
 		}
-	}
 
-	if len(dropDomains) > 0 {
-		if _, err := r.orm.Query().Exec(r.grammar.CompileDropAllDomains(dropDomains)); err != nil {
-			return err
+		if len(dropDomains) > 0 {
+			if _, err := tx.Exec(r.grammar.CompileDropAllDomains(dropDomains)); err != nil {
+				return err
+			}
 		}
-	}
 
-	return nil
+		return nil
+	})
 }
 
 func (r *PostgresSchema) DropAllViews() error {
@@ -121,7 +121,11 @@ func (r *PostgresSchema) DropAllViews() error {
 }
 
 func (r *PostgresSchema) GetIndexes(table string) ([]contractsschema.Index, error) {
-	schema, table := r.parseSchemaAndTable(table)
+	schema, table, err := parseSchemaAndTable(table, r.schema)
+	if err != nil {
+		return nil, err
+	}
+
 	table = r.prefix + table
 
 	var dbIndexes []processors.DBIndex
@@ -140,16 +144,3 @@ func (r *PostgresSchema) GetTypes() ([]contractsschema.Type, error) {
 
 	return r.processor.ProcessTypes(types), nil
 }
-
-func (r *PostgresSchema) parseSchemaAndTable(reference string) (schema, table string) {
-	parts := strings.Split(reference, ".")
-	schema = r.schema
-	if len(parts) == 2 {
-		schema = parts[0]
-		parts = parts[1:]
-	}
-
-	table = parts[0]
-
-	return
-}

database/schema/sqlite_schema.go

@@ -48,20 +48,22 @@ func (r *SqliteSchema) DropAllTypes() error {
 }
 
 func (r *SqliteSchema) DropAllViews() error {
-	if _, err := r.orm.Query().Exec(r.grammar.CompileEnableWriteableSchema()); err != nil {
-		return err
-	}
-	if _, err := r.orm.Query().Exec(r.grammar.CompileDropAllViews(nil)); err != nil {
-		return err
-	}
-	if _, err := r.orm.Query().Exec(r.grammar.CompileDisableWriteableSchema()); err != nil {
-		return err
-	}
-	if _, err := r.orm.Query().Exec(r.grammar.CompileRebuild()); err != nil {
-		return err
-	}
+	return r.orm.Transaction(func(tx orm.Query) error {
+		if _, err := tx.Exec(r.grammar.CompileEnableWriteableSchema()); err != nil {
+			return err
+		}
+		if _, err := tx.Exec(r.grammar.CompileDropAllViews(nil)); err != nil {
+			return err
+		}
+		if _, err := tx.Exec(r.grammar.CompileDisableWriteableSchema()); err != nil {
+			return err
+		}
+		if _, err := tx.Exec(r.grammar.CompileRebuild()); err != nil {
+			return err
+		}
 
-	return nil
+		return nil
+	})
 }
 
 func (r *SqliteSchema) GetIndexes(table string) ([]schema.Index, error) {

database/schema/sqlserver_schema.go

@@ -1,8 +1,6 @@
 package schema
 
 import (
-	"strings"
-
 	"github.com/goravel/framework/contracts/database/orm"
 	contractsschema "github.com/goravel/framework/contracts/database/schema"
 	"github.com/goravel/framework/database/schema/grammars"
@@ -51,7 +49,11 @@ func (r *SqlserverSchema) DropAllViews() error {
 }
 
 func (r *SqlserverSchema) GetIndexes(table string) ([]contractsschema.Index, error) {
-	schema, table := r.parseSchemaAndTable(table)
+	schema, table, err := parseSchemaAndTable(table, "")
+	if err != nil {
+		return nil, err
+	}
+
 	table = r.prefix + table
 
 	var dbIndexes []processors.DBIndex
@@ -65,15 +67,3 @@ func (r *SqlserverSchema) GetIndexes(table string) ([]contractsschema.Index, err
 func (r *SqlserverSchema) GetTypes() ([]contractsschema.Type, error) {
 	return nil, nil
 }
-
-func (r *SqlserverSchema) parseSchemaAndTable(reference string) (schema, table string) {
-	parts := strings.Split(reference, ".")
-	if len(parts) == 2 {
-		schema = parts[0]
-		parts = parts[1:]
-	}
-
-	table = parts[0]
-
-	return
-}

database/schema/utils.go

@@ -0,0 +1,28 @@
+package schema
+
+import (
+	"strings"
+
+	"github.com/goravel/framework/errors"
+)
+
+func parseSchemaAndTable(reference, defaultSchema string) (string, string, error) {
+	if reference == "" {
+		return "", "", errors.SchemaEmptyReferenceString
+	}
+
+	parts := strings.Split(reference, ".")
+	if len(parts) > 2 {
+		return "", "", errors.SchemaErrorReferenceFormat
+	}
+
+	schema := defaultSchema
+	if len(parts) == 2 {
+		schema = parts[0]
+		parts = parts[1:]
+	}
+
+	table := parts[0]
+
+	return schema, table, nil
+}

database/schema/utils_test.go

@@ -0,0 +1,30 @@
+package schema
+
+import (
+	"testing"
+
+	"github.com/goravel/framework/errors"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseSchemaAndTable(t *testing.T) {
+	tests := []struct {
+		reference      string
+		defaultSchema  string
+		expectedSchema string
+		expectedTable  string
+		expectedError  error
+	}{
+		{"public.users", "public", "public", "users", nil},
+		{"users", "goravel", "goravel", "users", nil},
+		{"", "", "", "", errors.SchemaEmptyReferenceString},
+		{"public.users.extra", "", "", "", errors.SchemaErrorReferenceFormat},
+	}
+
+	for _, test := range tests {
+		schema, table, err := parseSchemaAndTable(test.reference, test.defaultSchema)
+		assert.Equal(t, test.expectedSchema, schema)
+		assert.Equal(t, test.expectedTable, table)
+		assert.Equal(t, test.expectedError, err)
+	}
+}

errors/list.go

@@ -112,10 +112,12 @@ var (
 	RouteDefaultDriverNotSet = New("please set default driver")
 	RouteInvalidDriver       = New("init %s route driver fail: route must be implement route.Route or func() (route.Route, error)")
 
-	SchemaDriverNotSupported  = New("driver %s is not supported")
-	SchemaFailedToCreateTable = New("failed to create %s table: %v")
-	SchemaFailedToDropTable   = New("failed to drop %s table: %v")
-	SchemaFailedToGetTables   = New("failed to get %s tables: %v")
+	SchemaDriverNotSupported   = New("driver %s is not supported")
+	SchemaFailedToCreateTable  = New("failed to create %s table: %v")
+	SchemaFailedToDropTable    = New("failed to drop %s table: %v")
+	SchemaFailedToGetTables    = New("failed to get %s tables: %v")
+	SchemaEmptyReferenceString = New("reference string can't be empty")
+	SchemaErrorReferenceFormat = New("invalid format: too many dots in reference")
 
 	SessionDriverAlreadyExists   = New("session driver [%s] already exists")
 	SessionDriverExtensionFailed = New("session failed to extend session [%s] driver [%v]")