improve WhereBuilder feature for package gdb

Author: gqcn

database/gdb/gdb_model.go

@@ -135,7 +135,6 @@ func (c *Core) Model(tableNameQueryOrStruct ...interface{}) *Model {
 		extraArgs:  extraArgs,
 	}
 	m.whereBuilder = m.Builder()
-	m.whereBuilder.safe = &m.safe
 	if defaultModelSafe {
 		m.safe = true
 	}

database/gdb/gdb_model_builder.go

@@ -12,7 +12,6 @@ import (
 
 // WhereBuilder holds multiple where conditions in a group.
 type WhereBuilder struct {
-	safe        *bool         // If nil, it uses the safe attribute of its model.
 	model       *Model        // A WhereBuilder should be bound to certain Model.
 	whereHolder []WhereHolder // Condition strings for where operation.
 }
@@ -28,10 +27,7 @@ type WhereHolder struct {
 
 // Builder creates and returns a WhereBuilder.
 func (m *Model) Builder() *WhereBuilder {
-	// The WhereBuilder is safe in default when it is created using Builder().
-	var isSafe = true
 	b := &WhereBuilder{
-		safe:        &isSafe,
 		model:       m,
 		whereHolder: make([]WhereHolder, 0),
 	}
@@ -41,23 +37,12 @@ func (m *Model) Builder() *WhereBuilder {
 // getBuilder creates and returns a cloned WhereBuilder of current WhereBuilder if `safe` is true,
 // or else it returns the current WhereBuilder.
 func (b *WhereBuilder) getBuilder() *WhereBuilder {
-	var isSafe bool
-	if b.safe != nil {
-		isSafe = *b.safe
-	} else {
-		isSafe = b.model.safe
-	}
-	if !isSafe {
-		return b
-	} else {
-		return b.Clone()
-	}
+	return b.Clone()
 }
 
 // Clone clones and returns a WhereBuilder that is a copy of current one.
 func (b *WhereBuilder) Clone() *WhereBuilder {
 	newBuilder := b.model.Builder()
-	newBuilder.safe = b.safe
 	newBuilder.whereHolder = make([]WhereHolder, len(b.whereHolder))
 	copy(newBuilder.whereHolder, b.whereHolder)
 	return newBuilder
@@ -125,6 +110,7 @@ func (b *WhereBuilder) convertWhereBuilder(where interface{}, args []interface{}
 	switch v := where.(type) {
 	case WhereBuilder:
 		builder = &v
+
 	case *WhereBuilder:
 		builder = v
 	}

frame/gins/gins_database.go

@@ -53,45 +53,24 @@ func Database(name ...string) gdb.DB {
 		if v, _ := Config().Get(ctx, configNodeKey); !v.IsEmpty() {
 			configMap = v.Map()
 		}
+		// No configuration found, it formats and panics error.
 		if len(configMap) == 0 && !gdb.IsConfigured() {
 			// File configuration object checks.
-			var (
-				err            error
-				configFilePath string
-			)
+			var err error
 			if fileConfig, ok := Config().GetAdapter().(*gcfg.AdapterFile); ok {
-				if configFilePath, _ = fileConfig.GetFilePath(); configFilePath == "" {
-					var (
-						exampleFileName       = "config.example.toml"
-						exampleConfigFilePath string
-					)
-					if exampleConfigFilePath, _ = fileConfig.GetFilePath(exampleFileName); exampleConfigFilePath != "" {
-						err = gerror.NewCodef(
-							gcode.CodeMissingConfiguration,
-							`configuration file "%s" not found, but found "%s", did you miss renaming the example configuration file?`,
-							fileConfig.GetFileName(),
-							exampleFileName,
-						)
-					} else {
-						err = gerror.NewCodef(
-							gcode.CodeMissingConfiguration,
-							`configuration file "%s" not found, did you miss the configuration file or the misspell the configuration file name?`,
-							fileConfig.GetFileName(),
-						)
-					}
-					if err != nil {
-						panic(err)
-					}
+				if _, err = fileConfig.GetFilePath(); err != nil {
+					panic(gerror.WrapCode(gcode.CodeMissingConfiguration, err,
+						`configuration not found, did you miss the configuration file or the misspell the configuration file name`,
+					))
 				}
 			}
 			// Panic if nothing found in Config object or in gdb configuration.
 			if len(configMap) == 0 && !gdb.IsConfigured() {
-				err = gerror.NewCodef(
+				panic(gerror.NewCodef(
 					gcode.CodeMissingConfiguration,
-					`database initialization failed: "%s" node not found, is configuration file or configuration node missing?`,
+					`database initialization failed: configuration missing for database node "%s"`,
 					consts.ConfigNodeNameDatabase,
-				)
-				panic(err)
+				))
 			}
 		}