[freeside-commits] branch FREESIDE_4_BRANCH updated. bdddb139d967f587280354431eac3170c4eaf561

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  bdddb139d967f587280354431eac3170c4eaf561 (commit)
      from  5c45bff8652bc3850625d3ba5db29e8dceb940da (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 bdddb139d967f587280354431eac3170c4eaf561
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Mar 18 11:58:11 2017 -0700

    drop h_access_user_log if it exists from a previous beta, RT#75160

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index c860453..3a99cd3 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -567,6 +567,9 @@ sub upgrade_schema_data {
     'cust_bill_pkg_detail' => [],
     #add necessary columns to RT schema
     'TicketSystem' => [],
+    #remove h_access_user_log if it exists (since our regular auto schema
+    # upgrade doesn't have the drop tables flag turned on) 
+    'access_user_log' => [],
     #remove possible dangling records
     'password_history' => [],
     'cust_pay_pending' => [],
diff --git a/FS/FS/access_user_log.pm b/FS/FS/access_user_log.pm
index 563f3ce..026670c 100644
--- a/FS/FS/access_user_log.pm
+++ b/FS/FS/access_user_log.pm
@@ -135,6 +135,17 @@ sub check {
 
 =back
 
+=cut
+
+sub _upgrade_schema {
+  my ($class, %opts) = @_;
+
+  my $sql = 'DROP TABLE IF EXISTS h_access_user_log';
+
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+}
+
 =head1 BUGS
 
 =head1 SEE ALSO

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

Summary of changes:
 FS/FS/Upgrade.pm         |    3 +++
 FS/FS/access_user_log.pm |   11 +++++++++++
 2 files changed, 14 insertions(+)