tiglog/mydb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: test passed

Browse Source
This commit is contained in:
tiglog 2023-09-18 15:37:08 +08:00
parent b5642ed221
commit d9e2eedf18
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -22,9 +22,9 @@ go-test-%:
test-adapters: \
test-adapter-postgresql \
# test-adapter-mysql \
# test-adapter-sqlite \
# test-adapter-mongo
test-adapter-mysql \
test-adapter-sqlite \
test-adapter-mongo
test-adapter-%:
($(MAKE) -C adapter/$* test-extended || exit 1)

20
internal/sqladapter/session.go
View File

@ -359,10 +359,10 @@ func (sess *sessionWithContext) Open() error {
return err
}
sqlmydb.SetConnMaxLifetime(sess.ConnMaxLifetime())
sqlmydb.SetConnMaxIdleTime(sess.ConnMaxIdleTime())
sqlmydb.SetMaxIdleConns(sess.MaxIdleConns())
sqlmydb.SetMaxOpenConns(sess.MaxOpenConns())
sqlDB.SetConnMaxLifetime(sess.ConnMaxLifetime())
sqlDB.SetConnMaxIdleTime(sess.ConnMaxIdleTime())
sqlDB.SetMaxIdleConns(sess.MaxIdleConns())
sqlDB.SetMaxOpenConns(sess.MaxOpenConns())
return nil
}
@ -552,7 +552,7 @@ func (sess *sessionWithContext) BindDB(sqlDB *sql.DB) error {
func (sess *sessionWithContext) Ping() error {
if sess.sqlDB != nil {
return sess.sqlmydb.Ping()
return sess.sqlDB.Ping()
}
return mydb.ErrNotConnected
}
@ -560,28 +560,28 @@ func (sess *sessionWithContext) Ping() error {
func (sess *sessionWithContext) SetConnMaxLifetime(t time.Duration) {
sess.Settings.SetConnMaxLifetime(t)
if sessDB := sess.DB(); sessDB != nil {
sessmydb.SetConnMaxLifetime(sess.Settings.ConnMaxLifetime())
sessDB.SetConnMaxLifetime(sess.Settings.ConnMaxLifetime())
}
}
func (sess *sessionWithContext) SetConnMaxIdleTime(t time.Duration) {
sess.Settings.SetConnMaxIdleTime(t)
if sessDB := sess.DB(); sessDB != nil {
sessmydb.SetConnMaxIdleTime(sess.Settings.ConnMaxIdleTime())
sessDB.SetConnMaxIdleTime(sess.Settings.ConnMaxIdleTime())
}
}
func (sess *sessionWithContext) SetMaxIdleConns(n int) {
sess.Settings.SetMaxIdleConns(n)
if sessDB := sess.DB(); sessDB != nil {
sessmydb.SetMaxIdleConns(sess.Settings.MaxIdleConns())
sessDB.SetMaxIdleConns(sess.Settings.MaxIdleConns())
}
}
func (sess *sessionWithContext) SetMaxOpenConns(n int) {
sess.Settings.SetMaxOpenConns(n)
if sessDB := sess.DB(); sessDB != nil {
sessmydb.SetMaxOpenConns(sess.Settings.MaxOpenConns())
sessDB.SetMaxOpenConns(sess.Settings.MaxOpenConns())
}
}
@ -644,7 +644,7 @@ func (sess *sessionWithContext) Close() error {
}
}
// Not within a transaction.
return sess.sqlmydb.Close()
return sess.sqlDB.Close()
}
return nil

2
internal/sqlbuilder/batch.go
View File

@ -1,6 +1,6 @@
package sqlbuilder
import git.hexq.cn/tiglog/mydb
import "git.hexq.cn/tiglog/mydb"
// BatchInserter provides a helper that can be used to do massive insertions in
// batches.

6
internal/testsuite/record_suite.go
View File

@ -326,7 +326,7 @@ func (s *RecordTestSuite) TestInheritedTx() {
s.NoError(err)
// Create a transaction
sqlTx, err := sqlmydb.Begin()
sqlTx, err := sqlDB.Begin()
s.NoError(err)
// And pass that transaction to upper/db, this whole session is a transaction.
@ -346,7 +346,7 @@ func (s *RecordTestSuite) TestInheritedTx() {
s.Error(err)
// But we can create a new one.
sqlTx, err = sqlmydb.Begin()
sqlTx, err = sqlDB.Begin()
s.NoError(err)
s.NotNil(sqlTx)
@ -370,7 +370,7 @@ func (s *RecordTestSuite) TestInheritedTx() {
s.NoError(err)
// Start again.
sqlTx, err = sqlmydb.Begin()
sqlTx, err = sqlDB.Begin()
s.NoError(err)
tx, err := sqlbuilder.BindTx(s.Adapter(), sqlTx)