-
Notifications
You must be signed in to change notification settings - Fork 175
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
Simplify escaping strategy #1396
Merged
Merged
Changes from 45 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
8105d7b
First stab
hadley fb1e38a
Merge commit '388a6eef0e634efa693d809061ceac91d3b69a77'
hadley d03a206
Fixing alias escaping
hadley 054ee2b
Fix argument name
hadley 892b23e
Correct escaping in sql_star()
hadley f7a65bc
Extract table name from id string
hadley afa58e9
More getting stuff to work
hadley f370e12
Restore missing con argument
hadley 6ca54e3
Making progress on joins
hadley 3365fe8
Add c method
hadley c520833
x_as and y_as are now already escaped
hadley 9c5ac01
Escape LHS & RHS names
hadley ffd27e8
Generate aliases based on table names
hadley 381a7ed
Misc fixes
hadley d8b66f3
Ensure unique_query_name() generates esacped name
hadley 2b2c3d2
Escaping now happens earlier
hadley 8ec7670
Update postgres setup information
hadley 68c799c
Remove old ident code
hadley 6889d45
Start testing table_name functions
hadley 73d9628
Merged origin/main into simplify-escaping
hadley 90bc9a1
Rename constructor
hadley fa83a18
Reorganise table-name file
hadley 8ae7399
Fix R CMD check issues
hadley 0048df6
Move as and is functions closer & test together
hadley 2ef6fba
More explaining & re-organising
hadley 07aee8e
Make as_table_name() stricter
hadley 90ee786
Test more methods; fix test
hadley 0baaf3c
Update old function
hadley fbc23aa
Tweak argument checking to hopefully fix problems on older R
hadley a749f3c
Simplify code; keep question
hadley 2252c79
WS
hadley 0ebc70f
Update temporary table prefix
hadley 5024363
Add table name check
hadley 12f682f
Implement check_table_name()
hadley bff0130
unique_subquery_name() no longer needs con
hadley e7bef90
Coerce rather than checking
hadley ac051f7
RPostgreSQL needs unquoted table name
hadley b8e9b62
Disable windows R3.6 checking for RMariaDB
hadley 7ddea50
Use correct function name
hadley 86aeea5
Refine table_name_table() interface
hadley af52e5e
Teach S4 that dbplyr_table_name inherits from character
hadley fd5eaec
Move coercion back to methods
hadley 177af83
Merge commit '781d630b3ae059e7e8f2176c7261a48ba17a53d3'
mgirlich dd2d0c3
Use dev odbc for testing MS SQL
mgirlich 2e83a36
Remove remote odbc and require >= 1.4.2 instead
mgirlich 6c3c2a6
Update R/lazy-join-query.R
hadley 091b04f
sql_table_name_prefix() improvements
hadley b85ca5d
Make `c()` safer
hadley a434eb0
Handle unquoting within in_schema/in_catalog
hadley 09e78e7
Uncomment accidentally commented tests
hadley 2cc65f3
Qualify is
hadley c28dd74
Add bullet about index name
hadley c88c355
Rename table_name to table_path
hadley 27a789f
Add news bullets
hadley 261b3d6
Merged origin/main into simplify-escaping
hadley 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 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 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 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 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 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 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 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 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 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 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
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.
I think
table
should be converted to a table name first. Otherwise, e.g.db_write_table(con, in_schema("schema1", "table1"))
won't work.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.
I don't remember what I was thinking when I wrote this code, but coming back to it now, it looks like
db_write_table()
expectstable
to already be a table name.