Skip to content

Commit 397d952

Browse files
committed
Adapt to upstream ListSources signature change
1 parent bb2051b commit 397d952

File tree

3 files changed

+2
-41
lines changed

3 files changed

+2
-41
lines changed

cmd/msgvault/cmd/list_accounts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Examples:
3131
}
3232
defer s.Close()
3333

34-
sources, err := s.ListSources()
34+
sources, err := s.ListSources("")
3535
if err != nil {
3636
return fmt.Errorf("list accounts: %w", err)
3737
}

internal/store/store_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func TestStore_Source_UpdateDisplayName(t *testing.T) {
9393
func TestStore_ListSources(t *testing.T) {
9494
f := storetest.New(t)
9595

96-
sources, err := f.Store.ListSources()
96+
sources, err := f.Store.ListSources("")
9797
testutil.MustNoErr(t, err, "ListSources()")
9898

9999
if len(sources) != 1 {

internal/store/sync.go

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -348,42 +348,3 @@ func (s *Store) GetSourceByIdentifier(identifier string) (*Source, error) {
348348

349349
return &source, nil
350350
}
351-
352-
// ListSources returns all sources ordered by identifier.
353-
func (s *Store) ListSources() ([]*Source, error) {
354-
rows, err := s.db.Query(`
355-
SELECT id, source_type, identifier, display_name, google_user_id,
356-
last_sync_at, sync_cursor, created_at, updated_at
357-
FROM sources
358-
ORDER BY identifier
359-
`)
360-
if err != nil {
361-
return nil, err
362-
}
363-
defer rows.Close()
364-
365-
var sources []*Source
366-
for rows.Next() {
367-
var source Source
368-
var createdAt, updatedAt sql.NullTime
369-
370-
err := rows.Scan(
371-
&source.ID, &source.SourceType, &source.Identifier, &source.DisplayName,
372-
&source.GoogleUserID, &source.LastSyncAt, &source.SyncCursor, &createdAt, &updatedAt,
373-
)
374-
if err != nil {
375-
return nil, err
376-
}
377-
378-
if createdAt.Valid {
379-
source.CreatedAt = createdAt.Time
380-
}
381-
if updatedAt.Valid {
382-
source.UpdatedAt = updatedAt.Time
383-
}
384-
385-
sources = append(sources, &source)
386-
}
387-
388-
return sources, rows.Err()
389-
}

0 commit comments

Comments
 (0)