catchall *can* be NULL

2 files changed, 5 insertions, 4 deletions

diff --git a/bin/fs-setup b/bin/fs-setup
index 7056347e6..faa0e07f1 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.43 2001-08-19 13:50:47 ivan Exp $
+# $Id: fs-setup,v 1.44 2001-08-29 08:45:04 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -359,12 +359,13 @@ sub tables_hash_hack {
         'tax',      'char', 'NULL', 1,
         'otaker',   'varchar', '',     8,
         'refnum',   'int',  '',     '',
+        'referral_custnum', 'int',  'NULL', '',
         'comments', 'varchar', 'NULL', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [] ],
       #'index' => [ ['last'], ['company'] ],
-      'index' => [ ['last'], [ 'company' ] ],
+      'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
     },
 
     'cust_main_invoice' => {
@@ -598,7 +599,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int',    '',    '',
+        'catchall',  'int', 'NULL',    '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index dfbe6a253..3edc87864 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -71,7 +71,7 @@ CREATE TABLE svc_forward (
   PRIMARY KEY (svcnum)
 );
 ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
-ALTER TABLE svc_domain ADD catchall integer;
+ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc integer NULL;
 ALTER TABLE part_svc ADD svc_acct__domsvc_flag char(1) NULL;
 ALTER TABLE part_svc ADD svc_domain__catchall integer NULL;