Skip to content
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

Jump to bottom

Gsk #126

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Gsk #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36cf183
Escapes catalog and schema names for connections pane
edgararuiz Oct 1, 2024
96b3936
ver bump, news update
edgararuiz Oct 1, 2024
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: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: pysparklyr
Title: Provides a 'PySpark' Back-End for the 'sparklyr' Package
Version: 0.1.5.9001
Version: 0.1.5.9002
Authors@R: c(
person("Edgar", "Ruiz", , "[email protected]", role = c("aut", "cre")),
person(given = "Posit Software, PBC", role = c("cph", "fnd"))
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# pysparklyr (dev)

* Fixes issues with catalog and schema names with dashes in the Connections
Pane.

* Adds IDE check for positron (#121)

* Avoids failure when an unexpected error from Databricks is returned (#123)
Expand Down
6 changes: 3 additions & 3 deletions R/ide-connections-pane.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ catalog_python <- function(
out <- rs_get_databases(con, limit, catalog)
} else {
if (is.null(catalog)) {
sql_schema <- "show tables in {schema}"
sql_schema <- "show tables in `{schema}`"
} else {
sql_schema <- "show tables in {catalog}.{schema}"
sql_schema <- "show tables in `{catalog}`.`{schema}`"
}
tables <- dbGetQuery(con, glue(sql_schema))
out <- df_tables
Expand All @@ -99,7 +99,7 @@ catalog_python <- function(
rs_get_databases <- function(con, limit = NA, catalog = NULL) {
out <- data.frame()
if (!is.null(catalog)) {
databases <- dbGetQuery(con, glue("show databases in {catalog}"))
databases <- dbGetQuery(con, glue("show databases in `{catalog}`"))
} else {
databases <- dbGetQuery(con, glue("show databases"))
}
Expand Down
Loading