Fix error handling while fetching rows
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user