Add calls to make sure credentials are right shape, fail early on invalid connection, and add fallback for closing connection when function crashes.

Author: PietrH

R/get_acoustic_deployments.R

@@ -59,6 +59,13 @@ get_acoustic_deployments <- function(
   connection <-
     connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check if we can make a connection
   check_connection(connection)
 

R/get_acoustic_detections.R

@@ -96,6 +96,13 @@ get_acoustic_detections <- function(credentials = list(
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check if we can make a connection
   check_connection(connection)
 

R/get_acoustic_detections_page.R

@@ -60,6 +60,13 @@ get_acoustic_detections_page <- function(credentials = list(
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check if we can make a connection
   check_connection(connection)
 

R/get_acoustic_projects.R

@@ -37,6 +37,13 @@ get_acoustic_projects <- function(credentials = list(
   connection <-
     connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+
   # Check connection
   check_connection(connection)
 

R/get_acoustic_receivers.R

@@ -37,7 +37,13 @@ get_acoustic_receivers <- function(credentials = list(
                                    status = NULL) {
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
-
+  
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
   # Check connection
   check_connection(connection)
 

R/get_animal_projects.R

@@ -35,7 +35,14 @@ get_animal_projects <- function(credentials = list(
 
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
-
+  
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check connection
   check_connection(connection)
 

R/get_animals.R

@@ -58,7 +58,14 @@ get_animals <- function(credentials = list(
 
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
-
+ 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check connection
   check_connection(connection)
 

R/get_archival_data_uuid.R

@@ -26,6 +26,13 @@ get_archival_data_uuid <- function(credentials = list(
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+
   # Check connection
   check_connection(connection)
 

R/get_cpod_projects.R

@@ -35,7 +35,14 @@ get_cpod_projects <- function(credentials = list(
 
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
-
+ 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+  
   # Check connection
   check_connection(connection)
 

R/get_tags.R

@@ -55,6 +55,13 @@ get_tags <- function(credentials = list(
   # Create connection object
   connection <- connect_to_etn(credentials$username, credentials$password)
 
+  # Ensure the connection is closed when the function exits, even when it fails.
+  withr::defer(
+    if (DBI::dbIsValid(connection)) {
+      DBI::dbDisconnect(connection)
+    }
+  )
+
   # Check connection
   check_connection(connection)