X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffs-setup;h=aeaacbc00ff4c9a4bd842b51a24e05b82e426f86;hb=4c5b1b08168b20da1a87e9b82ee87ad18cb3ddd6;hp=7e043d238b2397ff8b81ad0142aff14359ef1aa1;hpb=c5c0ba135749164ec8ba75d18f76c29625e1bc7e;p=freeside.git

diff --git a/bin/fs-setup b/bin/fs-setup
index 7e043d238..aeaacbc00 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.73 2002-01-29 17:42:46 ivan Exp $
+# $Id: fs-setup,v 1.98 2002-09-19 13:34:51 ivan Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
 
 use strict;
 use DBI;
-use DBIx::DBSchema 0.19;
+use DBIx::DBSchema 0.20;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
@@ -16,6 +16,7 @@ use FS::UID qw(adminsuidsetup datasrc checkeuid getsecrets);
 use FS::Record;
 use FS::cust_main_county;
 use FS::raddb;
+use FS::part_bill_event;
 
 die "Not running uid freeside!" unless checkeuid();
 
@@ -132,32 +133,62 @@ foreach $attribute (@check_attributes) {
   ));
 }
 
-##make part_svc table (but now as object)
-#
-#my($part_svc)=$dbdef->table('part_svc');
-#
-##because of svc_acct_pop
-##foreach (grep /^svc_/, $dbdef->tables) { 
-##foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-#foreach (qw(svc_acct svc_domain svc_forward svc_www)) {
-#  my($table)=$dbdef->table($_);
-#  my($col);
-#  foreach $col ( $table->columns ) {
-#    next if $col =~ /^svcnum$/;
-#    $part_svc->addcolumn( new DBIx::DBSchema::Column (
-#      $table->name. '__' . $table->column($col)->name,
-#      'varchar', #$table->column($col)->type, 
-#      'NULL',
-#      $char_d, #$table->column($col)->length,
-#    ));
-#    $part_svc->addcolumn ( new DBIx::DBSchema::Column (
-#      $table->name. '__'. $table->column($col)->name . "_flag",
-#      'char',
-#      'NULL',
-#      1,
-#    ));
-#  }
-#}
+#create history tables (false laziness w/create-history-tables)
+foreach my $table ( grep { ! /^h_/ } $dbdef->tables ) {
+  my $tableobj = $dbdef->table($table)
+    or die "unknown table $table";
+
+  die "unique->lol_ref undefined for $table"
+    unless defined $tableobj->unique->lol_ref;
+  die "index->lol_ref undefined for $table"
+    unless defined $tableobj->index->lol_ref;
+
+  my $h_tableobj = DBIx::DBSchema::Table->new( {
+    name        => "h_$table",
+    primary_key => 'historynum',
+    unique      => DBIx::DBSchema::ColGroup::Unique->new( [] ),
+    'index'     => DBIx::DBSchema::ColGroup::Index->new( [
+                     @{$tableobj->unique->lol_ref},
+                     @{$tableobj->index->lol_ref}
+                   ] ),
+    columns     => [
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'historynum',
+                       'type'    => 'serial',
+                       'null'    => 'NOT NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_date',
+                       'type'    => 'int',
+                       'null'    => 'NULL',
+                       'length'  => '',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_user',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     DBIx::DBSchema::Column->new( {
+                       'name'    => 'history_action',
+                       'type'    => 'varchar',
+                       'null'    => 'NOT NULL',
+                       'length'  => '80',
+                       'default' => '',
+                       'local'   => '',
+                     } ),
+                     map { $tableobj->column($_) } $tableobj->columns
+                   ],
+  } );
+  $dbdef->addtable($h_tableobj);
+}
 
 #important
 $dbdef->save($dbdef_file);
@@ -172,10 +203,9 @@ my($dbh)=adminsuidsetup $user;
 #create tables
 $|=1;
 
-my @sql = $dbdef->sql($dbh);
 foreach my $statement ( $dbdef->sql($dbh) ) {
   $dbh->do( $statement )
-    or die "CREATE error: ",$dbh->errstr, "\ndoing statement: $statement";
+    or die "CREATE error: ". $dbh->errstr. "\ndoing statement: $statement";
 }
 
 #not really sample data (and shouldn't default to US)
@@ -234,6 +264,28 @@ YE YU ZR ZM ZW
   die $error if $error;
 }
 
+#billing events
+foreach my $aref ( 
+  [ 'COMP', 'Comp invoice', '$cust_bill->comp();', 30, 'comp' ],
+  [ 'CARD', 'Batch card', '$cust_bill->batch_card();', 40, 'batch-card' ],
+  [ 'BILL', 'Send invoice', '$cust_bill->send();', 50, 'send' ],
+) {
+
+  my $part_bill_event = new FS::part_bill_event({
+    'payby' => $aref->[0],
+    'event' => $aref->[1],
+    'eventcode' => $aref->[2],
+    'seconds' => 0,
+    'weight' => $aref->[3],
+    'plan' => $aref->[4],
+  });
+  my($error);
+  $error=$part_bill_event->insert;
+  die $error if $error;
+
+}
+
+$dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
 print "Freeside database initialized sucessfully\n";
@@ -255,25 +307,25 @@ sub tables_hash_hack {
 
     'agent' => {
       'columns' => [
-        'agentnum', 'int',            '',     '',
+        'agentnum', 'serial',            '',     '',
         'agent',    'varchar',           '',     $char_d,
         'typenum',  'int',            '',     '',
         'freq',     'int',       'NULL', '',
         'prog',     @perl_type,
       ],
       'primary_key' => 'agentnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['typenum'] ],
     },
 
     'agent_type' => {
       'columns' => [
-        'typenum',   'int',  '', '',
+        'typenum',   'serial',  '', '',
         'atype',     'varchar', '', $char_d,
       ],
       'primary_key' => 'typenum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'type_pkgs' => {
@@ -288,7 +340,7 @@ sub tables_hash_hack {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'int',  '', '',
+        'invnum',    'serial',  '', '',
         'custnum',   'int',  '', '',
         '_date',     @date_type,
         'charged',   @money_type,
@@ -296,25 +348,28 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'invnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
     'cust_bill_event' => {
       'columns' => [
-        'eventnum',    'int',  '', '',
+        'eventnum',    'serial',  '', '',
         'invnum',   'int',  '', '',
         'eventpart',   'int',  '', '',
         '_date',     @date_type,
+        'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
       ],
       'primary_key' => 'eventnum',
-      'unique' => [ [ 'eventpart', 'invnum' ] ],
-      'index' => [ ['invnum'] ],
+      #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
+      'unique' => [],
+      'index' => [ ['invnum'], ['status'] ],
     },
 
     'part_bill_event' => {
       'columns' => [
-        'eventpart',    'int',  '', '',
+        'eventpart',    'serial',  '', '',
         'payby',       'char',  '', 4,
         'event',       'varchar',           '',     $char_d,
         'eventcode',    @perl_type,
@@ -325,7 +380,7 @@ sub tables_hash_hack {
         'disabled',     'char', 'NULL', 1,
       ],
       'primary_key' => 'eventpart',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['payby'] ],
     },
 
@@ -345,7 +400,7 @@ sub tables_hash_hack {
 
     'cust_credit' => {
       'columns' => [
-        'crednum',  'int', '', '',
+        'crednum',  'serial', '', '',
         'custnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
@@ -354,26 +409,26 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'crednum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
     'cust_credit_bill' => {
       'columns' => [
-        'creditbillnum', 'int', '', '',
+        'creditbillnum', 'serial', '', '',
         'crednum',  'int', '', '',
         'invnum',  'int', '', '',
         '_date',    @date_type,
         'amount',   @money_type,
       ],
       'primary_key' => 'creditbillnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['crednum'], ['invnum'] ],
     },
 
     'cust_main' => {
       'columns' => [
-        'custnum',  'int',  '',     '',
+        'custnum',  'serial',  '',     '',
         'agentnum', 'int',  '',     '',
 #        'titlenum', 'int',  'NULL',   '',
         'last',     'varchar', '',     $char_d,
@@ -417,19 +472,19 @@ sub tables_hash_hack {
         'comments', 'text', 'NULL', '',
       ],
       'primary_key' => 'custnum',
-      'unique' => [ [] ],
+      'unique' => [],
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ] ],
     },
 
     'cust_main_invoice' => {
       'columns' => [
-        'destnum',  'int',  '',     '',
+        'destnum',  'serial',  '',     '',
         'custnum',  'int',  '',     '',
         'dest',     'varchar', '',  $char_d,
       ],
       'primary_key' => 'destnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'], ],
     },
 
@@ -437,21 +492,23 @@ sub tables_hash_hack {
                             #cust_main_county for validation and to provide
                             # a tax rate.
       'columns' => [
-        'taxnum',   'int',   '',    '',
+        'taxnum',   'serial',   '',    '',
         'state',    'varchar',  'NULL',    $char_d,
         'county',   'varchar',  'NULL',    $char_d,
         'country',  'char',  '', 2, 
+        'taxclass',   'varchar', 'NULL', $char_d,
+        'exempt_amount', @money_type,
         'tax',      'real',  '',    '', #tax %
       ],
       'primary_key' => 'taxnum',
-      'unique' => [ [] ],
+      'unique' => [],
   #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [ [] ],
+      'index' => [],
     },
 
     'cust_pay' => {
       'columns' => [
-        'paynum',   'int',    '',   '',
+        'paynum',   'serial',    '',   '',
         #now cust_bill_pay #'invnum',   'int',    '',   '',
         'custnum',  'int',    '',   '',
         'paid',     @money_type,
@@ -463,27 +520,27 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'paynum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [ [ 'custnum' ], [ 'paybatch' ] ],
     },
 
     'cust_bill_pay' => {
       'columns' => [
-        'billpaynum', 'int',     '',   '',
+        'billpaynum', 'serial',     '',   '',
         'invnum',  'int',     '',   '',
         'paynum',  'int',     '',   '',
         'amount',  @money_type,
         '_date',   @date_type
       ],
       'primary_key' => 'billpaynum',
-      'unique' => [ [] ],
-      'index' => [ [ 'paynum', 'invnum' ] ],
+      'unique' => [],
+      'index' => [ [ 'paynum' ], [ 'invnum' ] ],
     },
 
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
-        'paybatchnum',   'int',    '',   '',
+        'paybatchnum',   'serial',    '',   '',
         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,
@@ -491,7 +548,7 @@ sub tables_hash_hack {
         'address1', 'varchar', '',     $char_d,
         'address2', 'varchar', 'NULL', $char_d,
         'city',     'varchar', '',     $char_d,
-        'state',    'varchar', '',     $char_d,
+        'state',    'varchar', 'NULL', $char_d,
         'zip',      'varchar', '',     10,
         'country',  'char', '',     2,
 #        'trancode', 'int', '', '',
@@ -502,13 +559,13 @@ sub tables_hash_hack {
         'amount',   @money_type,
       ],
       'primary_key' => 'paybatchnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['invnum'], ['custnum'] ],
     },
 
     'cust_pkg' => {
       'columns' => [
-        'pkgnum',    'int',    '',   '',
+        'pkgnum',    'serial',    '',   '',
         'custnum',   'int',    '',   '',
         'pkgpart',   'int',    '',   '',
         'otaker',    'varchar', '', 8,
@@ -520,13 +577,13 @@ sub tables_hash_hack {
         'manual_flag', 'char', 'NULL', 1,
       ],
       'primary_key' => 'pkgnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['custnum'] ],
     },
 
     'cust_refund' => {
       'columns' => [
-        'refundnum',    'int',    '',   '',
+        'refundnum',    'serial',    '',   '',
         #now cust_credit_refund #'crednum',      'int',    '',   '',
         'custnum',  'int',    '',   '',
         '_date',        @date_type,
@@ -540,38 +597,38 @@ sub tables_hash_hack {
         'closed',    'char', 'NULL', 1,
       ],
       'primary_key' => 'refundnum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'cust_credit_refund' => {
       'columns' => [
-        'creditrefundnum', 'int',     '',   '',
+        'creditrefundnum', 'serial',     '',   '',
         'crednum',  'int',     '',   '',
         'refundnum',  'int',     '',   '',
         'amount',  @money_type,
         '_date',   @date_type
       ],
       'primary_key' => 'creditrefundnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'crednum', 'refundnum' ] ],
     },
 
 
     'cust_svc' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
+        'svcnum',    'serial',    '',   '',
         'pkgnum',    'int',    'NULL',   '',
         'svcpart',   'int',    '',   '',
       ],
       'primary_key' => 'svcnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ],
     },
 
     'part_pkg' => {
       'columns' => [
-        'pkgpart',    'int',    '',   '',
+        'pkgpart',    'serial',    '',   '',
         'pkg',        'varchar',   '',   $char_d,
         'comment',    'varchar',   '',   $char_d,
         'setup',      @perl_type,
@@ -582,10 +639,11 @@ sub tables_hash_hack {
         'plan',       'varchar', 'NULL', $char_d,
         'plandata',   'text', 'NULL', '',
         'disabled',   'char', 'NULL', 1,
+        'taxclass',   'varchar', 'NULL', $char_d,
       ],
       'primary_key' => 'pkgpart',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
 #    'part_title' => {
@@ -611,29 +669,29 @@ sub tables_hash_hack {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'int',    '',   '',
+        'refnum',   'serial',    '',   '',
         'referral', 'varchar',   '',   $char_d,
       ],
       'primary_key' => 'refnum',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'part_svc' => {
       'columns' => [
-        'svcpart',    'int',    '',   '',
+        'svcpart',    'serial',    '',   '',
         'svc',        'varchar',   '',   $char_d,
         'svcdb',      'varchar',   '',   $char_d,
         'disabled',   'char',  'NULL',   1,
       ],
       'primary_key' => 'svcpart',
-      'unique' => [ [] ],
-      'index' => [ [] ],
+      'unique' => [],
+      'index' => [],
     },
 
     'part_svc_column' => {
       'columns' => [
-        'columnnum',   'int',         '', '',
+        'columnnum',   'serial',         '', '',
         'svcpart',     'int',         '', '',
         'columnname',  'varchar',     '', 64,
         'columnvalue', 'varchar', 'NULL', $char_d,
@@ -647,7 +705,7 @@ sub tables_hash_hack {
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
-        'popnum',    'int',    '',   '',
+        'popnum',    'serial',    '',   '',
         'city',      'varchar',   '',   $char_d,
         'state',     'varchar',   '',   $char_d,
         'ac',        'char',   '',   3,
@@ -655,22 +713,22 @@ sub tables_hash_hack {
         'loc',       'char',   'NULL',   4, #NULL for legacy purposes
       ],
       'primary_key' => 'popnum',
-      'unique' => [ [] ],
+      'unique' => [],
       'index' => [ [ 'state' ] ],
     },
 
     'part_pop_local' => {
       'columns' => [
-        'localnum',  'int',     '',     '',
+        'localnum',  'serial',     '',     '',
         'popnum',    'int',     '',     '',
         'city',      'varchar', 'NULL', $char_d,
         'state',     'char',    'NULL', 2,
         'npa',       'char',    '',     3,
         'nxx',       'char',    '',     3,
       ],
-      'primary_key' => 'popnum',
-      'unique' => [ [] ],
-      'index' => [ [ 'npa', 'nxx' ] ],
+      'primary_key' => 'localnum',
+      'unique' => [],
+      'index' => [ [ 'npa', 'nxx' ], [ 'popnum' ] ],
     },
 
     'svc_acct' => {
@@ -678,6 +736,7 @@ sub tables_hash_hack {
         'svcnum',    'int',    '',   '',
         'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
         '_password', 'varchar',   '',   50, #13 for encryped pw's plus ' *SUSPENDED* (mp5 passwords can be 34)
+        'sec_phrase', 'varchar',  'NULL',   $char_d,
         'popnum',    'int',    'NULL',   '',
         'uid',       'int', 'NULL',   '',
         'gid',       'int', 'NULL',   '',
@@ -690,22 +749,11 @@ sub tables_hash_hack {
         'domsvc',    'int', '',   '',
       ],
       'primary_key' => 'svcnum',
-      'unique' => [ [ 'username', 'domsvc' ] ],
+      #'unique' => [ [ 'username', 'domsvc' ] ],
+      'unique' => [],
       'index' => [ ['username'], ['domsvc'] ],
     },
 
-#    'svc_acct_sm' => {
-#      'columns' => [
-#        'svcnum',    'int',    '',   '',
-#        'domsvc',    'int',    '',   '',
-#        'domuid',    'int', '',   '',
-#        'domuser',   'varchar',   '',   $char_d,
-#      ],
-#      'primary_key' => 'svcnum',
-#      'unique' => [ [] ],
-#      'index' => [ ['domsvc'], ['domuid'] ], 
-#    },
-
     #'svc_charge' => {
     #  'columns' => [
     #    'svcnum',    'int',    '',   '',
@@ -724,12 +772,12 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
-      'index' => [ [] ],
+      'index' => [],
     },
 
     'domain_record' => {
       'columns' => [
-        'recnum',    'int',     '',  '',
+        'recnum',    'serial',     '',  '',
         'svcnum',    'int',     '',  '',
         'reczone',   'varchar', '',  $char_d,
         'recaf',     'char',    '',  2,
@@ -737,7 +785,7 @@ sub tables_hash_hack {
         'recdata',   'varchar', '',  $char_d,
       ],
       'primary_key' => 'recnum',
-      'unique'      => [ [] ],
+      'unique'      => [],
       'index'       => [ ['svcnum'] ],
     },
 
@@ -749,7 +797,7 @@ sub tables_hash_hack {
         'dst',      'varchar',    'NULL',  $char_d,
       ],
       'primary_key' => 'svcnum',
-      'unique'      => [ [] ],
+      'unique'      => [],
       'index'       => [ ['srcsvc'], ['dstsvc'] ],
     },
 
@@ -760,8 +808,8 @@ sub tables_hash_hack {
         'usersvc',  'int',    '',  '',
       ],
       'primary_key' => 'svcnum',
-      'unique'      => [ [] ],
-      'index'       => [ [] ],
+      'unique'      => [],
+      'index'       => [],
     },
 
     #'svc_wo' => {
@@ -779,19 +827,19 @@ sub tables_hash_hack {
 
     'prepay_credit' => {
       'columns' => [
-        'prepaynum',   'int',     '',   '',
+        'prepaynum',   'serial',     '',   '',
         'identifier',  'varchar', '', $char_d,
         'amount',      @money_type,
         'seconds',     'int',     'NULL', '',
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
-      'index'       => [ [] ],
+      'index'       => [],
     },
 
     'port' => {
       'columns' => [
-        'portnum',  'int',     '',   '',
+        'portnum',  'serial',     '',   '',
         'ip',       'varchar', 'NULL', 15,
         'nasport',  'int',     'NULL', '',
         'nasnum',   'int',     '',   '',
@@ -803,7 +851,7 @@ sub tables_hash_hack {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'int',     '',    '',
+        'nasnum',   'serial',     '',    '',
         'nas',      'varchar', '',    $char_d,
         'nasip',    'varchar', '',    15,
         'nasfqdn',  'varchar', '',    $char_d,
@@ -816,7 +864,7 @@ sub tables_hash_hack {
 
     'session' => {
       'columns' => [
-        'sessionnum', 'int',       '',   '',
+        'sessionnum', 'serial',       '',   '',
         'portnum',    'int',       '',   '',
         'svcnum',     'int',       '',   '',
         'login',      @date_type,
@@ -829,19 +877,21 @@ sub tables_hash_hack {
 
     'queue' => {
       'columns' => [
-        'jobnum', 'int', '', '',
+        'jobnum', 'serial', '', '',
         'job', 'text', '', '',
         '_date', 'int', '', '',
         'status', 'varchar', '', $char_d,
+        'statustext', 'text', 'NULL', '',
+        'svcnum', 'int', 'NULL', '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
-      'index'       => [],
+      'index'       => [ [ 'svcnum' ], [ 'status' ] ],
     },
 
     'queue_arg' => {
       'columns' => [
-        'argnum', 'int', '', '',
+        'argnum', 'serial', '', '',
         'jobnum', 'int', '', '',
         'arg', 'text', 'NULL', '',
       ],
@@ -850,10 +900,32 @@ sub tables_hash_hack {
       'index'       => [ [ 'jobnum' ] ],
     },
 
+    'queue_depend' => {
+      'columns' => [
+        'dependnum', 'serial', '', '',
+        'jobnum', 'int', '', '',
+        'depend_jobnum', 'int', '', '',
+      ],
+      'primary_key' => 'dependnum',
+      'unique'      => [],
+      'index'       => [ [ 'jobnum' ], [ 'depend_jobnum' ] ],
+    },
+
+    'export_svc' => {
+      'columns' => [
+        'exportsvcnum' => 'serial', '', '',
+        'exportnum'    => 'int', '', '',
+        'svcpart'      => 'int', '', '',
+      ],
+      'primary_key' => 'exportsvcnum',
+      'unique'      => [ [ 'exportnum', 'svcpart' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'svcpart' ] ],
+    },
+
     'part_export' => {
       'columns' => [
-        'exportnum', 'int', '', '',
-        'svcpart',   'int', '', '',
+        'exportnum', 'serial', '', '',
+        #'svcpart',   'int', '', '',
         'machine', 'varchar', '', $char_d,
         'exporttype', 'varchar', '', $char_d,
         'nodomain',     'char', 'NULL', 1,
@@ -865,14 +937,123 @@ sub tables_hash_hack {
 
     'part_export_option' => {
       'columns' => [
-        'optionnum', 'int', '', '',
+        'optionnum', 'serial', '', '',
         'exportnum', 'int', '', '',
-        'option', 'varchar', '', $char_d,
+        'optionname', 'varchar', '', $char_d,
         'optionvalue', 'text', 'NULL', '',
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
-      'index'       => [ [ 'exportnum' ], [ 'option' ] ],
+      'index'       => [ [ 'exportnum' ], [ 'optionname' ] ],
+    },
+
+    'radius_usergroup' => {
+      'columns' => [
+        'usergroupnum', 'serial', '', '',
+        'svcnum',       'int', '', '',
+        'groupname',    'varchar', '', $char_d,
+      ],
+      'primary_key' => 'usergroupnum',
+      'unique'      => [],
+      'index'       => [ [ 'svcnum' ], [ 'groupname' ] ],
+    },
+
+    'msgcat' => {
+      'columns' => [
+        'msgnum', 'serial', '', '',
+        'msgcode', 'varchar', '', $char_d,
+        'locale', 'varchar', '', 16,
+        'msg', 'text', '', '',
+      ],
+      'primary_key' => 'msgnum',
+      'unique'      => [ [ 'msgcode', 'locale' ] ],
+      'index'       => [],
+    },
+
+    'cust_tax_exempt' => {
+      'columns' => [
+        'exemptnum', 'serial', '', '',
+        'custnum',   'int', '', '',
+        'taxnum',    'int', '', '',
+        'year',      'int', '', '',
+        'month',     'int', '', '',
+        'amount',   @money_type,
+      ],
+      'primary_key' => 'exemptnum',
+      'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
+      'index'       => [],
+    },
+
+    'ac_type' => {
+      'columns' => [
+        'actypenum', 'serial', '', '',
+        'actypename', 'varchar', '', 15,
+      ],
+      'primary_key' => 'actypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'ac' => {
+      'columns' => [
+        'acnum', 'serial', '', '',
+        'actypenum', 'int', '', '',
+        'acname', 'varchar', '', 15,
+      ],
+      'primary_key' => 'acnum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'part_ac_field' => {
+      'columns' => [
+        'acfieldpart', 'serial', '', '',
+        'actypenum', 'int', '', '',
+        'name', 'varchar', '', 15,
+        'ut_type', 'varchar', '', 15,
+      ],
+      'primary_key' => 'acfieldpart',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'ac_field' => {
+      'columns' => [
+        'acfieldpart', 'int', '', '',
+        'acnum', 'int', '', '',
+        'value', 'varchar', '', 127,
+      ],
+      'primary_key' => '',
+      'unique'      => [ [ 'acfieldpart', 'acnum' ] ],
+      'index'       => [],
+    },
+
+    'ac_block' => {
+      'columns' => [
+        'acnum', 'int', '', '',
+        'ip_gateway', 'char', '', 15,
+        'ip_netmask', 'int', '', '',
+      ],
+      'primary_key' => '',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'svc_broadband' => {
+      'columns' => [
+        'svcnum', 'serial', '', '',
+        'actypenum', 'int', '', '',
+        'speed_up', 'int', '', '',
+        'speed_down', 'int', '', '',
+        'acnum', 'int', '', '',
+        'ip_addr', 'char', '', 15,
+        'ip_netmask', 'int', '', '',
+        'mac_addr', 'char', '', 17,
+        'location', 'varchar', '', 127,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [],
+      'index'       => [],
     },
 
   );