fix bugs

R/edit_db_config.R

@@ -12,8 +12,9 @@ edit_db_config <- function() {
 #' @importFrom purrr `%||%`
 #' @export
 get_dbInfo <- function(name = NULL) {
-  config <- yaml::read_yaml("~/.db.yml")
-  if (file.exists(config)) {
+  f = normalizePath("~/.db.yml")
+  if (file.exists(f)) {
+    config <- yaml::read_yaml(f)
     name <- name %||% names(config)[1]
     if (name == "all") config else config[[name]]
   } else {

scripts/database/test-db_perm.Rmd

@@ -25,16 +25,6 @@ con_mariadb = open_mariadb(dbinfo, 1)
 con <- open_mariadb()
 ```
 
-```{r}
-table = tbl(con, "China_Mete2000_hourly_2020_2022")
-
-system.time({
-  d <- table |>
-    filter(site == 50136) |>
-    collect()
-})
-```
-
 ## 测试基础命令
 
 ```{r}

scripts/test_dbase.R

@@ -1,12 +1,18 @@
 library(dplyr)
 library(duckdb)
-# dbinfo$hourly_2020_2022
 
-db = dbase$new()
+## hourly气象数据
+dbinfo <- get_dbInfo("duckdb")
+f = dbinfo$hourly_2020_2022$db
+db = dbase$new(f)
+db
+
 d <- db$read_data(site == 50246L) # first time about 20s, 16s可以读进来所有数据
 d <- db$read_data(site == 50246L) # 0.6s
-# db$close(force=TRUE)
+# db$close()
 
+## 径流数据
 f = "z:/DATA/China/ChinaRunoff_latest/ChinaWater_latest/back_up/ChinaWater_river (20200603H22-20210116H14).db"
 db <- dbase$new(f)
-db$read_table()
+db
+db$read_data(stcd == 10701210L)

tests/testthat/test-write_table.R

@@ -5,7 +5,8 @@ test_write_table <- function(f = "hello.db") {
   db$write_table(mtcars, "mtcars", append = TRUE)
   d = db$read_table("mtcars")
   expect_equal(nrow(d), 2 * nrow(mtcars))
-
+  print(db)
+
   db$close()
   file.remove(f)
 }