Simplify database_connection_url

* does not expects dynamic scoping. * does not uses eval. Change-Id: I5ba4e5b7ffaabbb3c2bddadf9e53a2875de8b7c0
2013-03-03 12:23:04 +01:00
parent 48053c791d
commit 7e79d9139f
9 changed files with 12 additions and 26 deletions
@@ -115,9 +115,8 @@ EOF
 }

 function database_connection_url_mysql {
-    local output=$1
-    local db=$2
-    eval "$output=$BASE_SQL_CONN/$db?charset=utf8"
+    local db=$1
+    echo "$BASE_SQL_CONN/$db?charset=utf8"
 }

 # Restore xtrace
@@ -70,9 +70,8 @@ EOF
 }

 function database_connection_url_postgresql {
-    local output=$1
-    local db=$2
-    eval "$output=$BASE_SQL_CONN/$db?client_encoding=utf8"
+    local db=$1
+    echo "$BASE_SQL_CONN/$db?client_encoding=utf8"
 }

 # Restore xtrace