From 71552ec88e77b5cd2aac471d5e933dd3307ff849 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsconsulting.net>
Date: Thu, 5 May 2022 16:26:38 -0400
Subject: [PATCH] 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.

---
 src/{util => db}/database-primitives.go |  3 +--
 src/mercury/Interconnect.go             |  4 ++--
 src/projectClarity/clarity-database.go  |  8 ++++----
 src/projectInsight/insight-database.go  | 22 +++++++++++-----------
 4 files changed, 18 insertions(+), 19 deletions(-)
 rename src/{util => db}/database-primitives.go (99%)

diff --git a/src/util/database-primitives.go b/src/db/database-primitives.go
similarity index 99%
rename from src/util/database-primitives.go
rename to src/db/database-primitives.go
index 005c677..828f66f 100644
--- a/src/util/database-primitives.go
+++ b/src/db/database-primitives.go
@@ -1,4 +1,4 @@
-package util
+package db
 
 import (
 	"database/sql"
@@ -149,7 +149,6 @@ func BulkUpdate[K any](db *DBConnectorGeneric, dbName string, updateScript strin
 	for _, item := range *items {
 		mapping(s, item)
 	}
-
 }
 
 func NewRunner(scriptName string, databaseName string) *sqlScriptRunner {
diff --git a/src/mercury/Interconnect.go b/src/mercury/Interconnect.go
index 67f36c7..64b120a 100644
--- a/src/mercury/Interconnect.go
+++ b/src/mercury/Interconnect.go
@@ -2,8 +2,8 @@ package mercury
 
 import (
 	"log"
+	"mercury/src/db"
 	"mercury/src/projectInsight"
-	"mercury/src/util"
 	"time"
 )
 
@@ -52,7 +52,7 @@ func (ic *Interconnect) UpdateTimeEntries() {
 		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>
diff --git a/src/projectClarity/clarity-database.go b/src/projectClarity/clarity-database.go
index a64c26b..c4b17f6 100644
--- a/src/projectClarity/clarity-database.go
+++ b/src/projectClarity/clarity-database.go
@@ -3,7 +3,7 @@ package projectClarity
 import (
 	"database/sql"
 	"log"
-	"mercury/src/util"
+	"mercury/src/db"
 	"time"
 )
 
@@ -27,11 +27,11 @@ type (
 ======================================================================================*/
 
 type clarityDatabase struct {
-	*util.DBConnectorGeneric
+	*db.DBConnectorGeneric
 }
 
 func NewClarityDatabase() *clarityDatabase {
-	return &clarityDatabase{&util.DBConnectorGeneric{}}
+	return &clarityDatabase{&db.DBConnectorGeneric{}}
 }
 
 func (cdb *clarityDatabase) GetProjects() {
@@ -47,7 +47,7 @@ func (cdb *clarityDatabase) GetLifecycleEvents() *[]*ClarityLifeCycleEvent {
 		}
 		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>
diff --git a/src/projectInsight/insight-database.go b/src/projectInsight/insight-database.go
index 2414431..5e39667 100644
--- a/src/projectInsight/insight-database.go
+++ b/src/projectInsight/insight-database.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	_ "github.com/go-sql-driver/mysql"
 	"log"
-	"mercury/src/util"
+	"mercury/src/db"
 )
 
 var (
@@ -46,18 +46,18 @@ var (
 ======================================================================================*/
 
 type InsightDBConnector struct {
-	*util.DBConnectorGeneric
+	*db.DBConnectorGeneric
 }
 
 func NewDBConnection() *InsightDBConnector {
-	dbGeneric := util.DBConnectorGeneric{}
+	dbGeneric := db.DBConnectorGeneric{}
 	return &InsightDBConnector{&dbGeneric}
 }
 
 func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
-	util.BulkUpdate[InsightTimeEntry](
+	db.BulkUpdate[InsightTimeEntry](
 		c.DBConnectorGeneric,
-		util.InsightDatabaseName,
+		db.InsightDatabaseName,
 		"update-insight-timeEntry.sql",
 		entries,
 		insightTimeEntryUpdateFunction,
@@ -65,9 +65,9 @@ func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
 }
 
 func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
-	util.BulkUpdate[InsightUser](
+	db.BulkUpdate[InsightUser](
 		c.DBConnectorGeneric,
-		util.InsightDatabaseName,
+		db.InsightDatabaseName,
 		"update-insight-users.sql",
 		users,
 		insightUserUpdateFunction,
@@ -75,18 +75,18 @@ func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
 }
 
 func (c *InsightDBConnector) ReadUsers() *[]*InsightUser {
-	return util.QueryForObjects[InsightUser](
+	return db.QueryForObjects[InsightUser](
 		c.DBConnectorGeneric,
-		util.InsightDatabaseName,
+		db.InsightDatabaseName,
 		"read-insight-allUsers.sql",
 		insightUserMappingFunction,
 	)
 }
 
 func (c *InsightDBConnector) ReadEngineerUsers() *[]*InsightUser {
-	return util.QueryForObjects[InsightUser](
+	return db.QueryForObjects[InsightUser](
 		c.DBConnectorGeneric,
-		util.InsightDatabaseName,
+		db.InsightDatabaseName,
 		"read-insight-engineerUsers.sql",
 		insightUserMappingFunction,
 	)