changed "DBConnectorGeneric" to "ConnectorGeneric" to avoid clashing with the package name.

src/db/database-primitives.go

@@ -19,12 +19,12 @@ const (
 	MercuryDatabaseName = "mercury"
 )
 
-//<editor-fold name="DBConnectorGeneric">
+//<editor-fold name="ConnectorGeneric">
 /*======================================================================================
-                              DBConnectorGeneric
+                              ConnectorGeneric
 ======================================================================================*/
 
-type DBConnectorGeneric struct {
+type ConnectorGeneric struct {
 	cachedConnection *sql.DB
 }
 
@@ -33,7 +33,7 @@ type sqlScriptRunner struct {
 	DatabaseName string
 }
 
-func (c *DBConnectorGeneric) ExecuteSqlScript(runner *sqlScriptRunner) {
+func (c *ConnectorGeneric) ExecuteSqlScript(runner *sqlScriptRunner) {
 	c.startConnection(runner.DatabaseName)
 	defer c.returnConnection()
 	queryWhole := *loadSqlFile(runner.ScriptName)
@@ -54,13 +54,13 @@ func (c *DBConnectorGeneric) ExecuteSqlScript(runner *sqlScriptRunner) {
 }
 
 // startConnection this initializes, caches, and returns a connection for the desired database
-func (c *DBConnectorGeneric) startConnection(dataBase string) {
+func (c *ConnectorGeneric) startConnection(dataBase string) {
 	db := createDbConnection(dataBase)
 	c.cachedConnection = db
 }
 
 // returnConnection This just closes the cached db connection
-func (c *DBConnectorGeneric) returnConnection() {
+func (c *ConnectorGeneric) returnConnection() {
 	err := c.cachedConnection.Close()
 	if err != nil {
 		log.Panic(err)
@@ -68,7 +68,7 @@ func (c *DBConnectorGeneric) returnConnection() {
 	c.cachedConnection = nil
 }
 
-func (c *DBConnectorGeneric) QueryFromScript(scriptName string) *sql.Rows {
+func (c *ConnectorGeneric) QueryFromScript(scriptName string) *sql.Rows {
 	query := loadSqlFile(scriptName)
 	rows, err := c.cachedConnection.Query(*query)
 	if err != nil {
@@ -77,7 +77,7 @@ func (c *DBConnectorGeneric) QueryFromScript(scriptName string) *sql.Rows {
 	return rows
 }
 
-func (c *DBConnectorGeneric) CreateTables() {
+func (c *ConnectorGeneric) CreateTables() {
 	tableCreationRunners := []*sqlScriptRunner{
 		NewRunner("create-any-database.sql", ""),
 		NewRunner("create-insight-user-table.sql", InsightDatabaseName),
@@ -124,7 +124,7 @@ func loadSqlFile(scriptName string) *string {
 	return &str
 }
 
-func QueryForObjects[K any](db *DBConnectorGeneric, dbName string, queryScript string, mapping func(rows *sql.Rows) *K) *[]*K {
+func QueryForObjects[K any](db *ConnectorGeneric, dbName string, queryScript string, mapping func(rows *sql.Rows) *K) *[]*K {
 	rs := make([]*K, 0, 10000)
 	db.startConnection(dbName)
 	defer db.returnConnection()
@@ -138,7 +138,7 @@ func QueryForObjects[K any](db *DBConnectorGeneric, dbName string, queryScript s
 	return &rs
 }
 
-func BulkUpdate[K any](db *DBConnectorGeneric, dbName string, updateScript string, items *[]*K, mapping func(s *sql.Stmt, item *K)) {
+func BulkUpdate[K any](db *ConnectorGeneric, dbName string, updateScript string, items *[]*K, mapping func(s *sql.Stmt, item *K)) {
 	db.startConnection(dbName)
 	defer db.returnConnection()
 	statement := loadSqlFile(updateScript)

src/mercury/Interconnect.go

@@ -21,7 +21,7 @@ func NewInterconnect() *Interconnect {
 	connect := Interconnect{}
 	connect.Client = projectInsight.NewIClient()
 	connect.InsightDBConnector = projectInsight.NewDBConnection()
-	connect.InsightDBConnector.DBConnectorGeneric.CreateTables()
+	connect.InsightDBConnector.ConnectorGeneric.CreateTables()
 	return &connect
 }
 

src/projectClarity/clarity-database.go

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

src/projectInsight/insight-database.go

@@ -46,17 +46,17 @@ var (
 ======================================================================================*/
 
 type InsightDBConnector struct {
-	*db.DBConnectorGeneric
+	*db.ConnectorGeneric
 }
 
 func NewDBConnection() *InsightDBConnector {
-	dbGeneric := db.DBConnectorGeneric{}
+	dbGeneric := db.ConnectorGeneric{}
 	return &InsightDBConnector{&dbGeneric}
 }
 
 func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
 	db.BulkUpdate[InsightTimeEntry](
-		c.DBConnectorGeneric,
+		c.ConnectorGeneric,
 		db.InsightDatabaseName,
 		"update-insight-timeEntry.sql",
 		entries,
@@ -66,7 +66,7 @@ func (c *InsightDBConnector) UpdateTimeEntries(entries *[]*InsightTimeEntry) {
 
 func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
 	db.BulkUpdate[InsightUser](
-		c.DBConnectorGeneric,
+		c.ConnectorGeneric,
 		db.InsightDatabaseName,
 		"update-insight-users.sql",
 		users,
@@ -76,7 +76,7 @@ func (c *InsightDBConnector) UpdateUsers(users *[]*InsightUser) {
 
 func (c *InsightDBConnector) ReadUsers() *[]*InsightUser {
 	return db.QueryForObjects[InsightUser](
-		c.DBConnectorGeneric,
+		c.ConnectorGeneric,
 		db.InsightDatabaseName,
 		"read-insight-allUsers.sql",
 		insightUserMappingFunction,
@@ -85,7 +85,7 @@ func (c *InsightDBConnector) ReadUsers() *[]*InsightUser {
 
 func (c *InsightDBConnector) ReadEngineerUsers() *[]*InsightUser {
 	return db.QueryForObjects[InsightUser](
-		c.DBConnectorGeneric,
+		c.ConnectorGeneric,
 		db.InsightDatabaseName,
 		"read-insight-engineerUsers.sql",
 		insightUserMappingFunction,