[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.47, 1.168.2.48 acct_snarf.pm, 1.3.8.2, 1.3.8.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv10867/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm acct_snarf.pm 
Log Message:
LEAVE is reserved in msyql

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.47
retrieving revision 1.168.2.48
diff -u -w -d -r1.168.2.47 -r1.168.2.48
--- Schema.pm	16 Aug 2010 17:50:58 -0000	1.168.2.47
+++ Schema.pm	17 Aug 2010 06:43:07 -0000	1.168.2.48
@@ -2012,7 +2012,7 @@
         'username',   'varchar',     '', $char_d, '', '', 
         '_password',  'varchar',     '', $char_d, '', '', 
         'check_freq',     'int', 'NULL',      '', '', '', 
-        'leave',         'char', 'NULL',       1, '', '', 
+        'leavemail',     'char', 'NULL',       1, '', '', 
         'apop',          'char', 'NULL',       1, '', '', 
         'tls',           'char', 'NULL',       1, '', '', 
         'mailbox',    'varchar', 'NULL', $char_d, '', '', 

Index: acct_snarf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/acct_snarf.pm,v
retrieving revision 1.3.8.2
retrieving revision 1.3.8.3
diff -u -w -d -r1.3.8.2 -r1.3.8.3
--- acct_snarf.pm	7 Aug 2010 10:11:44 -0000	1.3.8.2
+++ acct_snarf.pm	17 Aug 2010 06:43:07 -0000	1.3.8.3
@@ -142,7 +142,7 @@
     || $self->ut_alphan('protocol')
     || $self->ut_textn('username')
     || $self->ut_numbern('check_freq')
-    || $self->ut_enum('leave', [ '', 'Y' ])
+    || $self->ut_enum('leavemail', [ '', 'Y' ])
     || $self->ut_enum('apop', [ '', 'Y' ])
     || $self->ut_enum('tls', [ '', 'Y' ])
     || $self->ut_alphan('mailbox')
@@ -197,7 +197,7 @@
     'period'   => $self->check_freq.'s',
     'APOP'     => ( $self->apop  eq 'Y' ? 'YES' : 'NO' ),
     'TLS'      => ( $self->tls   eq 'Y' ? 'YES' : 'NO' ),
-    'Leave'    => ( $self->leave eq 'Y' ? 'YES' : 'NO' ), #XXX leave??
+    'Leave'    => ( $self->leavemail eq 'Y' ? 'YES' : 'NO' ), #XXX leave??
   };
 }