X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=d3723a1887d26d54d5821302a074117940f4048c;hb=055fa6decdbd89e00f2b6e3faf77b068eea38c93;hp=a0a5fe68cacffc482c4eb0de6a4b09cf452a9810;hpb=045317ec26f501428a9f0282beb52f463b8e927c;p=freeside.git

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index a0a5fe68c..d3723a188 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -11,7 +11,7 @@ use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 use FS::Misc::prune qw(prune_applications);
 use FS::Conf;
 use FS::Record qw(qsearch);
-use FS::Upgrade qw(upgrade upgrade_sqlradius);
+use FS::Upgrade qw(upgrade_schema upgrade_config upgrade upgrade_sqlradius);
 
 my $start = time;
 
@@ -61,6 +61,35 @@ if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) {
       if (dbdef->table('h_cust_main')); 
 }
 
+if ( dbdef->table('cgp_rule_condition') &&
+     dbdef->table('cgp_rule_condition')->column('condition') 
+   )
+{
+  push @bugfix,
+   "ALTER TABLE ${_}cgp_rule_condition RENAME COLUMN condition TO conditionname"
+      for '', 'h_';
+
+}
+
+if ( $DRY_RUN ) {
+  print
+    join(";\n", @bugfix ). ";\n";
+} elsif ( @bugfix ) {
+
+  foreach my $statement ( @bugfix ) {
+    warn "$statement\n";
+    $dbh->do( $statement )
+      or die "Error: ". $dbh->errstr. "\n executing: $statement";
+  }
+
+  upgrade_schema();
+
+  dbdef_create($dbh, $dbdef_file);
+  delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
+  reload_dbdef($dbdef_file);
+
+}
+
 #you should have run fs-migrate-part_svc ages ago, when you upgraded
 #from 1.3 to 1.4... if not, it needs to be hooked into -upgrade here or
 #you'll lose all the part_svc settings it migrates to part_svc_column
@@ -83,10 +112,10 @@ unless ( driver_name =~ /^mysql/i ) {
 
 if ( $DRY_RUN ) {
   print
-    join(";\n", @bugfix, @statements ). ";\n";
+    join(";\n", @statements ). ";\n";
   exit;
 } else {
-  foreach my $statement ( @bugfix, @statements ) {
+  foreach my $statement ( @statements ) {
     warn "$statement\n";
     $dbh->do( $statement )
       or die "Error: ". $dbh->errstr. "\n executing: $statement";
@@ -170,6 +199,14 @@ $dbh = adminsuidsetup($user);
 warn "Re-initialization with updated schema completed in ". (time-$start). " seconds\n"; # if $DEBUG;
 $start = time;
 
+upgrade_config()
+  unless $DRY_RUN || $opt_s;
+
+$dbh->commit or die $dbh->errstr;
+
+warn "Config updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
+
 upgrade()
   unless $DRY_RUN || $opt_s;