not changing this hopefully will cause fewer upgrade conflicts. stupid BPS header

[freeside.git] / FS / FS / Schema.pm

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 000c6a5..84ca0a7 100644 (file)
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1298,6 +1298,7 @@ sub tables_hashref {
         'pay_weight',    'real',    'NULL', '', '', '',
         'credit_weight', 'real',    'NULL', '', '', '',
         'agentnum',      'int',     'NULL', '', '', '', 
+        'fcc_ds0s',      'int',     'NULL', '', '', '', 
 
       ],
       'primary_key' => 'pkgpart',
@@ -1623,40 +1624,40 @@ sub tables_hashref {
 
     'cgp_rule' => {
       'columns' => [
-        'rulenum',  'serial', '',      '', '', '',
-        'name',    'varchar', '', $char_d, '', '',
-        'comment', 'varchar', '', $char_d, '', '',
-        'svcnum',      'int', '',      '', '', '',
-        'priority',    'int', '',      '', '', '',
+        'rulenum',  'serial',     '',      '', '', '',
+        'name',    'varchar',     '', $char_d, '', '',
+        'comment', 'varchar', 'NULL', $char_d, '', '',
+        'svcnum',      'int',     '',      '', '', '',
+        'priority',    'int',     '',      '', '', '',
       ],
       'primary_key' => 'rulenum',
-      'unique'      => [],
-      'index '      => [ [ 'svcnum' ] ],
+      'unique'      => [ [ 'svcnum', 'name' ] ],
+      'index'       => [ [ 'svcnum' ] ],
     },
 
     'cgp_rule_condition' => {
       'columns' => [
-        'ruleconditionnum',  'serial', '',      '', '', '',
-        'condition',        'varchar', '', $char_d, '', '',
-        'op',               'varchar', '', $char_d, '', '',
-        'params',           'varchar', '',     255, '', '',
-        'rulenum',              'int', '',      '', '', '',
+        'ruleconditionnum',  'serial',     '',      '', '', '',
+        'conditionname',    'varchar',     '', $char_d, '', '',
+        'op',               'varchar', 'NULL', $char_d, '', '',
+        'params',           'varchar', 'NULL',     255, '', '',
+        'rulenum',              'int',     '',      '', '', '',
       ],
       'primary_key' => 'ruleconditionnum',
       'unique'      => [],
-      'index '      => [ [ 'rulenum' ] ],
+      'index'       => [ [ 'rulenum' ] ],
     },
 
     'cgp_rule_action' => {
        'columns' => [
-        'ruleactionnum',  'serial', '',      '', '', '',
-        'action',        'varchar', '', $char_d, '', '',
-        'params',        'varchar', '',     255, '', '',
-        'rulenum',           'int', '',      '', '', '',
+        'ruleactionnum',  'serial',     '',      '', '', '',
+        'action',        'varchar',     '', $char_d, '', '',
+        'params',        'varchar', 'NULL',     255, '', '',
+        'rulenum',           'int',     '',      '', '', '',
       ],
       'primary_key' => 'ruleactionnum',
       'unique'      => [],
-      'index '      => [ [ 'rulenum' ] ],
+      'index'       => [ [ 'rulenum' ] ],
    },
 
     'svc_forward' => {