Skip to content

Extend references with new ShowSchemas type#4

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.

Sign up for GitHub

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
osipovartem merged 3 commits into from
Jan 15, 2025
Merged

Extend references with new ShowSchemas type #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
343acd3
Extend references with new SHowSchemas type
osipovartem Jan 15, 2025
ced6999
Make resolve_table_ref as pub
osipovartem Jan 15, 2025
9ab7d58
Fix docs linter
osipovartem Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions datafusion/core/src/catalog_common/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,6 +156,8 @@ pub fn resolve_table_references(
| Statement::ShowColumns { .. }
| Statement::ShowTables { .. }
| Statement::ShowCollation { .. }
| Statement::ShowSchemas { .. }
| Statement::ShowDatabases { .. }
);
if requires_information_schema {
for s in INFORMATION_SCHEMA_TABLES {
Expand Down
10 changes: 6 additions & 4 deletions datafusion/core/src/execution/session_state.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,7 +285,9 @@ impl SessionState {
.build()
}

pub(crate) fn resolve_table_ref(
/// Resolves a [`TableReference`] to a [`ResolvedTableReference`]
/// using the default catalog and schema.
pub fn resolve_table_ref(
&self,
table_ref: impl Into<TableReference>,
) -> ResolvedTableReference {
Expand DownExpand Up@@ -845,9 +847,9 @@ impl SessionState {
overwrite: bool,
) -> Result<(), DataFusionError> {
let ext = file_format.get_ext().to_lowercase();
match (self.file_formats.entry(ext.clone()), overwrite){
(Entry::Vacant(e), _) => {e.insert(file_format);},
(Entry::Occupied(mut e), true) => {e.insert(file_format);},
match (self.file_formats.entry(ext.clone()), overwrite){
(Entry::Vacant(e), _) => {e.insert(file_format); }
(Entry::Occupied(mut e), true) => {e.insert(file_format); }
(Entry::Occupied(_), false) => return config_err!("File type already registered for extension {ext}. Set overwrite to true to replace this extension."),
};
Ok(())
Expand Down