Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

wip

goenningce193dc372ac
diff --git a/Makefile b/Makefile
index 578125a54..768b94b4a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ endif
test:
godotenv -f ${ENV_FILE} go test $$(go list ./... | grep -v /vendor/) -cover -p=1
-test-watch:
- godotenv -f .test.env goconvey
+test-dbx:
+ godotenv -f ${ENV_FILE} go test github.com/WeCanHearYou/wechy/app/pkg/dbx -cover -p=1
coverage:
rm -rf coverage.txt
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 4ff441799..42fe01d79 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -3,10 +3,12 @@ package dbx
import (
"database/sql"
"io/ioutil"
+ "reflect"
"github.com/WeCanHearYou/wechy/app/pkg/env"
//required
+
_ "github.com/lib/pq"
)
@@ -96,6 +98,67 @@ func (db Database) Begin() (*sql.Tx, error) {
return db.conn.Begin()
}
+// Get first row and bind to given data
+func (db Database) Get(data interface{}, command string, args ...interface{}) error {
+ rows, err := db.Query(command, args...)
+ if err != nil {
+ return err
+ }
+
+ if rows.Next() {
+ return scan(rows, data)
+ }
+ return nil
+}
+
+//Select all matched rows bind to given data
+func (db Database) Select(data interface{}, command string, args ...interface{}) error {
+ rows, err := db.Query(command, args...)
+ if err != nil {
+ return err
+ }
+
+ sliceType := reflect.TypeOf(data).Elem()
+ items := reflect.New(sliceType).Elem()
+ for rows.Next() {
+ item := reflect.New(sliceType.Elem())
+ v := item.Interface()
+ err = scan(rows, v)
+ if err != nil {
+ return err
+ }
+ items = reflect.Append(items, item.Elem())
+ }
+ value := reflect.Indirect(reflect.ValueOf(data))
+ value.Set(items)
+ return nil
+}
+
+func scan(rows *sql.Rows, data interface{}) error {
+ columns, _ := rows.Columns()
+ pointers := make([]interface{}, len(columns))
+ fields := make(map[string]interface{})
+
+ s := reflect.ValueOf(data).Elem()
+
+ for i := 0; i < s.NumField(); i++ {
+ tag := s.Type().Field(i).Tag.Get("db")
+ if tag != "" {
+ fields[tag] = s.Field(i).Addr().Interface()
+ }
+ }
+
+ for i, column := range columns {
+ pointers[i] = fields[column]
+ }
+
+ err := rows.Scan(pointers...)
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
// Close connection to database
func (db Database) Close() {
if db.conn != nil {
diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.go
new file mode 100644
index 000000000..fb5bafc6e
--- /dev/null
+++ b/app/pkg/dbx/dbx_test.go
@@ -0,0 +1,51 @@
+package dbx_test
+
+import (
+ "testing"
+
+ "github.com/WeCanHearYou/wechy/app/pkg/dbx"
+ . "github.com/onsi/gomega"
+)
+
+type user struct {
+ ID int `db:"id"`
+ Name string `db:"name"`
+}
+
+func TestBind_SimpleStruct(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+
+ u := user{}
+
+ err := db.Get(&u, "SELECT id, name FROM users LIMIT 1")
+ Expect(err).To(BeNil())
+ Expect(u.ID).To(Equal(300))
+ Expect(u.Name).To(Equal("Jon Snow"))
+}
+
+func TestBind_SimpleStruct_SingleField(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+
+ u := user{}
+
+ err := db.Get(&u, "SELECT name FROM users LIMIT 1")
+ Expect(err).To(BeNil())
+ Expect(u.ID).To(Equal(0))
+ Expect(u.Name).To(Equal("Jon Snow"))
+}
+
+func TestBind_SimpleStruct_Multiple(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+
+ u := []user{}
+
+ err := db.Select(&u, "SELECT name FROM users WHERE tenant_id = 300")
+ Expect(err).To(BeNil())
+
+ Expect(len(u)).To(Equal(2))
+ Expect(u[0].Name).To(Equal("Jon Snow"))
+ Expect(u[1].Name).To(Equal("Arya Stark"))
+}