Skip to content
Snippets Groups Projects
Commit 3377b631 authored by ronan.vignard's avatar ronan.vignard
Browse files

Merge branch 'dev' into 'master'

Passage en v0.1.3

See merge request dreal-pdl/csd/collectr!34
parents ffa7bd2e 2c753f3e
No related branches found
No related tags found
1 merge request!34Passage en v0.1.3
Pipeline #487277 passed
Package: collectr
Title: Easy File Import
Version: 0.1.2
Version: 0.1.3
Authors@R:
person("Ronan", "Vignard", , "ronan.vignard@developpement-durable.gouv.fr", role = c("aut", "cre"),
comment = c(ORCID = "0000-0000-0000-0000"))
......
# collectr 0.1.3
* Remplacement de la librairie `xlsx` par `readxl`
* Ajout de l'option `ecoSQL=FALSE` à l'appel de la fonction `datalibaba::connect_db()`
* Remplacement de `DBI::dbSendQuery` par `DBI::dbSendStatement` dans la fonction `archive_table()`
# collectr 0.1.2
* Résolution du bug sur la fonction `import_and_merge_tables()`
......
......@@ -186,20 +186,14 @@ fix_encoding_variable <- function(data, variable) {
```
```{r example-fix_encoding_variable, eval=FALSE}
<<<<<<< HEAD
#' \dontrun{
=======
>>>>>>> master
# Utilisation de la fonction fix_encoding_variable()
nitrate_analyse_esu_2023 <- fix_encoding_variable(nitrate_analyse_esu_2023,
"libelle_station")
# Vérification de l'encodage corrigé
head(nitrate_analyse_esu_2023$libelle_station)
<<<<<<< HEAD
#' }
=======
>>>>>>> master
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment