Merge pull request #26 from ctrliq/fix-db-scan

Fix regression with database result scan when using structure
ctrliq · Dec 13, 2023 · 1ba1557 · 1ba1557
2 parents d8d5739 + 2828748
commit 1ba1557
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/plugins/static/pkg/staticdb/repository.go b/internal/plugins/static/pkg/staticdb/repository.go
@@ -123,7 +123,7 @@ func (db *RepositoryDB) GetFileByTag(ctx context.Context, tag string) (*Reposito
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve file with tag %s", tag)
 	}
-	if err := rows.Scan(file); err != nil {
+	if err := rows.StructScan(file); err != nil {
 		return nil, err
 	}
 
@@ -149,7 +149,7 @@ func (db *RepositoryDB) GetFileByName(ctx context.Context, name string) (*Reposi
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve file %s", name)
 	}
-	if err := rows.Scan(file); err != nil {
+	if err := rows.StructScan(file); err != nil {
 		return nil, err
 	}
 

diff --git a/internal/plugins/yum/pkg/yumdb/repository.go b/internal/plugins/yum/pkg/yumdb/repository.go
@@ -147,7 +147,7 @@ func (db *RepositoryDB) GetPackage(ctx context.Context, id string) (*RepositoryP
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve package with id %s", id)
 	}
-	if err := rows.Scan(pkg); err != nil {
+	if err := rows.StructScan(pkg); err != nil {
 		return nil, err
 	}
 
@@ -173,7 +173,7 @@ func (db *RepositoryDB) GetPackageByTag(ctx context.Context, tag string) (*Repos
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve package with tag %s", tag)
 	}
-	if err := rows.Scan(pkg); err != nil {
+	if err := rows.StructScan(pkg); err != nil {
 		return nil, err
 	}
 

diff --git a/internal/plugins/yum/pkg/yumdb/status.go b/internal/plugins/yum/pkg/yumdb/status.go
@@ -212,7 +212,7 @@ func (db *StatusDB) GetProperties(ctx context.Context) (*Properties, error) {
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve repository properties")
 	}
-	if err := rows.Scan(properties); err != nil {
+	if err := rows.StructScan(properties); err != nil {
 		return nil, err
 	}
 
@@ -300,7 +300,7 @@ func (db *StatusDB) GetReposync(ctx context.Context) (*Reposync, error) {
 	if !rows.Next() {
 		return nil, fmt.Errorf("failed to retrieve reposync data")
 	}
-	if err := rows.Scan(reposync); err != nil {
+	if err := rows.StructScan(reposync); err != nil {
 		return nil, err
 	}