Merge pull request #17 from trheyi/main

feat: Implement Driver method and ExecWrite for enhanced query execution

Author: trheyi

dbal/query/builder.go

@@ -33,6 +33,23 @@ func UseBuilder(conn *Connection) *Builder {
 	return useBuilder(conn)
 }
 
+// Driver Get the driver name
+func (builder *Builder) Driver() (string, error) {
+	if builder.Conn == nil {
+		return "", fmt.Errorf("the connection is nil")
+	}
+
+	if builder.Conn.WriteConfig != nil {
+		return builder.Conn.WriteConfig.Driver, nil
+	}
+
+	if builder.Conn.ReadConfig != nil {
+		return builder.Conn.ReadConfig.Driver, nil
+	}
+
+	return "", fmt.Errorf("the connection is nil")
+}
+
 // Clone create a new builder instance with current builder
 func (builder *Builder) Clone() Query {
 	return builder.clone()

dbal/query/builder_test.go

@@ -54,3 +54,12 @@ func TestBuilderNew(t *testing.T) {
 	dbReadonly := qb.DB(true)
 	assert.True(t, dbReadonly.Ping() == nil, "The read-only connection should be made")
 }
+
+func TestBuilderDriver(t *testing.T) {
+	defer unit.Catch()
+	unit.SetLogger()
+	qb := getTestBuilder()
+	driver, err := qb.Driver()
+	assert.Nil(t, err, "The error should be nil")
+	assert.Equal(t, unit.Driver(), driver, "The driver should be mysql")
+}

dbal/query/exec.go

@@ -2,7 +2,7 @@ package query
 
 import "database/sql"
 
-// Exec execute the sql, return the result
+// Exec Use the current connection to execute the sql, return the result
 func (builder *Builder) Exec(sql string, bindings ...interface{}) (sql.Result, error) {
 	stmt, err := builder.DB().Prepare(sql)
 	if err != nil {
@@ -11,3 +11,13 @@ func (builder *Builder) Exec(sql string, bindings ...interface{}) (sql.Result, e
 	defer stmt.Close()
 	return stmt.Exec(bindings...)
 }
+
+// ExecWrite Use the write connection to execute the sql, return the result
+func (builder *Builder) ExecWrite(sql string, bindings ...interface{}) (sql.Result, error) {
+	stmt, err := builder.DB(true).Prepare(sql)
+	if err != nil {
+		return nil, err
+	}
+	defer stmt.Close()
+	return stmt.Exec(bindings...)
+}

dbal/query/exec_test.go

@@ -39,3 +39,34 @@ func TestExec(t *testing.T) {
 		assert.Equal(t, int64(4), affected, "the rows affected should be 4")
 	}
 }
+func TestExecWrite(t *testing.T) {
+	NewTableForQueryTest()
+	qb := getTestBuilder()
+	rows := qb.From("table_test_query as t").
+		Where("email", "like", "%@yao.run").
+		OrderBy("id").
+		MustGet()
+
+	assert.Equal(t, 4, len(rows), "the return rows should have 4 items")
+	if len(rows) == 4 {
+		assert.Equal(t, "96.32", fmt.Sprintf("%.2f", rows[0].Get("score")), "the return value should be true")
+		assert.Equal(t, "64.56", fmt.Sprintf("%.2f", rows[1].Get("score")), "the return value should be true")
+		assert.Equal(t, "99.27", fmt.Sprintf("%.2f", rows[2].Get("score")), "the return value should be true")
+		assert.Equal(t, "48.12", fmt.Sprintf("%.2f", rows[3].Get("score")), "the return value should be true")
+	}
+
+	// Exec
+	if unit.Is("postgres") {
+		res, err := qb.ExecWrite("update table_test_query set score = 100 where email like $1", "%@yao.run")
+		assert.Nil(t, err, "the error should be nil")
+		affected, err := res.RowsAffected()
+		assert.Nil(t, err, "the error should be nil")
+		assert.Equal(t, int64(4), affected, "the rows affected should be 4")
+	} else {
+		res, err := qb.ExecWrite("update table_test_query set score = 100 where email like ?", "%@yao.run")
+		assert.Nil(t, err, "the error should be nil")
+		affected, err := res.RowsAffected()
+		assert.Nil(t, err, "the error should be nil")
+		assert.Equal(t, int64(4), affected, "the rows affected should be 4")
+	}
+}

dbal/query/interfaces.go

@@ -15,6 +15,7 @@ type Query interface {
 	Clone() Query
 	Reset() Query
 	Builder() *Builder
+	Driver() (string, error)
 
 	// defined in the query.go file
 	Table(name string) Query
@@ -179,6 +180,7 @@ type Query interface {
 
 	// defined in the exec.go file
 	Exec(sql string, bindings ...interface{}) (sql.Result, error)
+	ExecWrite(sql string, bindings ...interface{}) (sql.Result, error)
 
 	// defined in the debug.go file
 	DD()