Enhance sqlpath.Glob to actually support glob wildcard#2955
Merged
kyleconroy merged 6 commits intosqlc-dev:mainfrom Nov 14, 2023
Merged
Enhance sqlpath.Glob to actually support glob wildcard#2955kyleconroy merged 6 commits intosqlc-dev:mainfrom
sqlpath.Glob to actually support glob wildcard#2955kyleconroy merged 6 commits intosqlc-dev:mainfrom
Conversation
Contributor
Author
|
@sqlc-dev please take a look |
kyleconroy
changed the title
sqlpath.Glob to actually support glob wildcart.sqlpath.Glob to actually support glob wildcard
Collaborator
|
@iamwavecut I made a few changes to the PR. I remove the nolint comment, as we don't use those anywhere in the codebase. I only call filepath.Glob if the path contains I also changed the error messages to include the info from os.Stat. This information isn't as useful as the results from lstat, but it is more consistent across platforms. |
Contributor
Author
|
@kyleconroy Sure! Thanks for the improvements. |
Contributor
Author
|
Is there a chance that I'll see this released anytime soon? @kyleconroy |
Collaborator
|
@iamwavecut This will be released in 1.24.0 sometime next week. |
alfonsodev
pushed a commit
to ExponentiaTeam/sqlc
that referenced
this pull request
Oct 13, 2025
* add: test for `sqlpath.Glob` * fix: improve tests, minor change one expected error message * add: glob expanding maintaining backward compartibility * feat(sqlpath): Support filepath.Glob patterns * fix: Remove nolint comment --------- Co-authored-by: Valeriy Selitskiy <[email protected]> Co-authored-by: Kyle Conroy <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR enhances the
Globfunction in theinternal/sqlpathpackage to support glob patterns in the input paths. It also adds comprehensive tests for theGlobfunction, ensuring its correct behavior and in various scenarios, as well as protects it from regressions.Problem
I want
sqlcto be able to collect queries from different modules of my applications:Epected:
Normal execution.
Actual:
internal/sql/sqlpath/read_test.go: Introduced a new test file with multiple test cases for the Glob function. These tests cover various scenarios like handling of SQL files, non-SQL files, hidden files, non-existent paths, unreadable directories, and symlinks.internal/sql/sqlpath/read.go: Added a new functionexpandGlobs to expand glob patterns in the input paths. TheGlobfunction now callsexpandGlobs before processing the paths. Also, added error handling for cases where the path does not exist or is not a file.internal/sql/sqlpath/testdata/: Dummy directory of files and symlinks to test various scenarios.