E47: change in SQL::Abstract v2 breaks sqlJoin

CHANGES

@@ -3,3 +3,4 @@ CHANGES from 3.7.4 onwards
 === release 3.7.5 (under construction)
 - #361 Individuals without roles not shown in call list
 - #365 = E41: correct use of AND between keyword lists
+- E47: change in SQL::Abstract v2 breaks sqlJoin

install/220.perl-modules

@@ -67,6 +67,7 @@ my @dependencies = qw(
 	Module::Find					0
 	Module::Load					0
 	Pod::Man						0
+	SQL::Abstract      				2.00
 	SQL::Abstract::More				0
 	String::Compare::ConstantTime	0
 	Sys::Syslog						0

pm/Taranis/Database.pm

@@ -280,21 +280,18 @@ sub logError {
 # FULL JOIN: Return rows when there is a match in one of the tables
 sub sqlJoin {
 	my ( $self, $join_columns, $stmnt ) = @_;
-	my ( $str, $table_key);
-	my %columns;
+	my $str;
 
-	for $table_key ( keys %$join_columns ) {
-		$str .= " " . $table_key . " ON ";
+	foreach my $table_key ( keys %$join_columns ) {
 		my $columns = $join_columns->{$table_key};
-		for my $column_key ( keys %$columns ) {
-			$str .= $column_key . " = " . $columns->{$column_key};
-		}
+		my ($key, $other) = %$columns;
+		$str .= " $table_key ON $key = $other ";
 	}
 
-	if ( $stmnt =~ m/(WHERE)/ ) {
-		$stmnt =~ s/( WHERE \()/$str WHERE \(/;
-	} elsif ( $stmnt =~ m/(ORDER BY)/ ) {
-		$stmnt =~ s/( ORDER BY )/$str ORDER BY /;
+	if ( $stmnt =~ m/ WHERE / ) {
+		$stmnt =~ s/ WHERE /$str WHERE /;
+	} elsif ( $stmnt =~ m/ ORDER BY / ) {
+		$stmnt =~ s/ ORDER BY /$str ORDER BY /;
 	} else {
 		$stmnt .= $str;
 	}