Skip to content

Commit

Permalink
Revert "Merge pull request #363 from r-dbi/edwindj-main"
Browse files Browse the repository at this point in the history
- Remove RStudio Connection pane support due to problems reported by users.

This reverts commit 4c46b69, reversing
changes made to 9132213.

Reverts changes from #352 and #363, CC @edwindj.
  • Loading branch information
krlmlr committed Apr 22, 2021
1 parent 5b33496 commit ec83c9c
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 187 deletions.
1 change: 0 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ Collate:
'query.R'
'regularExpressions.R'
'rownames.R'
'rstudioConnections.R'
'table.R'
'transactions.R'
'utils.R'
Expand Down
7 changes: 0 additions & 7 deletions R/connect.R
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ setMethod("dbConnect", "SQLiteDriver",
}
)

# rstudio connections tab
on_connection_opened(conn)

conn
}
)
Expand Down Expand Up @@ -258,9 +255,5 @@ setMethod("dbConnect", "SQLiteConnection", function(drv, ...) {
#' @rdname SQLite
setMethod("dbDisconnect", "SQLiteConnection", function(conn, ...) {
connection_release(conn@ptr)

# rstudio connections tab
on_connection_closed(conn)

invisible(TRUE)
})
155 changes: 0 additions & 155 deletions R/rstudioConnections.R

This file was deleted.

12 changes: 0 additions & 12 deletions R/table.R
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ setMethod("dbWriteTable", c("SQLiteConnection", "character", "data.frame"),

dbCommit(conn, name = savepoint_id)
on.exit(NULL)

# rstudio connections tab
on_connection_updated(conn, paste0("Updating table '", name, "'"))

invisible(TRUE)
}
)
Expand Down Expand Up @@ -242,10 +238,6 @@ setMethod("dbWriteTable", c("SQLiteConnection", "character", "character"),

dbCommit(conn, name = savepoint_id)
on.exit(NULL)

# rstudio connections tab
on_connection_updated(conn, paste0("Updating table '", name, "'"))

invisible(TRUE)
}
)
Expand Down Expand Up @@ -370,10 +362,6 @@ setMethod("dbRemoveTable", c("SQLiteConnection", "character"),
}

dbExecute(conn, paste0("DROP TABLE ", extra, name))

# rstudio connections tab
on_connection_updated(conn, paste0("Removing table '", name, "'"))

invisible(TRUE)
}
)
Expand Down
Binary file removed inst/icons/sqlite.png
Binary file not shown.
3 changes: 0 additions & 3 deletions inst/rstudio/connections.dcf

This file was deleted.

9 changes: 0 additions & 9 deletions inst/rstudio/connections/SQLite.R

This file was deleted.

0 comments on commit ec83c9c

Please sign in to comment.