Browse Source

minor changes

# Conflicts:
#	src/bin/admin/tests/data/pgsql.lease6_dump_test.reference.csv
Tomek Mrugalski 8 years ago
parent
commit
6b4fef59e9
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/bin/admin/kea-admin.in

+ 3 - 3
src/bin/admin/kea-admin.in

@@ -292,7 +292,7 @@ pgsql_upgrade() {
     for script in ${scripts_dir}/pgsql/upgrade*.sh
     for script in ${scripts_dir}/pgsql/upgrade*.sh
     do
     do
         echo "Processing $script file..."
         echo "Processing $script file..."
-        sh ${script} -U ${db_user} -d ${db_name}
+        sh ${script} -U ${db_user} -h localhost -d ${db_name}
     done
     done
 
 
     version=`pgsql_version`
     version=`pgsql_version`
@@ -460,7 +460,7 @@ pgsql_dump() {
 
 
     # Call psql and redirect output to the dump file. We don't use psql "to csv"
     # Call psql and redirect output to the dump file. We don't use psql "to csv"
     # as it can only be run as db superuser.
     # as it can only be run as db superuser.
-    echo "$dump_qry" | psql --set ON_ERROR_STOP=1 -t -q --user=$db_user --dbname=$db_name -w --no-align --field-separator=',' >$dump_file
+    echo "$dump_qry" | psql --set ON_ERROR_STOP=1 -t -h localhost -q --user=$db_user --dbname=$db_name -w --no-align --field-separator=',' >$dump_file
     retcode=$?
     retcode=$?
 
 
     # Check for errors.
     # Check for errors.
@@ -493,7 +493,7 @@ cql_dump() {
         select_where_clause=" WHERE address = 0" # invalid address
         select_where_clause=" WHERE address = 0" # invalid address
     elif [ $dump_type -eq 6 ]; then
     elif [ $dump_type -eq 6 ]; then
         dump_qry="SELECT address,duid,valid_lifetime,expire,subnet_id,pref_lifetime,lease_type,iaid,prefix_len,fqdn_fwd,fqdn_rev,hostname,hwaddr,hwtype,hwaddr_source,state FROM keatest.lease6"
         dump_qry="SELECT address,duid,valid_lifetime,expire,subnet_id,pref_lifetime,lease_type,iaid,prefix_len,fqdn_fwd,fqdn_rev,hostname,hwaddr,hwtype,hwaddr_source,state FROM keatest.lease6"
-        select_where_clause=" WHERE address = ::" # invalid address
+        select_where_clause=" WHERE address = '::'" # invalid address
     fi
     fi
 
 
     # Make sure they specified a file
     # Make sure they specified a file