From: ivan <ivan>
Date: Mon, 16 Oct 2006 17:59:32 +0000 (+0000)
Subject: fix for agent_custid unique bs ('violates unique constraint cust_main18'), hope this... 
X-Git-Tag: TRIXBOX_2_6~920
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=05b08ed433c104303ddbe2c2b0a12043f2431f63

fix for agent_custid unique bs ('violates unique constraint cust_main18'), hope this doesn't break anything else
---

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index bd5dd27df..35ae45f5b 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -724,7 +724,7 @@ sub insert {
 
   #false laziness w/delete
   my @real_fields =
-    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+    grep { defined($self->getfield($_)) && $self->getfield($_) ne "" }
     real_fields($table)
   ;
   my @values = map { _quote( $self->getfield($_), $table, $_) } @real_fields;
@@ -1202,7 +1202,7 @@ sub _h_statement {
   $time ||= time;
 
   my @fields =
-    grep defined($self->getfield($_)) && $self->getfield($_) ne "",
+    grep { defined($self->getfield($_)) && $self->getfield($_) ne "" }
     real_fields($self->table);
   ;
   my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
@@ -1779,14 +1779,12 @@ sub _quote {
        ( $nullable ? ' NULL' : ' NOT NULL' ).
        ")\n" if $DEBUG > 2;
 
-  if ( $value eq '' && $column_type =~ /^(int|numeric)/ ) {
-    if ( $nullable ) {
-      'NULL';
-    } else {
-      cluck "WARNING: Attempting to set non-null integer $table.$column null; ".
-            "using 0 instead";
-      0;
-    }
+  if ( $value eq '' && $nullable ) {
+    'NULL'
+  } elsif ( $value eq '' && $column_type =~ /^(int|numeric)/ ) {
+    cluck "WARNING: Attempting to set non-null integer $table.$column null; ".
+          "using 0 instead";
+    0;
   } elsif ( $value =~ /^\d+(\.\d+)?$/ && 
             ! $column_type =~ /(char|binary|text)$/i ) {
     $value;