Ikke bruk raplogTest som key

Ødelegger test. Bruker også miljøvariabler brukt hos NHN
Rapporteket · Oct 24, 2024 · 2bd32e8 · 2bd32e8
1 parent 7b59ad4
commit 2bd32e8
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/R/dbConnection.R b/R/dbConnection.R
@@ -16,23 +16,23 @@ rapOpenDbConnection <- function(registryName = "data", dbType = "mysql") {
   if (Sys.getenv("R_RAP_INSTANCE") %in% c("QAC", "PRODUCTIONC")) {
     conf <- switch(
       registryName,
-      "raplogTest" = data.frame(
-        name = Sys.getenv("DB_NAME"),
-        host = Sys.getenv("DB_HOST_LOG"),
-        user = Sys.getenv("DB_USER"),
-        password = Sys.getenv("DB_PASS")
+      "raplog" = data.frame(
+        name = Sys.getenv("MYSQL_DB"),
+        host = Sys.getenv("MYSQL_HOST_LOG"),
+        user = Sys.getenv("MYSQL_USERNAME"),
+        password = Sys.getenv("MYSQL_PASSWORD")
       ),
       "autoreport" = data.frame(
-        name = Sys.getenv("DB_NAME"),
-        host = Sys.getenv("DB_HOST_AUTOREPORT"),
-        user = Sys.getenv("DB_USER"),
-        password = Sys.getenv("DB_PASS")
+        name = Sys.getenv("MYSQL_DB"),
+        host = Sys.getenv("MYSQL_HOST_AUTOREPORT"),
+        user = Sys.getenv("MYSQL_USERNAME"),
+        password = Sys.getenv("MYSQL_PASSWORD")
       ),
       "data" = data.frame(
-        name = Sys.getenv("DB_NAME"),
-        host = Sys.getenv("DB_HOST_DATA"),
-        user = Sys.getenv("DB_USER"),
-        password = Sys.getenv("DB_PASS")
+        name = Sys.getenv("MYSQL_DB"),
+        host = Sys.getenv("MYSQL_HOST"),
+        user = Sys.getenv("MYSQL_USERNAME"),
+        password = Sys.getenv("MYSQL_PASSWORD")
       )
     )
   } else {
@@ -55,6 +55,7 @@ rapOpenDbConnection <- function(registryName = "data", dbType = "mysql") {
       host = conf$host,
       user = conf$user,
       password = conf$pass,
+      port = as.numeric(Sys.getenv("MYSQL_PORT", "3306")),
       bigint = "integer"
     )
     # ensure utf8 encoding