Prefix direct call to function with a call to PERFORM. Thanks to Mich…

…ael Vitale for the feature request.
darold · Feb 22, 2016 · d4fc203 · d4fc203
1 parent 5dfe8b4
commit d4fc203
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/Ora2Pg.pm b/lib/Ora2Pg.pm
@@ -764,6 +764,7 @@ sub _init
 	$self->{standard_conforming_strings} = 1;
 	$self->{create_schema} = 1;
 	$self->{external_table} = ();
+	$self->{function_list} = ();
 
 	# Used to precise if we need to prefix partition tablename with main tablename
 	$self->{prefix_partition} = 0;
@@ -1187,6 +1188,7 @@ sub _init
 			}
 
 			$self->_get_pkg_functions() if (!$self->{package_as_schema} && (!grep(/^$self->{type}$/, 'COPY', 'INSERT', 'SEQUENCE', 'GRANT', 'TABLESPACE', 'QUERY', 'SYNONYM', 'FDW', 'KETTLE', 'DBLINK', 'DIRECTORY')));
+			@{$self->{function_list}} = $self->_list_all_funtions() if ($self->{plsql_pgsql} && (!grep(/^$self->{type}$/, 'COPY', 'INSERT', 'SEQUENCE', 'GRANT', 'TABLESPACE', 'QUERY', 'SYNONYM', 'FDW', 'KETTLE', 'DBLINK', 'DIRECTORY')));
 			$self->{security} = $self->_get_security_definer($self->{type}) if (grep(/^$self->{type}$/, 'TRIGGER', 'FUNCTION','PROCEDURE','PACKAGE'));
 		}
 

diff --git a/lib/Ora2Pg/PLSQL.pm b/lib/Ora2Pg/PLSQL.pm
@@ -596,6 +596,13 @@ sub plsql_to_plpgsql
 	$str =~ s/\%\%XMLELEMENT(\d+)\%\%/$xmlelt[$1]/igs;
 	@xmlelt = ();
 
+	####
+	# Search direct call to function to add PERFORM before
+	####
+	foreach my $f (@{$class->{function_list}}) {
+		$str =~ s/([;\s]+)$f\s*\(/$1PERFORM \L$f\E\(/igs;
+	}
+
 	##############
 	# Replace package.function call by package_function
 	##############