[freeside-commits] branch master updated. 71bfc1b5f19f25d0e330664d53bf8f641e5088d9

[Ivan]

The branch, master has been updated
       via  71bfc1b5f19f25d0e330664d53bf8f641e5088d9 (commit)
      from  f3bd5f3e5da4f3d65ac3c4ae57df309921177cf1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 71bfc1b5f19f25d0e330664d53bf8f641e5088d9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Feb 28 11:21:04 2016 -0800

    cdr upgrade required for 4.x, RT#32043

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index dd20688..9c28115 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -181,6 +181,9 @@ unless ( driver_name =~ /^mysql/i ) {
 
 if ( $opt_c ) {
 
+  #can always add it back for 4.x->4.x if we need it
+  die "FATAL: -c removed: cdr / h_cdr upgrade is required for 4.x\n";
+
   @statements =
     grep { $_ !~ /^ *ALTER +TABLE +(h_)?cdr /i }
          @statements;
@@ -430,7 +433,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade [ -d ] [ -q | -v ] [ -r ] [ -c ] [ -s ] [ -j ] [ -a ] user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -q | -v ] [ -r ] [ -s ] [ -j ] [ -a ] user\n"; 
 }
 
 =head1 NAME
@@ -439,7 +442,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -q | -v ] [ -r ] [ -c ] [ -s ] [ -j ] [ -a ]
+  freeside-upgrade [ -d ] [ -q | -v ] [ -r ] [ -s ] [ -j ] [ -a ]
 
 =head1 DESCRIPTION
 
@@ -470,8 +473,6 @@ Also performs other upgrade functions:
   [ -r ]: Skip sqlradius updates.  Useful for occassions where the sqlradius
           databases may be inaccessible.
 
-  [ -c ]: Skip cdr and h_cdr updates.
-
   [ -j ]: Run certain upgrades asychronously from the job queue.  Currently 
           used only for the 2.x -> 3.x cust_location, cust_pay and part_pkg
           upgrades.  This may cause odd behavior before the upgrade is

-----------------------------------------------------------------------

Summary of changes:
 FS/bin/freeside-upgrade |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)