From d9e2eedf189a242a8f4e2596be698e5cef599cb8 Mon Sep 17 00:00:00 2001 From: tiglog Date: Mon, 18 Sep 2023 15:37:08 +0800 Subject: [PATCH] chore: test passed --- Makefile | 6 +++--- internal/sqladapter/session.go | 20 ++++++++++---------- internal/sqlbuilder/batch.go | 2 +- internal/testsuite/record_suite.go | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index c5a605a..a5e999b 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/internal/sqladapter/session.go b/internal/sqladapter/session.go index e973e6b..d7fff4c 100644 --- a/internal/sqladapter/session.go +++ b/internal/sqladapter/session.go @@ -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 diff --git a/internal/sqlbuilder/batch.go b/internal/sqlbuilder/batch.go index c988e04..94a759b 100644 --- a/internal/sqlbuilder/batch.go +++ b/internal/sqlbuilder/batch.go @@ -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. diff --git a/internal/testsuite/record_suite.go b/internal/testsuite/record_suite.go index 89cddc4..a882a56 100644 --- a/internal/testsuite/record_suite.go +++ b/internal/testsuite/record_suite.go @@ -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)