-
Notifications
You must be signed in to change notification settings - Fork 0
feat: Implement sql.Scanner interface #24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f212aa9
test: add map_test.go for testing map-related functionality
freeformz f4fd3a8
test: add comprehensive test cases for Map's Scan method
freeformz dba9db5
feat: add Scan method for Map type to support database scanning
freeformz 02770ba
refactor: extract common Scan method logic into shared scanValue func…
freeformz 5e91df9
test: add placeholder comment for additional Map type tests
freeformz 92c77f9
test: add comprehensive Scan tests for all Map types
freeformz c4a246c
chore: other cleanups
freeformz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .aider* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,6 +45,9 @@ func (s *Map[M]) Contains(m M) bool { | |
|
|
||
| // Clear the set and returns the number of elements removed. | ||
| func (s *Map[M]) Clear() int { | ||
| if s.set == nil { | ||
| s.set = make(map[M]struct{}) | ||
| } | ||
| n := len(s.set) | ||
| for k := range s.set { | ||
| delete(s.set, k) | ||
|
|
@@ -134,12 +137,32 @@ func (s *Map[M]) UnmarshalJSON(d []byte) error { | |
| } | ||
|
|
||
| s.Clear() | ||
| if s.set == nil { | ||
| s.set = make(map[M]struct{}) | ||
| } | ||
| for _, m := range um { | ||
| s.Add(m) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // scanValue is a helper function that implements the common logic for scanning values into sets. | ||
| // It handles nil, []byte, and string types, delegating to the provided unmarshal function. | ||
| func scanValue[M comparable](src any, clear func() int, unmarshal func([]byte) error) error { | ||
|
||
| switch st := src.(type) { | ||
| case nil: | ||
| clear() | ||
| return nil | ||
| case []byte: | ||
| return unmarshal(st) | ||
| case string: | ||
| return unmarshal([]byte(st)) | ||
| default: | ||
| return fmt.Errorf("cannot scan set of type %T - not []byte or string", st) | ||
| } | ||
| } | ||
|
|
||
| // Scan implements the sql.Scanner interface. It scans the value from the database into the set. It expects a JSON array | ||
| // of the elements in the set. If the JSON is invalid an error is returned. If the value is nil an empty set is | ||
| // returned. | ||
| func (s *Map[M]) Scan(src any) error { | ||
| return scanValue[M](src, s.Clear, s.UnmarshalJSON) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Initializing the map in
Clearisn’t strictly needed—len(nil)is 0 anddeleteon a nil map is a no-op. Consider removing the init here and relying on the constructor to handle map allocation.