[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 03cd85038089d04b3cd68db559ce24696e0ffbba

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  03cd85038089d04b3cd68db559ce24696e0ffbba (commit)
      from  f0e8baa6b05d1f71b76edcf19050a29218b7db60 (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 03cd85038089d04b3cd68db559ce24696e0ffbba
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Apr 26 13:26:11 2012 -0700

    better duplicate checking for ip address, #17515

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index fdf29e0..a403af3 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2544,7 +2544,7 @@ sub tables_hashref {
         'plan_id',             'varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'svcnum',
-      'unique'      => [ [ 'mac_addr' ] ],
+      'unique'      => [ [ 'ip_addr' ], [ 'mac_addr' ] ],
       'index'       => [],
     },
 
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 636ba1f..3074932 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -542,9 +542,9 @@ sub _check_ip_addr {
 
 sub _check_duplicate {
   my $self = shift;
-
-  $self->lock_table;
-
+  # Not a reliable check because the table isn't locked, but 
+  # that's why we have a unique index.  This is just to give a
+  # friendlier error message.
   my @dup;
   @dup = $self->find_duplicates('global', 'ip_addr');
   if ( @dup ) {

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

Summary of changes:
 FS/FS/Schema.pm        |    2 +-
 FS/FS/svc_broadband.pm |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)