Skip to content

Commit

Permalink
Merge pull request #126 from mlverse/gsk
Browse files Browse the repository at this point in the history
Gsk
  • Loading branch information
edgararuiz authored Oct 1, 2024
2 parents aa1b3be + 96b3936 commit 144af42
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
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
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
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

0 comments on commit 144af42

Please sign in to comment.