Refactor ExecuteQuery to use existing error variable for consistency

realdatadriven · realdatadriven · commit 82304b89feea · 2026-04-30T17:15:26.000Z
diff --git a/internal/etlx/run_etl.go b/internal/etlx/run_etl.go
@@ -501,7 +501,7 @@ func (etlx *ETLX) ExecuteQuery(conn db.DBInterface, sqlData any, item map[string
 				_params = []any{}
 				_sql = query
 			}
-			_, err := conn.ExecuteQuery(_sql, _params)
+			_, err = conn.ExecuteQuery(_sql, _params)
 			if err != nil {
 				return err
 			}
@@ -553,12 +553,13 @@ func (etlx *ETLX) ExecuteQuery(conn db.DBInterface, sqlData any, item map[string
 					return err
 				}
 			} else {
+				//_, err := conn.ExecuteQuery(query)
 				_sql, _params, err := etlx.NamedToPositional(query, etlx.Params)
 				if err != nil {
 					_params = []any{}
 					_sql = query
 				}
-				_, err := conn.ExecuteQuery(_sql, _params)
+				_, err = conn.ExecuteQuery(_sql, _params)
 				if err != nil {
 					//fmt.Println(query, err)
 					return err

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ func (etlx *ETLX) ExecuteQuery(conn db.DBInterface, sqlData any, item map[string`
`501`	`501`	`_params = []any{}`
`502`	`502`	`_sql = query`
`503`	`503`	`}`
`504`		`- _, err := conn.ExecuteQuery(_sql, _params)`
	`504`	`+ _, err = conn.ExecuteQuery(_sql, _params)`
`505`	`505`	`if err != nil {`
`506`	`506`	`return err`
`507`	`507`	`}`
`@@ -553,12 +553,13 @@ func (etlx *ETLX) ExecuteQuery(conn db.DBInterface, sqlData any, item map[string`
`553`	`553`	`return err`
`554`	`554`	`}`
`555`	`555`	`} else {`
	`556`	`+ //_, err := conn.ExecuteQuery(query)`
`556`	`557`	`_sql, _params, err := etlx.NamedToPositional(query, etlx.Params)`
`557`	`558`	`if err != nil {`
`558`	`559`	`_params = []any{}`
`559`	`560`	`_sql = query`
`560`	`561`	`}`
`561`		`- _, err := conn.ExecuteQuery(_sql, _params)`
	`562`	`+ _, err = conn.ExecuteQuery(_sql, _params)`
`562`	`563`	`if err != nil {`
`563`	`564`	`//fmt.Println(query, err)`
`564`	`565`	`return err`