Fix of build-extension-update-files.pl

Author: cvvergara

sql/scripts/build-extension-update-files.pl

@@ -107,6 +107,9 @@ sub Usage {
 my ($new_minor) = $new_version  =~ $minor_format;
 my ($old_minor) = $old_version  =~ $minor_format;
 
+print "old mayor $old_mayor new mayor $new_mayor\n";
+print "old minor $old_minor new minor $new_minor\n";
+
 my $curr_signature_file_name = "$signature_dir/pgrouting--$new_minor.sig";
 my $old_signature_file_name = "$signature_dir/pgrouting--$old_minor.sig";
 my $curr_sql_file_name = "$output_directory/pgrouting--$new_version.sql";
@@ -223,19 +226,19 @@ sub generate_upgrade_script {
         }
 
         # updating to 3.4+
-        if ($old_mayor == 2 or ($old_mayor == 3 and $old_minor < 4)) {
+        if ($old_minor < 3.4) {
             push @commands, drop_special_case_function("pgr_maxcardinalitymatch(text,boolean)");
         }
 
         # updating to 3.5+
-        if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 5)) {
+        if ($old_minor < 3.5) {
             push @commands, drop_special_case_function("pgr_dijkstra(text,anyarray,bigint,boolean)");
             push @commands, drop_special_case_function("pgr_dijkstra(text,bigint,anyarray,boolean)");
             push @commands, drop_special_case_function("pgr_dijkstra(text,bigint,bigint,boolean)");
         }
 
         # updating to 3.6+
-        if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 6)) {
+        if ($old_minor < 3.6) {
             push @commands, drop_special_case_function("pgr_withpointsksp(text, text, bigint, bigint, integer, boolean, boolean, char, boolean)");
             push @commands, drop_special_case_function("pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision)");
             push @commands, drop_special_case_function("pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision)");
@@ -251,7 +254,7 @@ sub generate_upgrade_script {
         }
 
         # updating to 3.7+
-        if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 7)) {
+        if ($old_mayor >= 3.0 && $old_minor < 3.7) {
             push @commands, drop_special_case_function("pgr_primbfs(text,anyarray,bigint)");
             push @commands, drop_special_case_function("pgr_primbfs(text,bigint,bigint)");
             push @commands, drop_special_case_function("pgr_primdfs(text,anyarray,bigint)");
@@ -271,7 +274,7 @@ sub generate_upgrade_script {
         }
 
         # updating to 3.7+
-        if ($old_mayor == 3 && $old_minor >= 4 && $old_minor < 8) {
+        if ($old_minor >= 3.4 && $old_minor < 3.8) {
             push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean)");
             push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean)");
         }
@@ -285,9 +288,12 @@ sub generate_upgrade_script {
     if ($old_mayor == 2) {
         push @commands, update_from_version_2();
     }
+
+=pod
     if ("$old_version" eq "3.0.0") {
         push @commands, update_from_version_3_0_0();
     }
+=cut
 
     # UGH! someone change the definition of the TYPE or reused an existing
     # TYPE name which is VERY BAD because other people might be dependent
@@ -453,6 +459,7 @@ sub others_3_0_0 {
         '"",seq,vid,target_array');
     return @commands;
 }
+
 =pod
 *****************************************************************
 code beyond this point is v2.6 specific