From 2029d3997a6c795a55bb869298b08958fab4ee56 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 19 Oct 2013 22:54:51 -0700
Subject: add -c flag to skip cdr and h_cdr updates, RT#21464

---
 FS/bin/freeside-upgrade | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 06ec96205..893f5d41d 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -1,8 +1,8 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r);
-use vars qw($DEBUG $DRY_RUN);
+use vars qw( $opt_d $opt_s $opt_q $opt_v $opt_r $opt_c );
+use vars qw( $DEBUG $DRY_RUN );
 use Getopt::Std;
 use DBIx::DBSchema 0.31; #0.39
 use FS::UID qw(adminsuidsetup checkeuid datasrc driver_name);
@@ -17,7 +17,7 @@ my $start = time;
 
 die "Not running uid freeside!" unless checkeuid();
 
-getopts("dqrs");
+getopts("dqrcs");
 
 $DEBUG = !$opt_q;
 #$DEBUG = $opt_v;
@@ -154,6 +154,12 @@ unless ( driver_name =~ /^mysql/i ) {
          @statements;
 }
 
+if ( $opt_c ) {
+  @statements =
+    grep { $_ !~ /^ *ALTER +TABLE +(h_)?cdr /i }
+         @statements;
+}
+
 if ( $DRY_RUN ) {
   print
     join(";\n", @statements ). ";\n";
@@ -312,7 +318,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -r ] [ c ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
@@ -337,6 +343,8 @@ 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.
+
   [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
           current default.
 
-- 
cgit v1.2.1


From d25be172b2bfdc1a49e3bf54719155cb853391bb Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 19 Oct 2013 22:55:16 -0700
Subject: add -c flag to skip cdr and h_cdr updates, RT#21464

---
 FS/bin/freeside-upgrade | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 893f5d41d..6fbf39bbc 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -155,9 +155,15 @@ unless ( driver_name =~ /^mysql/i ) {
 }
 
 if ( $opt_c ) {
+
   @statements =
     grep { $_ !~ /^ *ALTER +TABLE +(h_)?cdr /i }
          @statements;
+
+  @statements =
+    grep { $_ !~ /^ *CREATE +INDEX +(h_)?cdr\d+ /i }
+         @statements;
+
 }
 
 if ( $DRY_RUN ) {
-- 
cgit v1.2.1


From 36e9ed91017e5fffcfe30242fd8a4c68c0c07220 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 24 Oct 2013 02:04:10 -0700
Subject: doc

---
 FS/bin/freeside-upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 6fbf39bbc..7cacf105c 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -324,7 +324,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -r ] [ c ] [ -s ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -r ] [ -c ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
-- 
cgit v1.2.1