liliesh/scabiosa
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #27 from netbenix/SCABIOSA-12

Browse source 
Optimized return statements
This commit is contained in:
netbenix 2022-02-19 19:26:59 +01:00 • committed by GitHub
commit ce0f0f297c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SQL/MSSQLConnector.go
View file

@ -34,27 +34,18 @@ func GetMSSQLInstance(sqlConfig Tools.SQLConfig) MSSQLConnector {
func (mssql MSSQLConnector) checkIfEventLogTableExist(db *sql.DB) bool { func (mssql MSSQLConnector) checkIfEventLogTableExist(db *sql.DB) bool {
rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'EventLog';") rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'EventLog';")
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func (mssql MSSQLConnector) checkIfBackupTableExist(db *sql.DB) bool { func (mssql MSSQLConnector) checkIfBackupTableExist(db *sql.DB) bool {
rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'Backups';") rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'dbo' AND TABLE_NAME = 'Backups';")
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func (mssql MSSQLConnector) checkIfBackupEntryExist(db *sql.DB, backupName string, hostname string) bool { 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) query := fmt.Sprintf("SELECT * FROM dbo.Backups WHERE Hostname = '%s' AND BackupName = '%s'", hostname, backupName)
rows, _ := db.Query(query) rows, _ := db.Query(query)
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func createMSSQLConnection(mssql MSSQLConnector) *sql.DB { func createMSSQLConnection(mssql MSSQLConnector) *sql.DB {

15
SQL/MariaDBConnector.go
View file

@ -33,26 +33,17 @@ func GetMariaDBInstance(sqlConfig Tools.SQLConfig) MariaDBConnector {
func (mariadb MariaDBConnector) checkIfEventLogTableExist(db *sql.DB) bool { 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) rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = 'EventLog';", mariadb.Database)
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func (mariadb MariaDBConnector) checkIfBackupTableExist(db *sql.DB) bool { 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) rows, _ := db.Query("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_NAME = 'Backups';", mariadb.Database)
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func (mariadb MariaDBConnector) checkIfBackupEntryExist(db *sql.DB, backupName string, hostname string) bool { 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) rows, _ := db.Query("SELECT * FROM `"+mariadb.Database+"`.Backups WHERE Hostname = ? AND BackupName = ?;", hostname, backupName)
if !rows.Next() { return rows.Next()
return false
}
return true
} }
func createMariaDBConnection(mariadb MariaDBConnector) *sql.DB { func createMariaDBConnection(mariadb MariaDBConnector) *sql.DB {