Merge branch 'master' of github.com:darold/ora2pg

adil246 · Nov 30, 2021 · 871d98d · 871d98d
2 parents c77e586 + ca58acb
commit 871d98d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/Ora2Pg/PLSQL.pm b/lib/Ora2Pg/PLSQL.pm
@@ -1041,6 +1041,8 @@ sub plsql_to_plpgsql
 	} elsif ($str =~ s/;(\s+)([^;]+)SQL\%ROWCOUNT/;$1GET DIAGNOSTICS ora2pg_rowcount = ROW_COUNT;\n$1$2 ora2pg_rowcount/igs) {
 		$class->{get_diagnostics} = 'ora2pg_rowcount int;';
 	}
+	# SQL%ROWCOUNT with concatenated string
+	$str =~ s/(\s+)(GET DIAGNOSTICS )([^\s]+)( = ROW_COUNT)(\s+\|\|[^;]+);/$1$2$3$4;$1$3 := $3 $5;/;
 
 	# Sometime variable used in FOR ... IN SELECT loop is not declared
 	# Append its RECORD declaration in the DECLARE section.