updates

Ulbora · Nov 26, 2019 · 0c96cfa · 0c96cfa
1 parent c72f3ef
commit 0c96cfa
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 175 deletions.
diff --git a/coverage.out b/coverage.out
diff --git a/mysqlTxMock_test.go b/mysqlTxMock_test.go
@@ -21,7 +21,8 @@ func TestMyDbTxMock_Connect(t *testing.T) {
 	mdbtm.Password = "admin"
 	mdbtm.Database = "testdb"
 	mdbtm.MockConnectSuccess = true
-	dbitm = &mdbtm
+	//dbitm = &mdbtm
+	dbitm = mdbtm.GetNewDatabase()
 	suc := dbitm.Connect()
 	if !suc {
 		fmt.Println("Could not connect: ")

diff --git a/mysqlTx_test.go b/mysqlTx_test.go
@@ -20,7 +20,8 @@ func TestMyDbTx_Connect(t *testing.T) {
 	mdbt.User = "admin"
 	mdbt.Password = "admin"
 	mdbt.Database = "testdb"
-	dbit = &mdbt
+	//dbit = &mdbt
+	dbit = mdbt.GetNewDatabase()
 	suc := dbit.Connect()
 	if !suc {
 		fmt.Println("Could not connect: ")
@@ -29,7 +30,7 @@ func TestMyDbTx_Connect(t *testing.T) {
 }
 
 func TestMyDbTx_Insert(t *testing.T) {
-	tx1 = mdbt.BeginTransaction()
+	tx1 = dbit.BeginTransaction()
 
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
@@ -46,7 +47,7 @@ func TestMyDbTx_Insert(t *testing.T) {
 }
 
 func TestMyDbTx_Insertfail(t *testing.T) {
-	tx1 = mdbt.BeginTransaction()
+	tx1 = dbit.BeginTransaction()
 
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
@@ -62,7 +63,7 @@ func TestMyDbTx_Insertfail(t *testing.T) {
 }
 
 func TestMyDbTx_Update(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", idtx1)
@@ -74,7 +75,7 @@ func TestMyDbTx_Update(t *testing.T) {
 }
 
 func TestMyDbTx_Updatefail(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "update test11 set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", idtx1)
@@ -86,7 +87,7 @@ func TestMyDbTx_Updatefail(t *testing.T) {
 }
 
 func TestMyDbTx_Updatefail2(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	//a = append(a, "test insert 2", "123456 main st", idtx1)
@@ -98,7 +99,7 @@ func TestMyDbTx_Updatefail2(t *testing.T) {
 }
 
 func TestMyDbTx_Delete(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "delete from test where id = ? "
 	var a []interface{}
 	a = append(a, idtx1)
@@ -110,7 +111,7 @@ func TestMyDbTx_Delete(t *testing.T) {
 }
 
 func TestMyDbTx_Deletefail(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "delete from test22 where id = ? "
 	var a []interface{}
 	a = append(a, idtx1)
@@ -122,7 +123,7 @@ func TestMyDbTx_Deletefail(t *testing.T) {
 }
 
 func TestMyDbTx_Deletefail2(t *testing.T) {
-	tx1xx := mdbt.BeginTransaction()
+	tx1xx := dbit.BeginTransaction()
 	var q = "delete from test where id = ? "
 	var a []interface{}
 	//a = append(a, idtx1)
@@ -134,7 +135,7 @@ func TestMyDbTx_Deletefail2(t *testing.T) {
 }
 
 func TestMyDbTx_Insert2(t *testing.T) {
-	tx1 = mdbt.BeginTransaction()
+	tx1 = dbit.BeginTransaction()
 
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
@@ -169,7 +170,7 @@ func TestMyDbTx_Insert3(t *testing.T) {
 	// tx1.Commit()
 }
 func TestMyDbTx_Close(t *testing.T) {
-	suc := mdbt.Close()
+	suc := dbit.Close()
 	if !suc {
 		t.Fail()
 	}

diff --git a/mysqldb.go b/mysqldb.go
@@ -36,6 +36,13 @@ func (m *MyDB) Connect() bool {
 	return rtn
 }
 
+//GetNewDatabase GetNewDatabase
+func (m *MyDB) GetNewDatabase() di.Database {
+	var db di.Database
+	db = m
+	return db
+}
+
 //BeginTransaction BeginTransaction
 func (m *MyDB) BeginTransaction() di.Transaction {
 	var trans di.Transaction

diff --git a/mysqldbMock.go b/mysqldbMock.go
@@ -117,6 +117,13 @@ func (m *MyDBMock) Connect() bool {
 	return m.MockConnectSuccess
 }
 
+//GetNewDatabase GetNewDatabase
+func (m *MyDBMock) GetNewDatabase() di.Database {
+	var db di.Database
+	db = m
+	return db
+}
+
 //BeginTransaction BeginTransaction
 func (m *MyDBMock) BeginTransaction() di.Transaction {
 	var trans di.Transaction

diff --git a/mysqldbMock_test.go b/mysqldbMock_test.go
@@ -19,7 +19,8 @@ func TestMyDBMock_Connect(t *testing.T) {
 	mdb.Password = "admin1"
 	mdb.Database = "testdb1"
 	mdb.MockConnectSuccess = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	suc := dbim.Connect()
 	if !suc {
 		t.Fail()
@@ -32,7 +33,8 @@ func TestMyDBMock_Test(t *testing.T) {
 	var rtnRow di.DbRow
 	rtnRow.Row = []string{"1", "test2"}
 	mdb.MockTestRow = &rtnRow
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "select count(*) from test "
 	var a []interface{}
 	rowPtr := dbim.Test(q, a...)
@@ -58,7 +60,8 @@ func TestMyDBMock_Insert(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockInsertSuccess1 = true
 	mdb.MockInsertID1 = 1
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
 	a = append(a, "test insert 1", "123 main st")
@@ -77,7 +80,8 @@ func TestMyDBMock_Insert2(t *testing.T) {
 	mdb.MockInsertID1 = 1
 	mdb.MockInsertSuccess2 = true
 	mdb.MockInsertID2 = 1
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
 	a = append(a, "test insert 1", "123 main st")
@@ -99,7 +103,8 @@ func TestMyDBMock_Insert3(t *testing.T) {
 	mdb.MockInsertID2 = 1
 	mdb.MockInsertSuccess3 = true
 	mdb.MockInsertID3 = 1
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
 	a = append(a, "test insert 1", "123 main st")
@@ -124,7 +129,8 @@ func TestMyDBMock_Insert4(t *testing.T) {
 	mdb.MockInsertID3 = 1
 	mdb.MockInsertSuccess4 = true
 	mdb.MockInsertID4 = 1
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "insert into test (name, address) values(?, ?)"
 	var a []interface{}
 	a = append(a, "test insert 1", "123 main st")
@@ -143,7 +149,8 @@ func TestMyDBMock_Insert4(t *testing.T) {
 func TestMyDBMock_Update(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockUpdateSuccess1 = true
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", iid1)
@@ -157,7 +164,8 @@ func TestMyDBMock_Update2(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockUpdateSuccess1 = true
 	mdb.MockUpdateSuccess2 = true
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", iid1)
@@ -173,7 +181,8 @@ func TestMyDBMock_Update3(t *testing.T) {
 	mdb.MockUpdateSuccess1 = true
 	mdb.MockUpdateSuccess2 = true
 	mdb.MockUpdateSuccess3 = true
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", iid1)
@@ -191,7 +200,8 @@ func TestMyDBMock_Update4(t *testing.T) {
 	mdb.MockUpdateSuccess2 = true
 	mdb.MockUpdateSuccess3 = true
 	mdb.MockUpdateSuccess4 = true
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var q = "update test set name = ? , address = ? where id = ? "
 	var a []interface{}
 	a = append(a, "test insert 2", "123456 main st", iid1)
@@ -209,7 +219,8 @@ func TestMyDBMock_Get(t *testing.T) {
 	var rtnRow di.DbRow
 	rtnRow.Row = []string{"2", "test2"}
 	mdb.MockRow1 = &rtnRow
-	dbim = &mdb
+	// dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var rtn bool
 	var inint int64 = 2
 	var q = "select * from test where id = ? "
@@ -251,7 +262,8 @@ func TestMyDBMock_Get2(t *testing.T) {
 	var rtnRow di.DbRow
 	rtnRow.Row = []string{"2", "test2"}
 	mdb.MockRow1 = &rtnRow
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var rtn bool
 	var rtn2 bool
 	var inint int64 = 2
@@ -326,7 +338,8 @@ func TestMyDBMock_Get3(t *testing.T) {
 	mdb.MockRow1 = &rtnRow
 	mdb.MockRow2 = &rtnRow
 	mdb.MockRow3 = &rtnRow
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var rtn bool
 	var inint int64 = 2
 	var q = "select * from test where id = ? "
@@ -373,7 +386,8 @@ func TestMyDBMock_Get4(t *testing.T) {
 	mdb.MockRow2 = &rtnRow
 	mdb.MockRow3 = &rtnRow
 	mdb.MockRow4 = &rtnRow
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var rtn bool
 	var inint int64 = 2
 	var q = "select * from test where id = ? "
@@ -423,7 +437,8 @@ func TestMyDBMock_GetList(t *testing.T) {
 	val = append(val, r2)
 	rtnRows.Rows = val
 	mdb.MockRows1 = &rtnRows
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var suc bool
 	var q = "select * from test where address = ? "
 	var a []interface{}
@@ -457,7 +472,8 @@ func TestMyDBMock_GetList2(t *testing.T) {
 	rtnRows.Rows = val
 	mdb.MockRows1 = &rtnRows
 	mdb.MockRows2 = &rtnRows
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var suc bool
 	var q = "select * from test where address = ? "
 	var a []interface{}
@@ -493,7 +509,8 @@ func TestMyDBMock_GetList3(t *testing.T) {
 	mdb.MockRows1 = &rtnRows
 	mdb.MockRows2 = &rtnRows
 	mdb.MockRows3 = &rtnRows
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var suc bool
 	var q = "select * from test where address = ? "
 	var a []interface{}
@@ -531,7 +548,8 @@ func TestMyDBMock_GetList4(t *testing.T) {
 	mdb.MockRows2 = &rtnRows
 	mdb.MockRows3 = &rtnRows
 	mdb.MockRows4 = &rtnRows
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var suc bool
 	var q = "select * from test where address = ? "
 	var a []interface{}
@@ -560,7 +578,8 @@ func TestMyDBMock_GetList4(t *testing.T) {
 func TestMyDBMock_Delete(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockDeleteSuccess1 = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var inint int64 = 2
 	var q = "delete from test1 where id = ? "
 	var a []interface{}
@@ -575,7 +594,8 @@ func TestMyDBMock_Delete2(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockDeleteSuccess1 = true
 	mdb.MockDeleteSuccess2 = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var inint int64 = 2
 	var q = "delete from test1 where id = ? "
 	var a []interface{}
@@ -592,7 +612,8 @@ func TestMyDBMock_Delete3(t *testing.T) {
 	mdb.MockDeleteSuccess1 = true
 	mdb.MockDeleteSuccess2 = true
 	mdb.MockDeleteSuccess3 = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var inint int64 = 2
 	var q = "delete from test1 where id = ? "
 	var a []interface{}
@@ -611,7 +632,8 @@ func TestMyDBMock_Delete4(t *testing.T) {
 	mdb.MockDeleteSuccess2 = true
 	mdb.MockDeleteSuccess3 = true
 	mdb.MockDeleteSuccess4 = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	var inint int64 = 2
 	var q = "delete from test1 where id = ? "
 	var a []interface{}
@@ -627,7 +649,8 @@ func TestMyDBMock_Delete4(t *testing.T) {
 func TestMyDBMock_Close(t *testing.T) {
 	var mdb MyDBMock
 	mdb.MockCloseSuccess = true
-	dbim = &mdb
+	//dbim = &mdb
+	dbim = mdb.GetNewDatabase()
 	suc := dbim.Close()
 	if !suc {
 		t.Fail()

diff --git a/mysqldb_test.go b/mysqldb_test.go
@@ -21,7 +21,8 @@ func TestMySQLDb_Connectfail(t *testing.T) {
 	mdb.User = "admin"
 	mdb.Password = "admin1"
 	mdb.Database = "testdb1"
-	dbi = &mdb
+	// dbi = &mdb
+	dbi = mdb.GetNewDatabase()
 	suc := dbi.Connect()
 	if suc {
 		t.Fail()
@@ -35,7 +36,8 @@ func TestMySQLDb_Connect(t *testing.T) {
 	mdb.User = "admin"
 	mdb.Password = "admin"
 	mdb.Database = "testdb"
-	dbi = &mdb
+	// dbi = &mdb
+	dbi = mdb.GetNewDatabase()
 	suc := dbi.Connect()
 	if !suc {
 		t.Fail()
@@ -48,7 +50,8 @@ func TestMySQLDb_Connect2(t *testing.T) {
 	mdb.User = "admin"
 	mdb.Password = "admin"
 	mdb.Database = "ffl_list_10012018"
-	dbi2 = &mdb
+	// dbi2 = &mdb
+	dbi2 = mdb.GetNewDatabase()
 	suc := dbi2.Connect()
 	if !suc {
 		t.Fail()