renamed "util" package to "db" to better reflect the fact that's all that the package does. It also makes site calls to things such as db.BulkUpdate() much more clear.

master
dtookey 4 years ago
parent 96f4eae410
commit 71552ec88e

@ -1,4 +1,4 @@
package util package db
import ( import (
"database/sql" "database/sql"
@ -149,7 +149,6 @@ func BulkUpdate[K any](db *DBConnectorGeneric, dbName string, updateScript strin
for _, item := range *items { for _, item := range *items {
mapping(s, item) mapping(s, item)
} }
} }
func NewRunner(scriptName string, databaseName string) *sqlScriptRunner { func NewRunner(scriptName string, databaseName string) *sqlScriptRunner {

@ -2,8 +2,8 @@ package mercury
import ( import (
"log" "log"
"mercury/src/db"
"mercury/src/projectInsight" "mercury/src/projectInsight"
"mercury/src/util"
"time" "time"
) )
@ -52,7 +52,7 @@ func (ic *Interconnect) UpdateTimeEntries() {
coroutineCount-- coroutineCount--
log.Printf("Currently pending goroutines: %d\n", coroutineCount) log.Printf("Currently pending goroutines: %d\n", coroutineCount)
} }
ic.InsightDBConnector.ExecuteSqlScript(util.NewRunner("insight", "create-insight-contribution-table.sql")) ic.InsightDBConnector.ExecuteSqlScript(db.NewRunner("insight", "create-insight-contribution-table.sql"))
} }
//</editor-fold> //</editor-fold>

@ -3,7 +3,7 @@ package projectClarity
import ( import (
"database/sql" "database/sql"
"log" "log"
"mercury/src/util" "mercury/src/db"
"time" "time"
) )
@ -27,11 +27,11 @@ type (
======================================================================================*/ ======================================================================================*/
type clarityDatabase struct { type clarityDatabase struct {
*util.DBConnectorGeneric *db.DBConnectorGeneric
} }
func NewClarityDatabase() *clarityDatabase { func NewClarityDatabase() *clarityDatabase {
return &clarityDatabase{&util.DBConnectorGeneric{}} return &clarityDatabase{&db.DBConnectorGeneric{}}
} }
func (cdb *clarityDatabase) GetProjects() { func (cdb *clarityDatabase) GetProjects() {
@ -47,7 +47,7 @@ func (cdb *clarityDatabase) GetLifecycleEvents() *[]*ClarityLifeCycleEvent {
} }
return &container return &container
} }
return util.QueryForObjects[ClarityLifeCycleEvent](cdb.DBConnectorGeneric, util.ClarityDatabaseName, "read-clarity-lifecycleEvents.sql", cb) return db.QueryForObjects[ClarityLifeCycleEvent](cdb.DBConnectorGeneric, db.ClarityDatabaseName, "read-clarity-lifecycleEvents.sql", cb)
} }
//</editor-fold> //</editor-fold>

@ -4,7 +4,7 @@ import (
"database/sql" "database/sql"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"log" "log"
"mercury/src/util" "mercury/src/db"
) )
var ( var (
@ -46,18 +46,18 @@ var (
======================================================================================*/ ======================================================================================*/
type InsightDBConnector struct { type InsightDBConnector struct {
*util.DBConnectorGeneric *db.DBConnectorGeneric
} }
func NewDBConnection() *InsightDBConnector { func NewDBConnection() *InsightDBConnector {
dbGeneric := util.DBConnectorGeneric{} dbGeneric := db.DBConnectorGeneric{}
return &InsightDBConnector{&dbGeneric} return &InsightDBConnector{&dbGeneric}
} }
func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) { func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
util.BulkUpdate[InsightTimeEntry]( db.BulkUpdate[InsightTimeEntry](
c.DBConnectorGeneric, c.DBConnectorGeneric,
util.InsightDatabaseName, db.InsightDatabaseName,
"update-insight-timeEntry.sql", "update-insight-timeEntry.sql",
entries, entries,
insightTimeEntryUpdateFunction, insightTimeEntryUpdateFunction,
@ -65,9 +65,9 @@ func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
} }
func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) { func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
util.BulkUpdate[InsightUser]( db.BulkUpdate[InsightUser](
c.DBConnectorGeneric, c.DBConnectorGeneric,
util.InsightDatabaseName, db.InsightDatabaseName,
"update-insight-users.sql", "update-insight-users.sql",
users, users,
insightUserUpdateFunction, insightUserUpdateFunction,
@ -75,18 +75,18 @@ func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
} }
func (c *InsightDBConnector) ReadUsers() *[]*InsightUser { func (c *InsightDBConnector) ReadUsers() *[]*InsightUser {
return util.QueryForObjects[InsightUser]( return db.QueryForObjects[InsightUser](
c.DBConnectorGeneric, c.DBConnectorGeneric,
util.InsightDatabaseName, db.InsightDatabaseName,
"read-insight-allUsers.sql", "read-insight-allUsers.sql",
insightUserMappingFunction, insightUserMappingFunction,
) )
} }
func (c *InsightDBConnector) ReadEngineerUsers() *[]*InsightUser { func (c *InsightDBConnector) ReadEngineerUsers() *[]*InsightUser {
return util.QueryForObjects[InsightUser]( return db.QueryForObjects[InsightUser](
c.DBConnectorGeneric, c.DBConnectorGeneric,
util.InsightDatabaseName, db.InsightDatabaseName,
"read-insight-engineerUsers.sql", "read-insight-engineerUsers.sql",
insightUserMappingFunction, insightUserMappingFunction,
) )

Loading…
Cancel
Save