Skip to content

Commit 1ecdea9

Browse files
committed
ajout d'arguments de sélection des tables pour la fonction imp_importer_aspe_idg()
1 parent 371c8a7 commit 1ecdea9

7 files changed

Lines changed: 46 additions & 27 deletions

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: aspe
22
Type: Package
33
Title: An R Package to Analyse and Visualise River Fish Data in France
4-
Version: 0.5.1
5-
Date: 2025-10-16
4+
Version: 0.5.2
5+
Date: 2025-11-04
66
Authors@R: c(
77
person(given = "Pascal",
88
family = "Irz",

NAMESPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ export(gg_temp_ipr_pc_bon)
2424
export(gg_temp_metriq)
2525
export(gg_temp_metriq_grille)
2626
export(gg_temp_peuplement)
27+
export(imp_connecter_aspe_idg)
2728
export(imp_corres_aspe_taxref)
29+
export(imp_deconnecter_aspe_idg)
2830
export(imp_extraire_noms_tables)
2931
export(imp_extraire_noms_tables2)
3032
export(imp_importer_aspe_idg)
@@ -79,8 +81,6 @@ export(mef_ssech_esp_env)
7981
export(misc_charger_donnees_test)
8082
export(misc_derniere_date)
8183
export(misc_nom_dernier_fichier)
82-
export(start_connexion_aspe_idg)
83-
export(stop_connexion_aspe_idg)
8484
import(dplyr)
8585
import(utils)
8686
importFrom(DBI,Id)

R/imp_importer_aspe_idg.R

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
#' Importer les tables ASPE à partir de la BDD IDG (OFB)
1+
#' Importer les tables ASPE à partir de la BDD IDG (OFB).
2+
#' Par défaut elles le sont toutes.
23
#'
34
#' @param conn connexion à la BDD
5+
#' @param tab_excl Vecteur caractère indiquant les éventuelles tables à ne pas importer.
6+
#' @param tab_select Vecteur caractère indiquant les tables à importer. Prime sur tab_excl.
47
#' @param ... autre
58
#'
69
#' @returns Les dataframes correspondant à chacune des tables de la base (sauf celles expurgées au préalable)
@@ -13,14 +16,14 @@
1316
#'
1417
#' @examples
1518
#' \dontrun{
16-
#' bdd_aspe <- start_connexion_aspe_idg()
19+
#' bdd_aspe <- imp_connecter_aspe_idg()
1720
#'
1821
#' imp_importer_aspe_idg(conn = bdd_aspe)
1922
#'
20-
#' stop_connexion_aspe_idg(conn = bdd_aspe)
23+
#' imp_deconnecter_aspe_idg(conn = bdd_aspe)
2124
#' }
2225

23-
imp_importer_aspe_idg <- function(conn, ...){
26+
imp_importer_aspe_idg <- function(conn, tab_excl = NA, tab_select = NA, ...){
2427

2528
table_names <-
2629
conn %>%
@@ -33,6 +36,16 @@ imp_importer_aspe_idg <- function(conn, ...){
3336
table_names <-
3437
table_names[!grepl('batch_', table_names)]
3538

39+
if (is.character(tab_select)) {
40+
table_names <-
41+
table_names[table_names %in% tab_select]
42+
} else {
43+
if (is.character(tab_excl)) {
44+
table_names <-
45+
table_names[!table_names %in% tab_excl]
46+
}
47+
}
48+
3649
for (table_name in table_names) {
3750
id <- cli::cli_process_start("table {.val {table_name}}")
3851
tryCatch({

R/utils-connexion-idg.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#'
1414
#' @examples
1515
#' \dontrun{
16-
#' bdd_aspe <- start_connexion_aspe_idg()
16+
#' bdd_aspe <- imp_connecter_aspe_idg()
1717
#'
1818
#' }
1919
#'
2020

21-
start_connexion_aspe_idg <- function() {
21+
imp_connecter_aspe_idg <- function() {
2222
required_vars <- c(
2323
'BDD_IDG_HOST',
2424
'BDD_IDG_PORT',
@@ -89,12 +89,12 @@ start_connexion_aspe_idg <- function() {
8989
#'
9090
#' @examples
9191
#' \dontrun{
92-
#' bdd_aspe <- start_connexion_aspe_idg()
92+
#' bdd_aspe <- imp_connecter_aspe_idg()
9393
#'
94-
#' stop_connexion_aspe_idg(conn = bdd_aspe)
94+
#' imp_deconnecter_aspe_idg(conn = bdd_aspe)
9595
#' }
9696

9797
#' @importFrom DBI dbDisconnect
98-
stop_connexion_aspe_idg <- function(conn) {
98+
imp_deconnecter_aspe_idg <- function(conn) {
9999
DBI::dbDisconnect(conn)
100100
}
Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/imp_importer_aspe_idg.Rd

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)