Merge pull request #24 from thesaas-company/lint

fix lint
thesaas-company · May 17, 2024 · 5d31fde · 5d31fde
2 parents 7b8f821 + 727d7a2
commit 5d31fde
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 84 deletions.
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/databases/bigquery/bigquery.go b/databases/bigquery/bigquery.go
@@ -64,7 +64,11 @@ func (b *BigQuery) Schema(table string) (types.Table, error) {
 		return types.Table{}, fmt.Errorf("error executing sql statement: %v", err)
 	}
 
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// scanning the result into and append it into a variable
 	var columns []types.Column
@@ -106,7 +110,11 @@ func (b *BigQuery) Execute(query string) ([]byte, error) {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
 
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	columns, err := rows.Columns()
 	if err != nil {
@@ -157,23 +165,27 @@ func (b *BigQuery) Execute(query string) ([]byte, error) {
 func (b *BigQuery) Tables(dataset string) ([]string, error) {
 	// res, err := b.Client.Query("SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = '" + Dataset + "'")
 
-	res, err := b.Client.Query(fmt.Sprintf(BigQuery_TABLES_QUERY, dataset))
+	rows, err := b.Client.Query(fmt.Sprintf(BigQuery_TABLES_QUERY, dataset))
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer res.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	var tables []string
 
-	for res.Next() {
+	for rows.Next() {
 		var table string
-		if err := res.Scan(&table); err != nil {
+		if err := rows.Scan(&table); err != nil {
 			return nil, fmt.Errorf("error scanning dataset")
 		}
 		tables = append(tables, table)
 	}
 
-	if err := res.Err(); err != nil {
+	if err := rows.Err(); err != nil {
 		return nil, fmt.Errorf("error interating over rows: %v", err)
 	}
 

diff --git a/databases/bigquery/bigquery_test.go b/databases/bigquery/bigquery_test.go
@@ -28,7 +28,11 @@ func MockDB() (*sql.DB, sqlmock.Sqlmock) {
 // It then asserts the expected return values and checks if the method was called with the correct arguments.
 func TestSchema(t *testing.T) {
 	db, mock := MockDB() // create a new mock database connection
-	defer db.Close()     // close the connection when the function returns
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}() // close the connection when the function returns
 
 	tableName := "user"                                                                                                                               // table name to be used in the test
 	mockRows := sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).AddRow("id", "int", "NO", "PRI", nil, "auto_increment") // mock rows to be returned by the query
@@ -61,7 +65,11 @@ func TestSchema(t *testing.T) {
 func TestGetTableName(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	tableList := []string{"user", "product", "order"} // list of tables to be returned by the query
 	schema := "test"
@@ -91,7 +99,11 @@ func TestGetTableName(t *testing.T) {
 func TestExecute(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// query to be executed
 	query := "SELECT * FROM `my_project.test.test.my_table`"
@@ -142,7 +154,11 @@ func TestExecute(t *testing.T) {
 
 func TestGenerateCreateTablequery(t *testing.T) {
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	table := types.Table{
 		Dataset: "test_dataset",

diff --git a/databases/mysql/mysql.go b/databases/mysql/mysql.go
@@ -66,7 +66,11 @@ func (m *MySQL) Schema(table string) (types.Table, error) {
 		return response, fmt.Errorf("error executing sql statement: %v", err)
 	}
 
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// scanning the result into and append it into a variable
 	var columns []types.Column
@@ -104,7 +108,11 @@ func (m *MySQL) Execute(query string) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// getting the column names
 	columns, err := rows.Columns()
@@ -154,7 +162,11 @@ func (m *MySQL) Tables(databaseName string) ([]string, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// scan and append the result
 	var tables []string

diff --git a/databases/mysql/mysql_test.go b/databases/mysql/mysql_test.go
@@ -26,7 +26,11 @@ func MockDB() (*sql.DB, sqlmock.Sqlmock) {
 // It then asserts the expected return values and checks if the method was called with the correct arguments.
 func TestSchema(t *testing.T) {
 	db, mock := MockDB() // create a new mock database connection
-	defer db.Close()     // close the connection when the function returns
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}() // close the connection when the function returns
 
 	tableName := "user"                                                                                                                               // table name to be used in the test
 	mockRows := sqlmock.NewRows([]string{"Field", "Type", "Null", "Key", "Default", "Extra"}).AddRow("id", "int", "NO", "PRI", nil, "auto_increment") // mock rows to be returned by the query
@@ -58,7 +62,11 @@ func TestSchema(t *testing.T) {
 func TestExecute(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// query to be executed
 	query := `SELECT id,name FROM user`
@@ -93,7 +101,11 @@ func TestExecute(t *testing.T) {
 func TestGetTableName(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	tableList := []string{"user", "product", "order"} // list of tables to be returned by the query
 
@@ -122,7 +134,11 @@ func TestGetTableName(t *testing.T) {
 
 func TestGenerateCreateTablequery(t *testing.T) {
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	table := types.Table{
 		Name: "user",

diff --git a/databases/postgres/postgres.go b/databases/postgres/postgres.go
@@ -86,7 +86,11 @@ func (p *Postgres) Schema(table string) (types.Table, error) {
 		return response, fmt.Errorf("error executing sql statement: %v", err)
 	}
 
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// scanning the result into and append it into a variable
 	var columns []types.Column
@@ -137,7 +141,11 @@ func (p *Postgres) Execute(query string) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	// getting the column names
 	columns, err := rows.Columns()
@@ -188,7 +196,11 @@ func (p *Postgres) Tables(databaseName string) ([]string, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	var tables []string
 	for rows.Next() {

diff --git a/databases/postgres/postgres_test.go b/databases/postgres/postgres_test.go
@@ -30,7 +30,11 @@ func MockDB() (*sql.DB, sqlmock.Sqlmock) {
 func TestSchema(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	table_name := "user" // table name to be used in the test
 
@@ -63,7 +67,11 @@ func TestSchema(t *testing.T) {
 func TestExecute(t *testing.T) {
 	// create a new mock database connection
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	//	we then create a new instance of our Postgres object and test the function
 	query := `SELECT id, name FROM user`
@@ -98,7 +106,11 @@ func TestExecute(t *testing.T) {
 // It then asserts the expected return values and checks if the method was called with the correct arguments.
 func TestGetTableName(t *testing.T) {
 	db, mock := MockDB() // create a new mock database connection
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	tableList := []string{"user", "Credit", "Debit"} // list of tables to be used in the test
 	DatabaseName := "test"
@@ -129,7 +141,11 @@ func TestGetTableName(t *testing.T) {
 
 func TestGenerateCreateTablequery(t *testing.T) {
 	db, mock := MockDB()
-	defer db.Close()
+	defer func() {
+		if err := db.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	table := types.Table{
 		Name: "user",

diff --git a/databases/snowflake/snowflake.go b/databases/snowflake/snowflake.go
@@ -81,7 +81,11 @@ func (s *Snowflake) Schema(table string) (types.Table, error) {
 	if err != nil {
 		return res, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	var columns []types.Column
 	for rows.Next() {
@@ -123,7 +127,11 @@ func (s *Snowflake) Tables(databaseName string) ([]string, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement and querying tables list: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	var tables []string
 	for rows.Next() {
@@ -149,7 +157,11 @@ func (s *Snowflake) Execute(query string) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error executing sql statement: %v", err)
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
 
 	columns, err := rows.Columns()
 	if err != nil {