new dependency version

README.md

@@ -224,7 +224,7 @@ db.Table(&users4).Limit(5).Select()
 
 ---
 这里使用的 gorose.Data , 实际上就是 `map[string]interface{}` 类型.  
-而 `gorose.Map`, 实际上是 `t.MapString` 类型, 这里出现了一个 `t` 包, 是一个golang基本数据类型的相互转换包, 请看详细介绍 http://github.com/gohouse/golib/t
+而 `gorose.Map`, 实际上是 `t.MapStringT` 类型, 这里出现了一个 `t` 包, 是一个golang基本数据类型的相互转换包, 请看详细介绍 http://github.com/gohouse/t
 
 - 3. laravel的`First()`,`Get()`, 用来返回结果集  
 也就是说, 你甚至可以不用传入各种绑定的struct和map, 直接传入表名, 返回两个参数, 一个是 `[]gorose.Map`结果集, 第二个是`error`,堪称简单粗暴  

README_en.md

@@ -220,7 +220,7 @@ db.Table(&users4).Limit(5).Select()
 ---
 The gorose. Data used here is actually the `map [string] interface {}'type.
 
-And `gorose. Map'is actually a `t. MapString' type. Here comes a `t'package, a golang basic data type conversion package. See http://github.com/gohouse/golib/t for more details.  
+And `gorose. Map'is actually a `t. MapString' type. Here comes a `t'package, a golang basic data type conversion package. See http://github.com/gohouse/t for more details.  
 
 
 - 3. laravel's `First()`,`Get()`, Used to return the result set   

binder.go

@@ -3,12 +3,12 @@ package gorose
 import (
 	"errors"
 	"fmt"
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"reflect"
 )
 
 // Map ...
-type Map t.MapString
+type Map t.MapStringT
 
 // Data ...
 type Data map[string]interface{}
@@ -133,7 +133,7 @@ func (o *Binder) BindParse(prefix string) error {
 			//
 			o.SetBindResult(o.GetBindOrigin())
 			//TODO 检查map的值类型, 是否是t.Type
-			if sliceVal.Type().Elem() == reflect.ValueOf(map[string]t.T{}).Type().Elem() {
+			if sliceVal.Type().Elem() == reflect.ValueOf(map[string]t.Type{}).Type().Elem() {
 				o.SetBindType(OBJECT_MAP_T)
 			}
 			// 是否设置了表名
@@ -154,7 +154,7 @@ func (o *Binder) BindParse(prefix string) error {
 				o.SetBindResultSlice(sliceVal)
 				//o.SetBindResultSlice(reflect.MakeSlice(sliceVal.Type(),0,0))
 				//TODO 检查map的值类型, 是否是t.Type
-				if eltType.Elem() == reflect.ValueOf(map[string]t.T{}).Type().Elem() {
+				if eltType.Elem() == reflect.ValueOf(map[string]t.Type{}).Type().Elem() {
 					o.SetBindType(OBJECT_MAP_SLICE_T)
 				}
 				if dstVal.Kind() != reflect.Ptr {

builder_default.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gohouse/golib/structEngin"
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"reflect"
 	"strconv"
 	"strings"
@@ -187,13 +187,13 @@ func (b *BuilderDefault) BuildData2(operType string) (string, string, string) {
 		dataObj = append(dataObj, data.(string))
 	case []map[string]interface{}, []Data: // insert multi datas ([]map[string]interface{})
 		sliceData := t.New(data).Slice()
-		for key := range sliceData[0].MapString() {
+		for key := range sliceData[0].MapStringT() {
 			if inArray(key, dataFields) == false {
 				dataFields = append(dataFields, key)
 			}
 		}
-		for _, itemT := range sliceData {
-			item := itemT.MapString()
+		for _, itemt := range sliceData {
+			item := itemt.MapStringT()
 			var dataValuesSub []string
 			for _, key := range dataFields {
 				if item[key] == nil {
@@ -207,7 +207,7 @@ func (b *BuilderDefault) BuildData2(operType string) (string, string, string) {
 		}
 	case map[string]interface{}, Data: // update or insert (map[string]interface{})
 		var dataValuesSub []string
-		for key, val := range t.New(data).MapString() {
+		for key, val := range t.New(data).MapStringT() {
 			if operType == "insert" {
 				// insert
 				dataFields = append(dataFields, key)

builder_oracle.go

@@ -4,8 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gohouse/golib/structEngin"
-	"github.com/gohouse/golib/t"
-	//"log"
+	"github.com/gohouse/t"
 	"reflect"
 	"strconv"
 	"strings"

engin_test.go

@@ -1,18 +1,18 @@
 package gorose
 
 import (
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"testing"
 )
 
-type aaa t.MapString
+type aaa t.MapStringT
 
 func (u *aaa) TableName() string {
 	return "users"
 }
 
 //type bbb MapRows
-type bbb []t.MapString
+type bbb []t.MapStringT
 
 func (u *bbb) TableName() string {
 	return "users"

go.mod

@@ -3,6 +3,7 @@ module github.com/gohouse/gorose/v2
 go 1.12
 
 require (
-	github.com/gohouse/golib v0.0.0-20200227070740-c868bc352ec6
+	github.com/gohouse/golib v0.0.0-20200724105553-aaa5291e8141
+	github.com/gohouse/t v0.0.0-20200724104622-78e2ef6ec88c
 	github.com/mattn/go-sqlite3 v1.10.0
 )

go.sum

@@ -1,4 +1,77 @@
-github.com/gohouse/golib v0.0.0-20200227070740-c868bc352ec6 h1:UZ6z76KHiXGEs3LLh1laIBxFKYF3GszsMDFqQ7093vM=
-github.com/gohouse/golib v0.0.0-20200227070740-c868bc352ec6/go.mod h1:vmdaq+BhbCa1eT8Ne3BkhFrucm7mmTVVCiKFgIo6okM=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/gohouse/e v0.0.3-rc.0.20200724104652-25ebf8c9c305/go.mod h1:1rpOAa2dVfkpkhb9vgH5XHcvyCh/NJCx1bkudcX/TcM=
+github.com/gohouse/golib v0.0.0-20200312063614-067523159413 h1:3tNun2DPBEsxv4kCO8hFoPrOg8ySsU13WWH2b+8H+A4=
+github.com/gohouse/golib v0.0.0-20200312063614-067523159413/go.mod h1:80IWOo3CRajPn7UsEtJdFwYbJ0zs4Je5RNE4EfyR0BM=
+github.com/gohouse/golib v0.0.0-20200724105553-aaa5291e8141 h1:nk3xhxuND/1HmeScxK779cfaUf9N8BTJwzRT7zjj86k=
+github.com/gohouse/golib v0.0.0-20200724105553-aaa5291e8141/go.mod h1:uvI6dMBJXJI1hR+0ZI/v7/NTVNpj7hSQhcCnGXjY/GI=
+github.com/gohouse/t v0.0.0-20200724104622-78e2ef6ec88c h1:IybZ8H8UTProCeixo0FQKreVaS9pd+xTPPPXRkZko2Y=
+github.com/gohouse/t v0.0.0-20200724104622-78e2ef6ec88c/go.mod h1:JZl4QiZrsKArORKRFgfwSiMpMR32C4pvTky0FlGs88U=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200723000907-a7c6fd066f6d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200311144346-b662892dd51b/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

orm.go

@@ -1,7 +1,7 @@
 package gorose
 
 import (
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"strings"
 )
 

orm_execute.go

@@ -2,7 +2,7 @@ package gorose
 
 import (
 	"errors"
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"reflect"
 )
 

orm_query.go

@@ -1,7 +1,7 @@
 package gorose
 
 import (
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"math"
 	"reflect"
 	"strings"
@@ -191,7 +191,7 @@ func (dba *Orm) Pluck_bak(field string, fieldKey ...string) (v interface{}, err
 		}
 	case OBJECT_MAP_SLICE, OBJECT_MAP_SLICE_T:
 		for _, item := range t.New(binder.GetBindResultSlice().Interface()).Slice() {
-			val := item.MapInterface()
+			val := item.MapInterfaceT()
 			if len(fieldKey) > 0 {
 				resMap[val[fieldKey[0]].Interface()] = val[field].Interface()
 			} else {

session.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"reflect"
 	"strings"
 	"time"

util.go

@@ -2,7 +2,7 @@ package gorose
 
 import (
 	"fmt"
-	"github.com/gohouse/golib/t"
+	"github.com/gohouse/t"
 	"log"
 	"math/rand"
 	"os"