diff --git a/pkg/codegen/assets/store_rdbms.gen.go.tpl b/pkg/codegen/assets/store_rdbms.gen.go.tpl
index a6a083d8b..472eaad15 100644
--- a/pkg/codegen/assets/store_rdbms.gen.go.tpl
+++ b/pkg/codegen/assets/store_rdbms.gen.go.tpl
@@ -130,7 +130,7 @@ func (s Store) {{ toggleExport .Search.Export "Search" $.Types.Plural }}(ctx con
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internal{{ export $.Types.Singular }}RowScanner({{ template "extraArgsCallFirst" . }}rows)
 				}
 
diff --git a/store/compose_records.gen.go b/store/compose_records.gen.go
index 2e5dc012a..dfd6a2f2e 100644
--- a/store/compose_records.gen.go
+++ b/store/compose_records.gen.go
@@ -33,7 +33,7 @@ type (
 		// Additional custom functions
 
 		// ComposeRecordReport (custom function)
-		ComposeRecordReport(ctx context.Context, _mod *types.Module, _metrics string, _dimensions string, _filters string) ([]map[string]interface{}, error)
+		ComposeRecordReport(ctx context.Context, _mod *types.Module, _metrics string, _dimensions string, _filters string) (ComposeRecordsReport, error)
 	}
 )
 
@@ -86,6 +86,6 @@ func TruncateComposeRecords(ctx context.Context, s ComposeRecords, _mod *types.M
 	return s.TruncateComposeRecords(ctx, _mod)
 }
 
-func ComposeRecordReport(ctx context.Context, s ComposeRecords, _mod *types.Module, _metrics string, _dimensions string, _filters string) ([]map[string]interface{}, error) {
+func ComposeRecordReport(ctx context.Context, s ComposeRecords, _mod *types.Module, _metrics string, _dimensions string, _filters string) (ComposeRecordsReport, error) {
 	return s.ComposeRecordReport(ctx, _mod, _metrics, _dimensions, _filters)
 }
diff --git a/store/rdbms/attachments.gen.go b/store/rdbms/attachments.gen.go
index 488bafd2a..0118725ca 100644
--- a/store/rdbms/attachments.gen.go
+++ b/store/rdbms/attachments.gen.go
@@ -58,7 +58,7 @@ func (s Store) SearchAttachments(ctx context.Context, f types.AttachmentFilter)
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalAttachmentRowScanner(rows)
 				}
 
diff --git a/store/rdbms/compose_attachments.gen.go b/store/rdbms/compose_attachments.gen.go
index cff34063a..63767408b 100644
--- a/store/rdbms/compose_attachments.gen.go
+++ b/store/rdbms/compose_attachments.gen.go
@@ -58,7 +58,7 @@ func (s Store) SearchComposeAttachments(ctx context.Context, f types.AttachmentF
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalComposeAttachmentRowScanner(rows)
 				}
 
diff --git a/store/rdbms/compose_module_fields.gen.go b/store/rdbms/compose_module_fields.gen.go
index 5b0c76b81..a37910d65 100644
--- a/store/rdbms/compose_module_fields.gen.go
+++ b/store/rdbms/compose_module_fields.gen.go
@@ -58,7 +58,7 @@ func (s Store) SearchComposeModuleFields(ctx context.Context, f types.ModuleFiel
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalComposeModuleFieldRowScanner(rows)
 				}
 
diff --git a/store/rdbms/compose_record_values.gen.go b/store/rdbms/compose_record_values.gen.go
index c9d0c6c7d..1a90cb369 100644
--- a/store/rdbms/compose_record_values.gen.go
+++ b/store/rdbms/compose_record_values.gen.go
@@ -58,7 +58,7 @@ func (s Store) searchComposeRecordValues(ctx context.Context, _mod *types.Module
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalComposeRecordValueRowScanner(_mod, rows)
 				}
 
diff --git a/store/rdbms/credentials.gen.go b/store/rdbms/credentials.gen.go
index c9d4ee9b7..db408fbe5 100644
--- a/store/rdbms/credentials.gen.go
+++ b/store/rdbms/credentials.gen.go
@@ -58,7 +58,7 @@ func (s Store) SearchCredentials(ctx context.Context, f types.CredentialsFilter)
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalCredentialsRowScanner(rows)
 				}
 
diff --git a/store/rdbms/rbac_rules.gen.go b/store/rdbms/rbac_rules.gen.go
index e5bc0b27c..430e0d625 100644
--- a/store/rdbms/rbac_rules.gen.go
+++ b/store/rdbms/rbac_rules.gen.go
@@ -55,7 +55,7 @@ func (s Store) SearchRbacRules(ctx context.Context, f permissions.RuleFilter) (p
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalRbacRuleRowScanner(rows)
 				}
 
diff --git a/store/rdbms/role_members.gen.go b/store/rdbms/role_members.gen.go
index 22fe1aa4f..77c5907a8 100644
--- a/store/rdbms/role_members.gen.go
+++ b/store/rdbms/role_members.gen.go
@@ -55,7 +55,7 @@ func (s Store) SearchRoleMembers(ctx context.Context, f types.RoleMemberFilter)
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalRoleMemberRowScanner(rows)
 				}
 
diff --git a/store/rdbms/settings.gen.go b/store/rdbms/settings.gen.go
index 610d5fcd8..d699ebd96 100644
--- a/store/rdbms/settings.gen.go
+++ b/store/rdbms/settings.gen.go
@@ -58,7 +58,7 @@ func (s Store) SearchSettings(ctx context.Context, f types.SettingsFilter) (type
 			}
 
 			for rows.Next() {
-				if rows.Err() == nil {
+				if err = rows.Err(); err == nil {
 					res, err = s.internalSettingRowScanner(rows)
 				}