Remove "template=template0" from db connection params.

It's not a valid connection param. Only pass it to Rails in test mode
as a pseudo connection param.

No issue #

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/build/run-library.sh b/build/run-library.sh
index ac5dc718be1c6e36e86e743bf0805ab11c891da7..fd37f632b0350fac411e5d3e2fb819c8c045d7af 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -912,7 +912,9 @@ timer_reset() {
 }
 
 timer() {
-    echo -n "$(($SECONDS - $t0))s"
+    if [[ -n "$t0" ]]; then
+        echo -n "$(($SECONDS - $t0))s"
+    fi
 }
 
 report_outcomes() {

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 22d4f62ea0fd1bf5a8d6718e2d410b79d5377d72..734bb04270bcfc7c94891542add7806b390350bc 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -676,7 +676,6 @@ def setup_config():
            "dbname": "arvados_test",
            "user": "arvados",
            "password": "insecure_arvados_test",
-            "template": "template0", # used by RailsAPI when [re]creating the database
         }
 
     localhost = "127.0.0.1"

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 8d2544dde1e81945e65a580886333098a3ccf6e8..502e3e787d1e1324217983f73cd841bce0e1ea1a 100644 (file)
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -253,6 +253,11 @@ end
 if ::Rails.env.to_s == "test" && db_config["test"].nil?
   $arvados_config["PostgreSQL"]["Connection"]["dbname"] = "arvados_test"
 end
+if ::Rails.env.to_s == "test"
+  # Use template0 when creating a new database. Avoids
+  # character-encoding/collation problems.
+  $arvados_config["PostgreSQL"]["Connection"]["template"] = "template0"
+end
 
 if $arvados_config["PostgreSQL"]["Connection"]["password"].empty?
   raise "Database password is empty, PostgreSQL section is: #{$arvados_config["PostgreSQL"]}"