[freeside-commits] freeside/FS/FS Schema.pm, 1.168.2.39, 1.168.2.40 cgp_rule_condition.pm, 1.1.2.4, 1.1.2.5

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Schema.pm cgp_rule_condition.pm 
Log Message:
mysql compat: cgp_rule_condition s/condition/conditionname/

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.168.2.39
retrieving revision 1.168.2.40
diff -u -w -d -r1.168.2.39 -r1.168.2.40
--- Schema.pm	23 May 2010 01:59:21 -0000	1.168.2.39
+++ Schema.pm	7 Jun 2010 00:09:10 -0000	1.168.2.40
@@ -1638,7 +1638,7 @@
     'cgp_rule_condition' => {
       'columns' => [
         'ruleconditionnum',  'serial',     '',      '', '', '',
-        'condition',        'varchar',     '', $char_d, '', '',
+        'conditionname',    'varchar',     '', $char_d, '', '',
         'op',               'varchar', 'NULL', $char_d, '', '',
         'params',           'varchar', 'NULL',     255, '', '',
         'rulenum',              'int',     '',      '', '', '',

Index: cgp_rule_condition.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cgp_rule_condition.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -d -r1.1.2.4 -r1.1.2.5
--- cgp_rule_condition.pm	23 May 2010 01:59:21 -0000	1.1.2.4
+++ cgp_rule_condition.pm	7 Jun 2010 00:09:14 -0000	1.1.2.5
@@ -36,7 +36,7 @@
 
 primary key
 
-=item condition
+=item conditionname
 
 condition
 
@@ -113,7 +113,7 @@
 
   my $error = 
     $self->ut_numbern('ruleconditionnum')
-    || $self->ut_text('condition')
+    || $self->ut_text('conditionname')
     || $self->ut_textn('op')
     || $self->ut_textn('params')
     || $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum')
@@ -125,13 +125,13 @@
 
 =item arrayref
 
-Returns an array reference of the condition, op and params fields.
+Returns an array reference of the conditionname, op and params fields.
 
 =cut
 
 sub arrayref {
   my $self = shift;
-  [ map $self->$_, qw( condition op params ) ];
+  [ map $self->$_, qw( conditionname op params ) ];
 }
 
 =back