--- a/scripts/bash_completion.pl	Sun Aug 16 01:40:44 2015 +0200
+++ b/scripts/bash_completion.pl	Tue Aug 18 23:37:22 2015 +0200
@@ -39,6 +39,7 @@
 
 my $databasesFile  = "$configDir/bash-completion/databases";
 my $formattersFile = "$configDir/bash-completion/formatters";
+my $defaultFormatterFile = "$configDir/bash-completion/default-formatter";
 my $formatterPropertiesDir = "$configDir/bash-completion/formatter-properties";
 
 print '#have sql-dk &&
@@ -47,12 +48,17 @@
 	for token in "$@"; do
 		if [ "x$previous" == "x--formatter" ]; then
 			echo -n "$token";
+			return 0;
 		fi
 		previous="$token";
 	done
+	
+	if [ -f '.$defaultFormatterFile.' ]; then
+		cat '.$defaultFormatterFile.'
+	fi
 }
 
-_sql_dk_bash_completion_formatter_property() {
+_sql_dk_bash_completion_formatter_property_name() {
 	if [ -n "$formatter" ]; then # TODO: this does not match formatter name in apostrophes or quotes
 		local formatter_dir='.$formatterPropertiesDir.'/$formatter
 		if [ -d  $formatter_dir ]; then
@@ -105,7 +111,7 @@
 		;;
 	--formatter-property)
 		formatter=$( _sql_dk_bash_completion_find_formatter "${COMP_WORDS[@]}" );
-		COMPREPLY=( $( compgen -W "$(_sql_dk_bash_completion_formatter_property )" -- $cur ) ); 
+		COMPREPLY=( $( compgen -W "$(_sql_dk_bash_completion_formatter_property_name )" -- $cur ) ); 
 		return 0;
 		;;
 	esac;