From f35e3711e26cd5e0ad3ee13f35d87156b0615b5e Mon Sep 17 00:00:00 2001 From: netbenix Date: Sat, 19 Feb 2022 19:20:55 +0100 Subject: [PATCH 1/2] refactor(MariaDBConnector): Optimized return statements --- SQL/MariaDBConnector.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/SQL/MariaDBConnector.go b/SQL/MariaDBConnector.go index adc50a2..09b0575 100644 --- a/SQL/MariaDBConnector.go +++ b/SQL/MariaDBConnector.go @@ -33,26 +33,17 @@ func GetMariaDBInstance(sqlConfig Tools.SQLConfig) MariaDBConnector { func (mariadb MariaDBConnector) checkIfEventLogTableExist(db *sql.DB) bool { rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = 'EventLog';", mariadb.Database) - if !rows.Next() { - return false - } - return true + return rows.Next() } func (mariadb MariaDBConnector) checkIfBackupTableExist(db *sql.DB) bool { rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = 'Backups';", mariadb.Database) - if !rows.Next() { - return false - } - return true + return rows.Next() } func (mariadb MariaDBConnector) checkIfBackupEntryExist(db *sql.DB, backupName string, hostname string) bool { rows, _ := db.Query("SELECT * FROM `"+mariadb.Database+"`.Backups WHERE Hostname = ? AND BackupName = ?;", hostname, backupName) - if !rows.Next() { - return false - } - return true + return rows.Next() } func createMariaDBConnection(mariadb MariaDBConnector) *sql.DB { From bf2ad96f6c6413e6a25350d2ba0f121d1af294c5 Mon Sep 17 00:00:00 2001 From: netbenix Date: Sat, 19 Feb 2022 19:21:12 +0100 Subject: [PATCH 2/2] refactor(MSSQLConnector): Optimized return statements --- SQL/MSSQLConnector.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/SQL/MSSQLConnector.go b/SQL/MSSQLConnector.go index 24ab2fe..448182a 100644 --- a/SQL/MSSQLConnector.go +++ b/SQL/MSSQLConnector.go @@ -34,27 +34,18 @@ func GetMSSQLInstance(sqlConfig Tools.SQLConfig) MSSQLConnector { func (mssql MSSQLConnector) checkIfEventLogTableExist(db *sql.DB) bool { rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'EventLog';") - if !rows.Next() { - return false - } - return true + return rows.Next() } func (mssql MSSQLConnector) checkIfBackupTableExist(db *sql.DB) bool { rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'Backups';") - if !rows.Next() { - return false - } - return true + return rows.Next() } func (mssql MSSQLConnector) checkIfBackupEntryExist(db *sql.DB, backupName string, hostname string) bool { query := fmt.Sprintf("SELECT * FROM dbo.Backups WHERE Hostname = '%s' AND BackupName = '%s'", hostname, backupName) rows, _ := db.Query(query) - if !rows.Next() { - return false - } - return true + return rows.Next() } func createMSSQLConnection(mssql MSSQLConnector) *sql.DB {