From 49106cf87b21f4d948255f9785bd2b39312622e9 Mon Sep 17 00:00:00 2001 From: Tal Kain Date: Mon, 22 Apr 2013 17:50:27 +0300 Subject: [PATCH 1/2] lib/database: Fixed a bug in database_connection_url that was created by d95bd6f's changes 7e79d9139f931e45f732de9a39cc54bedd95bd6f's changes simplified the usage of database_connection_url_mysql and database_connection_url_postgresql without making the proper changes to database_connection_url. Signed-off-by: Tal Kain --- lib/database | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/database b/lib/database index e63d5e240d..08e360f98a 100644 --- a/lib/database +++ b/lib/database @@ -110,13 +110,11 @@ function configure_database { configure_database_$DATABASE_TYPE } -# Generate an SQLAlchemy connection URL and store it in a variable -# $1 The variable name in which to store the connection URL -# $2 The name of the database +# Generate an SQLAlchemy connection URL and output it using echo +# $1 The name of the database function database_connection_url { - local var=$1 - local db=$2 - database_connection_url_$DATABASE_TYPE $var $db + local db=$1 + database_connection_url_$DATABASE_TYPE $db } From 4804471647cf048d4517dd0cc50ed48eda1fdd77 Mon Sep 17 00:00:00 2001 From: Tal Kain Date: Mon, 22 Apr 2013 22:08:50 +0300 Subject: [PATCH 2/2] Fixed a documentation typo Signed-off-by: Tal Kain --- lib/database | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/database b/lib/database index 08e360f98a..442ed56fbe 100644 --- a/lib/database +++ b/lib/database @@ -38,7 +38,7 @@ done for db in $DATABASE_BACKENDS; do # Set the type for the rest of the backend to use if is_service_enabled $db; then - # Set this now for the rest of the database funtions + # Set this now for the rest of the database functions DATABASE_TYPE=$db fi done