rename to qsql

Author: free1139

README.md

@@ -1,6 +1,3 @@
-
-** This is project is archived and renamed to [qsql](https://github.com/gwaylib/qsql) **
-
 # Refere to:
 ```
 database/sql
@@ -32,26 +29,26 @@ package db
 
 import (
 	"github.com/gwaylib/conf"
-	"github.com/gwaylib/database"
+	"github.com/gwaylib/qsql"
 	_ "github.com/go-sql-driver/mysql"
 )
 
 var dbFile = conf.RootDir() + "/etc/db.cfg"
 
 func init() {
-   database.REFLECT_DRV_NAME = database.DRV_NAME_MYSQL 
+   qsql.REFLECT_DRV_NAME = qsql.DRV_NAME_MYSQL 
 }
 
-func GetCache(section string) *database.DB {
-	return database.GetCache(dbFile, section)
+func GetCache(section string) *qsql.DB {
+	return qsql.GetCache(dbFile, section)
 }
 
-func HasCache(section string) (*database.DB, error) {
-	return database.HasCache(dbFile, section)
+func HasCache(section string) (*qsql.DB, error) {
+	return qsql.HasCache(dbFile, section)
 }
 
 func CloseCache() {
-	database.CloseCache()
+	qsql.CloseCache()
 }
 ```
 
@@ -66,15 +63,15 @@ mdb := db.GetCache("master")
 // or mdb = <sql.Tx>
 
 // row := mdb.QueryRow("SELECT * ...")
-row := database.QueryRow(mdb, "SELECT * ...")
+row := qsql.QueryRow(mdb, "SELECT * ...")
 // ...
 
 // rows, err := mdb.Query("SELECT * ...")
-rows, err := database.Query(mdb, "SELECT * ...")
+rows, err := qsql.Query(mdb, "SELECT * ...")
 // ...
 
 // result, err := mdb.Exec("UPDATE ...")
-result, err := database.Exec(mdb, "UPDATE ...")
+result, err := qsql.Exec(mdb, "UPDATE ...")
 // ...
 ```
 
@@ -91,13 +88,13 @@ var u = &User{
 }
 
 // Insert data with default driver.
-if _, err := database.InsertStruct(mdb, u, "testing"); err != nil{
+if _, err := qsql.InsertStruct(mdb, u, "testing"); err != nil{
     // ... 
 }
 // ...
 
 // Or Insert data with designated driver.
-if _, err := database.InsertStruct(mdb, u, "testing", database.DRV_NAME_MYSQL); err != nil{
+if _, err := qsql.InsertStruct(mdb, u, "testing", qsql.DRV_NAME_MYSQL); err != nil{
     // ... 
 }
 // ...
@@ -115,7 +112,7 @@ type User struct{
 mdb := db.GetCache("master") 
 // or mdb = <sql.Tx>
 var u = *User{}
-if err := database.QueryStruct(mdb, u, "SELECT id, name FROM a WHERE id = ?", id)
+if err := qsql.QueryStruct(mdb, u, "SELECT id, name FROM a WHERE id = ?", id)
 if err != nil{
     // ...
 }
@@ -125,15 +122,15 @@ if err != nil{
 mdb := db.GetCache("master") 
 // or mdb = <sql.Tx>
 var u = *User{}
-if err := database.ScanStruct(database.QueryRow(mdb, "SELECT id, name FROM a WHERE id = ?", id), u); err != nil {
+if err := qsql.ScanStruct(qsql.QueryRow(mdb, "SELECT id, name FROM a WHERE id = ?", id), u); err != nil {
     // ...
 }
 
 // Way 3: query result to structs
 mdb := db.GetCache("master") 
 // or mdb = <sql.Tx>
 var u = []*User{}
-if err := database.QueryStructs(mdb, &u, "SELECT id, name FROM a WHERE id = ?", id); err != nil {
+if err := qsql.QueryStructs(mdb, &u, "SELECT id, name FROM a WHERE id = ?", id); err != nil {
     // ...
 }
 if len(u) == 0{
@@ -145,13 +142,13 @@ if len(u) == 0{
 // Way 4: query rows to structs
 mdb := db.GetCache("master") 
 // or mdb = <sql.Tx>
-rows, err := database.Query(mdb, "SELECT id, name FROM a WHERE id = ?", id)
+rows, err := qsql.Query(mdb, "SELECT id, name FROM a WHERE id = ?", id)
 if err != nil {
     // ...
 }
-defer database.Close(rows)
+defer qsql.Close(rows)
 var u = []*User{}
-if err := database.ScanStructs(rows, &u); err != nil{
+if err := qsql.ScanStructs(rows, &u); err != nil{
     // ...
 }
 if len(u) == 0{
@@ -167,15 +164,15 @@ if len(u) == 0{
 mdb := db.GetCache("master") 
 // or mdb = <sql.Tx>
 count := 0
-if err := database.QueryElem(mdb, &count, "SELECT count(*) FROM a WHERE id = ?", id); err != nil{
+if err := qsql.QueryElem(mdb, &count, "SELECT count(*) FROM a WHERE id = ?", id); err != nil{
     // ...
 }
 ```
 
 ## Mass query.
 ```text
 mdb := db.GetCache("master") 
-qSql = &database.Page{
+qSql = &qsql.Page{
      CountSql:`SELECT count(1) FROM user_info WHERE create_time >= ? AND create_time <= ?`,
      DataSql:`SELECT mobile, balance FROM user_info WHERE create_time >= ? AND create_time <= ?`
 }
@@ -191,12 +188,12 @@ if err != nil {
 
 ## Make a MultiTx
 ``` text
-multiTx := []*database.MultiTx{}
-multiTx = append(multiTx, database.NewMultiTx(
+multiTx := []*qsql.MultiTx{}
+multiTx = append(multiTx, qsql.NewMultiTx(
     "UPDATE testing SET name = ? WHERE id = ?",
     id,
 ))
-multiTx = append(multiTx, database.NewMultiTx(
+multiTx = append(multiTx, qsql.NewMultiTx(
     "UPDATE testing SET name = ? WHERE id = ?",
     id,
 ))
@@ -207,12 +204,12 @@ tx, err := mdb.Begin()
 if err != nil{
     // ...
 }
-if err := database.ExecMutlTx(tx, multiTx); err != nil {
-    database.Rollback(tx)
+if err := qsql.ExecMutlTx(tx, multiTx); err != nil {
+    qsql.Rollback(tx)
     // ...
 }
 if err := tx.Commit(); err != nil {
-    database.Rollback(tx)
+    qsql.Rollback(tx)
     // ...
 }
 ```

api.go

@@ -1,7 +1,7 @@
 /*
 Provides database connections in factory mode to optimize database connections
 */
-package database
+package qsql
 
 import (
 	"context"
@@ -25,7 +25,7 @@ var (
 	// Whe reflect the QueryStruct, InsertStruct, it need set the Driver first.
 	// For example:
 	// func init(){
-	//     database.REFLECT_DRV_NAME = database.DEV_NAME_SQLITE3
+	//     qsql.REFLECT_DRV_NAME = qsql.DEV_NAME_SQLITE3
 	// }
 	// Default is using the mysql driver.
 	REFLECT_DRV_NAME = DRV_NAME_MYSQL

db.go

@@ -2,7 +2,7 @@
 以工厂的模式构建数据库，以避免数据库被多次打开。
 因database/sql本身已实现连接池，因此没有必要创建多个同一的数据库连接实例
 */
-package database
+package qsql
 
 import (
 	"database/sql"

example/go.mod

@@ -1,12 +1,12 @@
-module github.com/gwaylib/database/example
+module github.com/gwaylib/qsql/example
 
 go 1.17
 
 require (
 	github.com/go-ini/ini v1.48.0 // indirect
-	github.com/gwaylib/database v0.0.0-00010101000000-000000000000 // indirect
 	github.com/gwaylib/errors v0.0.0-20230225020640-41299698202b // indirect
 	github.com/gwaylib/log v0.0.0-20190829041528-b6c28711ef53 // indirect
+	github.com/gwaylib/qsql v0.0.0-00010101000000-000000000000 // indirect
 	github.com/jmoiron/sqlx v1.2.0 // indirect
 	github.com/labstack/gommon v0.3.0 // indirect
 	github.com/mattn/go-colorable v0.1.2 // indirect
@@ -15,4 +15,4 @@ require (
 	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
 )
 
-replace github.com/gwaylib/database => ../
+replace github.com/gwaylib/qsql => ../

example/qsql.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gwaylib/database"
 	"github.com/gwaylib/errors"
+	"github.com/gwaylib/qsql"
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -15,11 +15,11 @@ type TestingUser struct {
 }
 
 func main() {
-	mdb, _ := database.Open("sqlite3", ":memory:")
-	defer database.Close(mdb)
+	mdb, _ := qsql.Open("sqlite3", ":memory:")
+	defer qsql.Close(mdb)
 
 	// create table
-	if _, err := database.Exec(mdb,
+	if _, err := qsql.Exec(mdb,
 		`CREATE TABLE user (
 		  "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
 		  "created_at" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -30,13 +30,13 @@ func main() {
 	}
 
 	// std insert
-	if _, err := database.Exec(mdb, "INSERT INTO user(username,passwd)VALUES(?,?)", "t1", "t1"); err != nil {
+	if _, err := qsql.Exec(mdb, "INSERT INTO user(username,passwd)VALUES(?,?)", "t1", "t1"); err != nil {
 		panic(err)
 	}
 
 	// reflect insert
 	newUser := &TestingUser{UserName: "t2", Passwd: "t2"}
-	if _, err := database.InsertStruct(mdb, newUser, "user"); err != nil {
+	if _, err := qsql.InsertStruct(mdb, newUser, "user"); err != nil {
 		panic(err)
 	}
 	if newUser.ID == 0 {
@@ -46,7 +46,7 @@ func main() {
 	// std query
 	var id int64
 	var username, passwd string
-	if err := database.QueryRow(mdb, "SELECT id, username, passwd FROM user WHERE username=?", "t1").Scan(&id, &username, &passwd); err != nil {
+	if err := qsql.QueryRow(mdb, "SELECT id, username, passwd FROM user WHERE username=?", "t1").Scan(&id, &username, &passwd); err != nil {
 		panic(err)
 	}
 	if username != "t1" && passwd != "t1" {
@@ -59,29 +59,29 @@ func main() {
 	// reflect query
 	// query struct data
 	expectUser := &TestingUser{}
-	if err := database.QueryStruct(mdb, expectUser, "SELECT * FROM user WHERE username=?", "t1"); err != nil {
+	if err := qsql.QueryStruct(mdb, expectUser, "SELECT * FROM user WHERE username=?", "t1"); err != nil {
 		panic(err)
 	}
 	if expectUser.UserName != "t1" && expectUser.Passwd != "t1" {
 		panic("data not match")
 	}
 	users := []*TestingUser{}
-	if err := database.QueryStructs(mdb, &users, "SELECT * FROM user LIMIT 2"); err != nil {
+	if err := qsql.QueryStructs(mdb, &users, "SELECT * FROM user LIMIT 2"); err != nil {
 		panic(err)
 	}
 	if len(users) != 2 {
 		panic("expect len==2")
 	}
 	// query elememt data
 	pwd := ""
-	if err := database.QueryElem(mdb, &pwd, "SELECT passwd FROM user WHERE username=?", "t1"); err != nil {
+	if err := qsql.QueryElem(mdb, &pwd, "SELECT passwd FROM user WHERE username=?", "t1"); err != nil {
 		panic(err)
 	}
 	if pwd != "t1" {
 		panic(pwd)
 	}
 	ids := []int64{}
-	if err := database.QueryElems(mdb, &ids, "SELECT id FROM user LIMIT 2"); err != nil {
+	if err := qsql.QueryElems(mdb, &ids, "SELECT id FROM user LIMIT 2"); err != nil {
 		panic(err)
 	}
 	if len(ids) != 2 {
@@ -91,14 +91,14 @@ func main() {
 
 	// query data in string
 	// table type
-	titles, data, err := database.QueryPageArr(mdb, "SELECT * FROM user LIMIT 10")
+	titles, data, err := qsql.QueryPageArr(mdb, "SELECT * FROM user LIMIT 10")
 	if err != nil {
 		panic(err)
 	}
 	fmt.Printf("PageArr title:%+v\n", titles)
 	fmt.Printf("PageArr data: %+v\n", data)
 	// map type
-	titles, mData, err := database.QueryPageMap(mdb, "SELECT * FROM user LIMIT 10")
+	titles, mData, err := qsql.QueryPageMap(mdb, "SELECT * FROM user LIMIT 10")
 	if err != nil {
 		panic(err)
 	}
@@ -115,15 +115,15 @@ func main() {
 		{UserName: "t4", Passwd: "t4"},
 	}
 	for _, u := range txUsers {
-		if _, err := database.InsertStruct(tx, &u, "user"); err != nil {
+		if _, err := qsql.InsertStruct(tx, &u, "user"); err != nil {
 			println(errors.As(err))
-			database.Rollback(tx)
+			qsql.Rollback(tx)
 			return
 		}
 	}
 	if err := tx.Commit(); err != nil {
 		println(errors.As(err))
-		database.Rollback(tx)
+		qsql.Rollback(tx)
 		return
 	}
 

factory.go

@@ -1,4 +1,4 @@
-package database
+package qsql
 
 import (
 	"os"

go.mod

@@ -1,4 +1,4 @@
-module github.com/gwaylib/database
+module github.com/gwaylib/qsql
 
 go 1.13
 

page.go

@@ -1,7 +1,7 @@
 //
 // Example:
 //
-// qSql = &database.Page{
+// qSql = &qsql.Page{
 //      CountSql:`SELECT count(1) FROM user_info WHERE create_time >= ? AND create_time <= ?`,
 //      DataSql:`SELECT mobile, balance FROM user_info WHERE create_time >= ? AND create_time <= ?`
 // }
@@ -14,7 +14,7 @@
 // ...
 // }
 //
-package database
+package qsql
 
 import (
 	"fmt"

qsql.go

@@ -1,4 +1,4 @@
-package database
+package qsql
 
 import (
 	"context"

struct.go

@@ -1,4 +1,4 @@
-package database
+package qsql
 
 import (
 	"database/sql"