X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=9125758d0d16992171341bec28ad4833079a25f9;hp=09e16fe75489bc75c4136a394d3afffb883e66b9;hb=929f432c766bbe3bdeed5b80818a12ddf6ec6339;hpb=feef0e4c2b4bd6b776b25f5a1bd6fdbf63fd08b2

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 09e16fe75..9125758d0 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -3,9 +3,9 @@ package FS::Schema;
 use vars qw(@ISA @EXPORT_OK $DEBUG $setup_hack %dbdef_cache);
 use subs qw(reload_dbdef);
 use Exporter;
-use DBIx::DBSchema 0.25;
+use DBIx::DBSchema 0.30;
 use DBIx::DBSchema::Table;
-use DBIx::DBSchema::Column;
+use DBIx::DBSchema::Column 0.06;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::ColGroup::Index;
 use FS::UID qw(datasrc);
@@ -92,9 +92,18 @@ sub dbdef_dist {
   my $dbdef = new DBIx::DBSchema map {  
     my @columns;
     while (@{$tables_hashref->{$_}{'columns'}}) {
-      my($name, $type, $null, $length) =
-        splice @{$tables_hashref->{$_}{'columns'}}, 0, 4;
-      push @columns, new DBIx::DBSchema::Column ( $name,$type,$null,$length );
+      #my($name, $type, $null, $length, $default, $local) =
+      my @coldef = 
+        splice @{$tables_hashref->{$_}{'columns'}}, 0, 6;
+      my %hash = map { $_ => shift @coldef }
+                     qw( name type null length default local );
+
+      unless ( defined $hash{'default'} ) {
+        warn "$_:\n".
+             join('', map "$_ => $hash{$_}\n", keys %hash) ;# $stop = <STDIN>;
+      }
+
+      push @columns, new DBIx::DBSchema::Column ( \%hash );
     }
     DBIx::DBSchema::Table->new(
       $_,
@@ -226,25 +235,28 @@ sub dbdef_dist {
 
 sub tables_hashref {
 
-  my($char_d) = 80; #default maxlength for text fields
+  my $char_d = 80; #default maxlength for text fields
 
   #my(@date_type)  = ( 'timestamp', '', ''     );
-  my(@date_type)  = ( 'int', 'NULL', ''     );
-  my(@perl_type) = ( 'text', 'NULL', ''  ); 
+  my @date_type  = ( 'int', 'NULL', ''     );
+  my @perl_type = ( 'text', 'NULL', ''  ); 
   my @money_type = ( 'decimal',   '', '10,2' );
 
+  my $username_len = 32; #usernamemax config file
+
   return {
 
     'agent' => {
       'columns' => [
-        'agentnum', 'serial',            '',     '',
-        'agent',    'varchar',           '',     $char_d,
-        'typenum',  'int',            '',     '',
-        'freq',     'int',       'NULL', '',
-        'prog',     @perl_type,
-        'disabled',     'char', 'NULL', 1,
-        'username', 'varchar',       'NULL',     $char_d,
-        '_password','varchar',       'NULL',     $char_d,
+        'agentnum', 'serial',            '',     '', '', '', 
+        'agent',    'varchar',           '',     $char_d, '', '', 
+        'typenum',  'int',            '',     '', '', '', 
+        'freq',     'int',       'NULL', '', '', '', 
+        'prog',     @perl_type, '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
+        'username', 'varchar',       'NULL',     $char_d, '', '', 
+        '_password','varchar',       'NULL',     $char_d, '', '', 
+        'ticketing_queueid', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'agentnum',
       'unique' => [],
@@ -253,8 +265,8 @@ sub tables_hashref {
 
     'agent_type' => {
       'columns' => [
-        'typenum',   'serial',  '', '',
-        'atype',     'varchar', '', $char_d,
+        'typenum',   'serial',  '', '', '', '', 
+        'atype',     'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'typenum',
       'unique' => [],
@@ -263,9 +275,9 @@ sub tables_hashref {
 
     'type_pkgs' => {
       'columns' => [
-        'typepkgnum', 'serial', '', '',
-        'typenum',   'int',  '', '',
-        'pkgpart',   'int',  '', '',
+        'typepkgnum', 'serial', '', '', '', '', 
+        'typenum',   'int',  '', '', '', '', 
+        'pkgpart',   'int',  '', '', '', '', 
       ],
       'primary_key' => 'typepkgnum',
       'unique' => [ ['typenum', 'pkgpart'] ],
@@ -274,12 +286,12 @@ sub tables_hashref {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'serial',  '', '',
-        'custnum',   'int',  '', '',
-        '_date',     @date_type,
-        'charged',   @money_type,
-        'printed',   'int',  '', '',
-        'closed',    'char', 'NULL', 1,
+        'invnum',    'serial',  '', '', '', '', 
+        'custnum',   'int',  '', '', '', '', 
+        '_date',     @date_type, '', '', 
+        'charged',   @money_type, '', '', 
+        'printed',   'int',  '', '', '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'invnum',
       'unique' => [],
@@ -288,12 +300,12 @@ sub tables_hashref {
 
     'cust_bill_event' => {
       'columns' => [
-        'eventnum',    'serial',  '', '',
-        'invnum',   'int',  '', '',
-        'eventpart',   'int',  '', '',
-        '_date',     @date_type,
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
+        'eventnum',    'serial',  '', '', '', '', 
+        'invnum',   'int',  '', '', '', '', 
+        'eventpart',   'int',  '', '', '', '', 
+        '_date',     @date_type, '', '', 
+        'status', 'varchar', '', $char_d, '', '', 
+        'statustext', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
@@ -303,15 +315,16 @@ sub tables_hashref {
 
     'part_bill_event' => {
       'columns' => [
-        'eventpart',    'serial',  '', '',
-        'payby',       'char',  '', 4,
-        'event',       'varchar',           '',     $char_d,
-        'eventcode',    @perl_type,
-        'seconds',     'int', 'NULL', '',
-        'weight',      'int', '', '',
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',     'char', 'NULL', 1,
+        'eventpart',    'serial',  '', '', '', '', 
+        'freq',        'varchar',       'NULL',     $char_d, '', '', 
+        'payby',       'char',  '', 4, '', '', 
+        'event',       'varchar',           '',     $char_d, '', '', 
+        'eventcode',    @perl_type, '', '', 
+        'seconds',     'int', 'NULL', '', '', '', 
+        'weight',      'int', '', '', '', '', 
+        'plan',       'varchar', 'NULL', $char_d, '', '', 
+        'plandata',   'text', 'NULL', '', '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'eventpart',
       'unique' => [],
@@ -320,26 +333,26 @@ sub tables_hashref {
 
     'cust_bill_pkg' => {
       'columns' => [
-        'billpkgnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'setup',   @money_type,
-        'recur',   @money_type,
-        'sdate',   @date_type,
-        'edate',   @date_type,
-        'itemdesc', 'varchar', 'NULL', $char_d,
+        'billpkgnum', 'serial', '', '', '', '', 
+        'pkgnum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        'setup',   @money_type, '', '', 
+        'recur',   @money_type, '', '', 
+        'sdate',   @date_type, '', '', 
+        'edate',   @date_type, '', '', 
+        'itemdesc', 'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'billpkgnum',
       'unique' => [],
-      'index' => [ ['invnum'] ],
+      'index' => [ ['invnum'], [ 'pkgnum' ] ],
     },
 
     'cust_bill_pkg_detail' => {
       'columns' => [
-        'detailnum', 'serial', '', '',
-        'pkgnum',  'int', '', '',
-        'invnum',  'int', '', '',
-        'detail',  'varchar', '', $char_d,
+        'detailnum', 'serial', '', '', '', '', 
+        'pkgnum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        'detail',  'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'detailnum',
       'unique' => [],
@@ -348,13 +361,13 @@ sub tables_hashref {
 
     'cust_credit' => {
       'columns' => [
-        'crednum',  'serial', '', '',
-        'custnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
-        'otaker',   'varchar', '', 32,
-        'reason',   'text', 'NULL', '',
-        'closed',    'char', 'NULL', 1,
+        'crednum',  'serial', '', '', '', '', 
+        'custnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
+        'otaker',   'varchar', '', 32, '', '', 
+        'reason',   'text', 'NULL', '', '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'crednum',
       'unique' => [],
@@ -363,11 +376,11 @@ sub tables_hashref {
 
     'cust_credit_bill' => {
       'columns' => [
-        'creditbillnum', 'serial', '', '',
-        'crednum',  'int', '', '',
-        'invnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
+        'creditbillnum', 'serial', '', '', '', '', 
+        'crednum',  'int', '', '', '', '', 
+        'invnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'creditbillnum',
       'unique' => [],
@@ -376,68 +389,70 @@ sub tables_hashref {
 
     'cust_main' => {
       'columns' => [
-        'custnum',  'serial',  '',     '',
-        'agentnum', 'int',  '',     '',
-#        'titlenum', 'int',  'NULL',   '',
-        'last',     'varchar', '',     $char_d,
-#        'middle',   'varchar', 'NULL', $char_d,
-        'first',    'varchar', '',     $char_d,
-        'ss',       'varchar', 'NULL', 11,
-        'company',  'varchar', 'NULL', $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'county',   'varchar', 'NULL', $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-        'daytime',  'varchar', 'NULL', 20,
-        'night',    'varchar', 'NULL', 20,
-        'fax',      'varchar', 'NULL', 12,
-        'ship_last',     'varchar', 'NULL', $char_d,
-#        'ship_middle',   'varchar', 'NULL', $char_d,
-        'ship_first',    'varchar', 'NULL', $char_d,
-        'ship_company',  'varchar', 'NULL', $char_d,
-        'ship_address1', 'varchar', 'NULL', $char_d,
-        'ship_address2', 'varchar', 'NULL', $char_d,
-        'ship_city',     'varchar', 'NULL', $char_d,
-        'ship_county',   'varchar', 'NULL', $char_d,
-        'ship_state',    'varchar', 'NULL', $char_d,
-        'ship_zip',      'varchar', 'NULL', 10,
-        'ship_country',  'char', 'NULL', 2,
-        'ship_daytime',  'varchar', 'NULL', 20,
-        'ship_night',    'varchar', 'NULL', 20,
-        'ship_fax',      'varchar', 'NULL', 12,
-        'payby',    'char', '',     4,
-        'payinfo',  'varchar', 'NULL', 512,
-        'paycvv',   'varchar', 'NULL', 512,
-	'paymask', 'varchar', 'NULL', $char_d,
-        #'paydate',  @date_type,
-        'paydate',  'varchar', 'NULL', 10,
-        'paystart_month', 'int', 'NULL', '',
-        'paystart_year',  'int', 'NULL', '',
-        'payissue', 'varchar', 'NULL', 2,
-        'payname',  'varchar', 'NULL', $char_d,
-        'payip',    'varchar', 'NULL', 15,
-        'tax',      'char', 'NULL', 1,
-        'otaker',   'varchar', '',    32,
-        'refnum',   'int',  '',     '',
-        'referral_custnum', 'int',  'NULL', '',
-        'comments', 'text', 'NULL', '',
+        'custnum',  'serial',  '',     '', '', '', 
+        'agentnum', 'int',  '',     '', '', '', 
+#        'titlenum', 'int',  'NULL',   '', '', '', 
+        'last',     'varchar', '',     $char_d, '', '', 
+#        'middle',   'varchar', 'NULL', $char_d, '', '', 
+        'first',    'varchar', '',     $char_d, '', '', 
+        'ss',       'varchar', 'NULL', 11, '', '', 
+        'company',  'varchar', 'NULL', $char_d, '', '', 
+        'address1', 'varchar', '',     $char_d, '', '', 
+        'address2', 'varchar', 'NULL', $char_d, '', '', 
+        'city',     'varchar', '',     $char_d, '', '', 
+        'county',   'varchar', 'NULL', $char_d, '', '', 
+        'state',    'varchar', 'NULL', $char_d, '', '', 
+        'zip',      'varchar', 'NULL', 10, '', '', 
+        'country',  'char', '',     2, '', '', 
+        'daytime',  'varchar', 'NULL', 20, '', '', 
+        'night',    'varchar', 'NULL', 20, '', '', 
+        'fax',      'varchar', 'NULL', 12, '', '', 
+        'ship_last',     'varchar', 'NULL', $char_d, '', '', 
+#        'ship_middle',   'varchar', 'NULL', $char_d, '', '', 
+        'ship_first',    'varchar', 'NULL', $char_d, '', '', 
+        'ship_company',  'varchar', 'NULL', $char_d, '', '', 
+        'ship_address1', 'varchar', 'NULL', $char_d, '', '', 
+        'ship_address2', 'varchar', 'NULL', $char_d, '', '', 
+        'ship_city',     'varchar', 'NULL', $char_d, '', '', 
+        'ship_county',   'varchar', 'NULL', $char_d, '', '', 
+        'ship_state',    'varchar', 'NULL', $char_d, '', '', 
+        'ship_zip',      'varchar', 'NULL', 10, '', '', 
+        'ship_country',  'char', 'NULL', 2, '', '', 
+        'ship_daytime',  'varchar', 'NULL', 20, '', '', 
+        'ship_night',    'varchar', 'NULL', 20, '', '', 
+        'ship_fax',      'varchar', 'NULL', 12, '', '', 
+        'payby',    'char', '',     4, '', '', 
+        'payinfo',  'varchar', 'NULL', 512, '', '', 
+        'paycvv',   'varchar', 'NULL', 512, '', '', 
+	'paymask', 'varchar', 'NULL', $char_d, '', '', 
+        #'paydate',  @date_type, '', '', 
+        'paydate',  'varchar', 'NULL', 10, '', '', 
+        'paystart_month', 'int', 'NULL', '', '', '', 
+        'paystart_year',  'int', 'NULL', '', '', '', 
+        'payissue', 'varchar', 'NULL', 2, '', '', 
+        'payname',  'varchar', 'NULL', $char_d, '', '', 
+        'payip',    'varchar', 'NULL', 15, '', '', 
+        'tax',      'char', 'NULL', 1, '', '', 
+        'otaker',   'varchar', '',    32, '', '', 
+        'refnum',   'int',  '',     '', '', '', 
+        'referral_custnum', 'int',  'NULL', '', '', '', 
+        'comments', 'text', 'NULL', '', '', '', 
+        'spool_cdr','char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'custnum',
       'unique' => [],
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
                    [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],
+                   [ 'county' ], [ 'state' ], [ 'country' ], [ 'zip' ],
                  ],
     },
 
     'cust_main_invoice' => {
       'columns' => [
-        'destnum',  'serial',  '',     '',
-        'custnum',  'int',  '',     '',
-        'dest',     'varchar', '',  $char_d,
+        'destnum',  'serial',  '',     '', '', '', 
+        'custnum',  'int',  '',     '', '', '', 
+        'dest',     'varchar', '',  $char_d, '', '', 
       ],
       'primary_key' => 'destnum',
       'unique' => [],
@@ -448,35 +463,36 @@ sub tables_hashref {
                             #cust_main_county for validation and to provide
                             # a tax rate.
       'columns' => [
-        '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 %
-        'taxname',  'varchar',  'NULL',    $char_d,
-        'setuptax',  'char', 'NULL', 1, # Y = setup tax exempt
-        'recurtax',  'char', 'NULL', 1, # Y = recur tax exempt
+        '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 %
+        'taxname',  'varchar',  'NULL',    $char_d, '', '', 
+        'setuptax',  'char', 'NULL', 1, '', '', # Y = setup tax exempt
+        'recurtax',  'char', 'NULL', 1, '', '', # Y = recur tax exempt
       ],
       'primary_key' => 'taxnum',
       'unique' => [],
   #    'unique' => [ ['taxnum'], ['state', 'county'] ],
-      'index' => [],
+      'index' => [ [ 'county' ], [ 'state' ], [ 'country' ] ],
     },
 
     'cust_pay' => {
       'columns' => [
-        'paynum',   'serial',    '',   '',
-        #now cust_bill_pay #'invnum',   'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        'paid',     @money_type,
-        '_date',    @date_type,
-        'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                         # payment type table.
-        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
+        'paynum',   'serial',    '',   '', '', '',
+        #now cust_bill_pay #'invnum',   'int',    '',   '', '', '', 
+        'custnum',  'int',    '',   '', '', '', 
+        'paid',     @money_type, '', '', 
+        '_date',    @date_type, '', '', 
+        'payby',    'char',   '',     4, '', '', # CARD/BILL/COMP, should be
+                                                 # index into payby table
+                                                 # eventually
+        'payinfo',  'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch', 'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'paynum',
       'unique' => [],
@@ -485,18 +501,19 @@ sub tables_hashref {
 
     'cust_pay_void' => {
       'columns' => [
-        'paynum',    'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'paid',      @money_type,
-        '_date',     @date_type,
-        'payby',     'char',   '',     4, # CARD/BILL/COMP, should be index into
-                                          # payment type table.
-        'payinfo',   'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',  'varchar',   'NULL', $char_d, #for auditing purposes.
-        'closed',    'char', 'NULL', 1,
-        'void_date', @date_type,
-        'reason',    'varchar',   'NULL', $char_d,
-        'otaker',   'varchar', '', 32,
+        'paynum',    'int',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'paid',      @money_type, '', '', 
+        '_date',     @date_type, '', '', 
+        'payby',     'char',   '',     4, '', '', # CARD/BILL/COMP, should be
+                                                  # index into payby table
+                                                  # eventually
+        'payinfo',   'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch',  'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
+        'closed',    'char', 'NULL', 1, '', '', 
+        'void_date', @date_type, '', '', 
+        'reason',    'varchar',   'NULL', $char_d, '', '', 
+        'otaker',   'varchar', '', 32, '', '', 
       ],
       'primary_key' => 'paynum',
       'unique' => [],
@@ -505,11 +522,11 @@ sub tables_hashref {
 
     'cust_bill_pay' => {
       'columns' => [
-        'billpaynum', 'serial',     '',   '',
-        'invnum',  'int',     '',   '',
-        'paynum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
+        'billpaynum', 'serial',     '',   '', '', '', 
+        'invnum',  'int',     '',   '', '', '', 
+        'paynum',  'int',     '',   '', '', '', 
+        'amount',  @money_type, '', '', 
+        '_date',   @date_type, '', '', 
       ],
       'primary_key' => 'billpaynum',
       'unique' => [],
@@ -519,23 +536,23 @@ sub tables_hashref {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
-        'paybatchnum',   'serial',    '',   '',
-        'invnum',   'int',    '',   '',
-        'custnum',   'int',    '',   '',
-        'last',     'varchar', '',     $char_d,
-        'first',    'varchar', '',     $char_d,
-        'address1', 'varchar', '',     $char_d,
-        'address2', 'varchar', 'NULL', $char_d,
-        'city',     'varchar', '',     $char_d,
-        'state',    'varchar', 'NULL', $char_d,
-        'zip',      'varchar', 'NULL', 10,
-        'country',  'char', '',     2,
-#        'trancode', 'int', '', '',
-        'cardnum',  'varchar', '',     16,
-        #'exp',      @date_type,
-        'exp',      'varchar', '',     11,
-        'payname',  'varchar', 'NULL', $char_d,
-        'amount',   @money_type,
+        'paybatchnum',   'serial',    '',   '', '', '', 
+        'invnum',   'int',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'last',     'varchar', '',     $char_d, '', '', 
+        'first',    'varchar', '',     $char_d, '', '', 
+        'address1', 'varchar', '',     $char_d, '', '', 
+        'address2', 'varchar', 'NULL', $char_d, '', '', 
+        'city',     'varchar', '',     $char_d, '', '', 
+        'state',    'varchar', 'NULL', $char_d, '', '', 
+        'zip',      'varchar', 'NULL', 10, '', '', 
+        'country',  'char', '',     2, '', '', 
+        #        'trancode', 'int', '', '', '', ''
+        'cardnum',  'varchar', '',     16, '', '', 
+        #'exp',      @date_type, '', ''
+        'exp',      'varchar', '',     11, '', '', 
+        'payname',  'varchar', 'NULL', $char_d, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'paybatchnum',
       'unique' => [],
@@ -544,37 +561,38 @@ sub tables_hashref {
 
     'cust_pkg' => {
       'columns' => [
-        'pkgnum',    'serial',    '',   '',
-        'custnum',   'int',    '',   '',
-        'pkgpart',   'int',    '',   '',
-        'otaker',    'varchar', '', 32,
-        'setup',     @date_type,
-        'bill',      @date_type,
-        'last_bill', @date_type,
-        'susp',      @date_type,
-        'cancel',    @date_type,
-        'expire',    @date_type,
-        'manual_flag', 'char', 'NULL', 1,
+        'pkgnum',    'serial',    '',   '', '', '', 
+        'custnum',   'int',    '',   '', '', '', 
+        'pkgpart',   'int',    '',   '', '', '', 
+        'otaker',    'varchar', '', 32, '', '', 
+        'setup',     @date_type, '', '', 
+        'bill',      @date_type, '', '', 
+        'last_bill', @date_type, '', '', 
+        'susp',      @date_type, '', '', 
+        'cancel',    @date_type, '', '', 
+        'expire',    @date_type, '', '', 
+        'manual_flag', 'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'pkgnum',
       'unique' => [],
-      'index' => [ ['custnum'] ],
+      'index' => [ ['custnum'], ['pkgpart'] ],
     },
 
     'cust_refund' => {
       'columns' => [
-        'refundnum',    'serial',    '',   '',
-        #now cust_credit_refund #'crednum',      'int',    '',   '',
-        'custnum',  'int',    '',   '',
-        '_date',        @date_type,
-        'refund',       @money_type,
-        'otaker',       'varchar',   '',   32,
-        'reason',       'varchar',   '',   $char_d,
-        'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
-                                             # into payment type table.
-        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
-        'paybatch',     'varchar',   'NULL', $char_d,
-        'closed',    'char', 'NULL', 1,
+        'refundnum',    'serial',    '',   '', '', '', 
+        #now cust_credit_refund #'crednum',      'int',    '',   '', '', '',
+        'custnum',  'int',    '',   '', '', '', 
+        '_date',        @date_type, '', '', 
+        'refund',       @money_type, '', '', 
+        'otaker',       'varchar',   '',   32, '', '', 
+        'reason',       'varchar',   '',   $char_d, '', '', 
+        'payby',        'char',   '',     4, '', '', # CARD/BILL/COMP, should
+                                                     # be index into payby
+                                                     # table eventually
+        'payinfo',      'varchar',   'NULL', $char_d, '', '', #see cust_main above
+        'paybatch',     'varchar',   'NULL', $char_d, '', '', 
+        'closed',    'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'refundnum',
       'unique' => [],
@@ -583,11 +601,11 @@ sub tables_hashref {
 
     'cust_credit_refund' => {
       'columns' => [
-        'creditrefundnum', 'serial',     '',   '',
-        'crednum',  'int',     '',   '',
-        'refundnum',  'int',     '',   '',
-        'amount',  @money_type,
-        '_date',   @date_type
+        'creditrefundnum', 'serial',     '',   '', '', '', 
+        'crednum',  'int',     '',   '', '', '', 
+        'refundnum',  'int',     '',   '', '', '', 
+        'amount',  @money_type, '', '', 
+        '_date',   @date_type, '', '', 
       ],
       'primary_key' => 'creditrefundnum',
       'unique' => [],
@@ -597,9 +615,9 @@ sub tables_hashref {
 
     'cust_svc' => {
       'columns' => [
-        'svcnum',    'serial',    '',   '',
-        'pkgnum',    'int',    'NULL',   '',
-        'svcpart',   'int',    '',   '',
+        'svcnum',    'serial',    '',   '', '', '', 
+        'pkgnum',    'int',    'NULL',   '', '', '', 
+        'svcpart',   'int',    '',   '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique' => [],
@@ -608,19 +626,20 @@ sub tables_hashref {
 
     'part_pkg' => {
       'columns' => [
-        'pkgpart',    'serial',    '',   '',
-        'pkg',        'varchar',   '',   $char_d,
-        'comment',    'varchar',   '',   $char_d,
-        'promo_code', 'varchar', 'NULL', $char_d,
-        'setup',      @perl_type,
-        'freq',       'varchar',   '',   $char_d,  #billing frequency
-        'recur',      @perl_type,
-        'setuptax',  'char', 'NULL', 1,
-        'recurtax',  'char', 'NULL', 1,
-        'plan',       'varchar', 'NULL', $char_d,
-        'plandata',   'text', 'NULL', '',
-        'disabled',   'char', 'NULL', 1,
-        'taxclass',   'varchar', 'NULL', $char_d,
+        'pkgpart',    'serial',    '',   '', '', '', 
+        'pkg',        'varchar',   '',   $char_d, '', '', 
+        'comment',    'varchar',   '',   $char_d, '', '', 
+        'promo_code', 'varchar', 'NULL', $char_d, '', '', 
+        'setup',      @perl_type, '', '', 
+        'freq',       'varchar',   '',   $char_d, '', '', #billing frequency
+        'recur',      @perl_type, '', '', 
+        'setuptax',  'char', 'NULL', 1, '', '', 
+        'recurtax',  'char', 'NULL', 1, '', '', 
+        'plan',       'varchar', 'NULL', $char_d, '', '', 
+        'plandata',   'text', 'NULL', '', '', '', 
+        'disabled',   'char', 'NULL', 1, '', '', 
+        'taxclass',   'varchar', 'NULL', $char_d, '', '', 
+        'classnum',   'int',     'NULL', '', '', '', 
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
@@ -639,11 +658,11 @@ sub tables_hashref {
 
     'pkg_svc' => {
       'columns' => [
-        'pkgsvcnum',  'serial', '',  '',
-        'pkgpart',    'int',    '',   '',
-        'svcpart',    'int',    '',   '',
-        'quantity',   'int',    '',   '',
-        'primary_svc','char', 'NULL',  1,
+        'pkgsvcnum',  'serial', '',  '', '', '', 
+        'pkgpart',    'int',    '',   '', '', '', 
+        'svcpart',    'int',    '',   '', '', '', 
+        'quantity',   'int',    '',   '', '', '', 
+        'primary_svc','char', 'NULL',  1, '', '', 
       ],
       'primary_key' => 'pkgsvcnum',
       'unique' => [ ['pkgpart', 'svcpart'] ],
@@ -652,9 +671,9 @@ sub tables_hashref {
 
     'part_referral' => {
       'columns' => [
-        'refnum',   'serial',    '',   '',
-        'referral', 'varchar',   '',   $char_d,
-        'disabled',     'char', 'NULL', 1,
+        'refnum',   'serial',    '',   '', '', '', 
+        'referral', 'varchar',   '',   $char_d, '', '', 
+        'disabled',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'refnum',
       'unique' => [],
@@ -663,10 +682,10 @@ sub tables_hashref {
 
     'part_svc' => {
       'columns' => [
-        'svcpart',    'serial',    '',   '',
-        'svc',        'varchar',   '',   $char_d,
-        'svcdb',      'varchar',   '',   $char_d,
-        'disabled',   'char',  'NULL',   1,
+        'svcpart',    'serial',    '',   '', '', '', 
+        'svc',        'varchar',   '',   $char_d, '', '', 
+        'svcdb',      'varchar',   '',   $char_d, '', '', 
+        'disabled',   'char',  'NULL',   1, '', '', 
       ],
       'primary_key' => 'svcpart',
       'unique' => [],
@@ -675,11 +694,11 @@ sub tables_hashref {
 
     'part_svc_column' => {
       'columns' => [
-        'columnnum',   'serial',         '', '',
-        'svcpart',     'int',         '', '',
-        'columnname',  'varchar',     '', 64,
-        'columnvalue', 'varchar', 'NULL', $char_d,
-        'columnflag',  'char',    'NULL', 1, 
+        'columnnum',   'serial',         '', '', '', '', 
+        'svcpart',     'int',         '', '', '', '', 
+        'columnname',  'varchar',     '', 64, '', '', 
+        'columnvalue', 'varchar', 'NULL', $char_d, '', '', 
+        'columnflag',  'char',    'NULL', 1, '', '', 
       ],
       'primary_key' => 'columnnum',
       'unique' => [ [ 'svcpart', 'columnname' ] ],
@@ -689,12 +708,12 @@ sub tables_hashref {
     #(this should be renamed to part_pop)
     'svc_acct_pop' => {
       'columns' => [
-        'popnum',    'serial',    '',   '',
-        'city',      'varchar',   '',   $char_d,
-        'state',     'varchar',   '',   $char_d,
-        'ac',        'char',   '',   3,
-        'exch',      'char',   '',   3,
-        'loc',       'char',   'NULL',   4, #NULL for legacy purposes
+        'popnum',    'serial',    '',   '', '', '', 
+        'city',      'varchar',   '',   $char_d, '', '', 
+        'state',     'varchar',   '',   $char_d, '', '', 
+        'ac',        'char',   '',   3, '', '', 
+        'exch',      'char',   '',   3, '', '', 
+        'loc',       'char',   'NULL',   4, '', '', #NULL for legacy purposes
       ],
       'primary_key' => 'popnum',
       'unique' => [],
@@ -703,12 +722,12 @@ sub tables_hashref {
 
     'part_pop_local' => {
       'columns' => [
-        'localnum',  'serial',     '',     '',
-        'popnum',    'int',     '',     '',
-        'city',      'varchar', 'NULL', $char_d,
-        'state',     'char',    'NULL', 2,
-        'npa',       'char',    '',     3,
-        'nxx',       'char',    '',     3,
+        'localnum',  'serial',     '',     '', '', '', 
+        'popnum',    'int',     '',     '', '', '', 
+        'city',      'varchar', 'NULL', $char_d, '', '', 
+        'state',     'char',    'NULL', 2, '', '', 
+        'npa',       'char',    '',     3, '', '', 
+        'nxx',       'char',    '',     3, '', '', 
       ],
       'primary_key' => 'localnum',
       'unique' => [],
@@ -717,20 +736,20 @@ sub tables_hashref {
 
     'svc_acct' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
-        'username',  'varchar',   '',   $username_len, #unique (& remove dup code)
-        '_password', 'varchar',   '',   72, #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
-        'sec_phrase', 'varchar',  'NULL',   $char_d,
-        'popnum',    'int',    'NULL',   '',
-        'uid',       'int', 'NULL',   '',
-        'gid',       'int', 'NULL',   '',
-        'finger',    'varchar',   'NULL',   $char_d,
-        'dir',       'varchar',   'NULL',   $char_d,
-        'shell',     'varchar',   'NULL',   $char_d,
-        'quota',     'varchar',   'NULL',   $char_d,
-        'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
-        'seconds',   'int', 'NULL',   '', #uhhhh
-        'domsvc',    'int', '',   '',
+        'svcnum',    'int',    '',   '', '', '', 
+        'username',  'varchar',   '',   $username_len, '', '', #unique (& remove dup code)
+        '_password', 'varchar',   '',   72, '', '', #13 for encryped pw's plus ' *SUSPENDED* (md5 passwords can be 34, blowfish 60)
+        'sec_phrase', 'varchar',  'NULL',   $char_d, '', '', 
+        'popnum',    'int',    'NULL',   '', '', '', 
+        'uid',       'int', 'NULL',   '', '', '', 
+        'gid',       'int', 'NULL',   '', '', '', 
+        'finger',    'varchar',   'NULL',   $char_d, '', '', 
+        'dir',       'varchar',   'NULL',   $char_d, '', '', 
+        'shell',     'varchar',   'NULL',   $char_d, '', '', 
+        'quota',     'varchar',   'NULL',   $char_d, '', '', 
+        'slipip',    'varchar',   'NULL',   15, '', '', #four TINYINTs, bah.
+        'seconds',   'int', 'NULL',   '', '', '', #uhhhh
+        'domsvc',    'int', '',   '', '', '', 
       ],
       'primary_key' => 'svcnum',
       #'unique' => [ [ 'username', 'domsvc' ] ],
@@ -750,9 +769,9 @@ sub tables_hashref {
 
     'svc_domain' => {
       'columns' => [
-        'svcnum',    'int',    '',   '',
-        'domain',    'varchar',    '',   $char_d,
-        'catchall',  'int', 'NULL',    '',
+        'svcnum',    'int',    '',   '', '', '', 
+        'domain',    'varchar',    '',   $char_d, '', '', 
+        'catchall',  'int', 'NULL',    '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
@@ -761,14 +780,12 @@ sub tables_hashref {
 
     'domain_record' => {
       'columns' => [
-        'recnum',    'serial',     '',  '',
-        'svcnum',    'int',     '',  '',
-        #'reczone',   'varchar', '',  $char_d,
-        'reczone',   'varchar', '',  255,
-        'recaf',     'char',    '',  2,
-        'rectype',   'varchar',    '',  5,
-        #'recdata',   'varchar', '',  $char_d,
-        'recdata',   'varchar', '',  255,
+        'recnum',    'serial',     '',  '', '', '', 
+        'svcnum',    'int',     '',  '', '', '', 
+        'reczone',   'varchar', '',  255, '', '', 
+        'recaf',     'char',    '',  2, '', '', 
+        'rectype',   'varchar',    '',  5, '', '', 
+        'recdata',   'varchar', '',  255, '', '', 
       ],
       'primary_key' => 'recnum',
       'unique'      => [],
@@ -777,11 +794,11 @@ sub tables_hashref {
 
     'svc_forward' => {
       'columns' => [
-        'svcnum',   'int',            '',   '',
-        'srcsvc',   'int',        'NULL',   '',
-        'src',      'varchar',    'NULL',  255,
-        'dstsvc',   'int',        'NULL',   '',
-        'dst',      'varchar',    'NULL',  255,
+        'svcnum',   'int',            '',   '', '', '', 
+        'srcsvc',   'int',        'NULL',   '', '', '', 
+        'src',      'varchar',    'NULL',  255, '', '', 
+        'dstsvc',   'int',        'NULL',   '', '', '', 
+        'dst',      'varchar',    'NULL',  255, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -790,9 +807,9 @@ sub tables_hashref {
 
     'svc_www' => {
       'columns' => [
-        'svcnum',   'int',    '',  '',
-        'recnum',   'int',    '',  '',
-        'usersvc',  'int',    '',  '',
+        'svcnum',   'int',    '',  '', '', '', 
+        'recnum',   'int',    '',  '', '', '', 
+        'usersvc',  'int',    '',  '', '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -814,11 +831,11 @@ sub tables_hashref {
 
     'prepay_credit' => {
       'columns' => [
-        'prepaynum',   'serial',     '',   '',
-        'identifier',  'varchar', '', $char_d,
-        'amount',      @money_type,
-        'seconds',     'int',     'NULL', '',
-        'agentnum',    'int',     'NULL', '',
+        'prepaynum',   'serial',     '',   '', '', '', 
+        'identifier',  'varchar', '', $char_d, '', '', 
+        'amount',      @money_type, '', '', 
+        'seconds',     'int',     'NULL', '', '', '', 
+        'agentnum',    'int',     'NULL', '', '', '', 
       ],
       'primary_key' => 'prepaynum',
       'unique'      => [ ['identifier'] ],
@@ -827,10 +844,10 @@ sub tables_hashref {
 
     'port' => {
       'columns' => [
-        'portnum',  'serial',     '',   '',
-        'ip',       'varchar', 'NULL', 15,
-        'nasport',  'int',     'NULL', '',
-        'nasnum',   'int',     '',   '',
+        'portnum',  'serial',     '',   '', '', '', 
+        'ip',       'varchar', 'NULL', 15, '', '', 
+        'nasport',  'int',     'NULL', '', '', '', 
+        'nasnum',   'int',     '',   '', '', '', 
       ],
       'primary_key' => 'portnum',
       'unique'      => [],
@@ -839,11 +856,11 @@ sub tables_hashref {
 
     'nas' => {
       'columns' => [
-        'nasnum',   'serial',     '',    '',
-        'nas',      'varchar', '',    $char_d,
-        'nasip',    'varchar', '',    15,
-        'nasfqdn',  'varchar', '',    $char_d,
-        'last',     'int',     '',    '',
+        'nasnum',   'serial',     '',    '', '', '', 
+        'nas',      'varchar', '',    $char_d, '', '', 
+        'nasip',    'varchar', '',    15, '', '', 
+        'nasfqdn',  'varchar', '',    $char_d, '', '', 
+        'last',     'int',     '',    '', '', '', 
       ],
       'primary_key' => 'nasnum',
       'unique'      => [ [ 'nas' ], [ 'nasip' ] ],
@@ -852,11 +869,11 @@ sub tables_hashref {
 
     'session' => {
       'columns' => [
-        'sessionnum', 'serial',       '',   '',
-        'portnum',    'int',       '',   '',
-        'svcnum',     'int',       '',   '',
-        'login',      @date_type,
-        'logout',     @date_type,
+        'sessionnum', 'serial',       '',   '', '', '', 
+        'portnum',    'int',       '',   '', '', '', 
+        'svcnum',     'int',       '',   '', '', '', 
+        'login',      @date_type, '', '', 
+        'logout',     @date_type, '', '', 
       ],
       'primary_key' => 'sessionnum',
       'unique'      => [],
@@ -865,12 +882,12 @@ sub tables_hashref {
 
     'queue' => {
       'columns' => [
-        'jobnum', 'serial', '', '',
-        'job', 'text', '', '',
-        '_date', 'int', '', '',
-        'status', 'varchar', '', $char_d,
-        'statustext', 'text', 'NULL', '',
-        'svcnum', 'int', 'NULL', '',
+        'jobnum', 'serial', '', '', '', '', 
+        'job', 'text', '', '', '', '', 
+        '_date', 'int', '', '', '', '', 
+        'status', 'varchar', '', $char_d, '', '', 
+        'statustext', 'text', 'NULL', '', '', '', 
+        'svcnum', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
@@ -879,9 +896,9 @@ sub tables_hashref {
 
     'queue_arg' => {
       'columns' => [
-        'argnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'arg', 'text', 'NULL', '',
+        'argnum', 'serial', '', '', '', '', 
+        'jobnum', 'int', '', '', '', '', 
+        'arg', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'argnum',
       'unique'      => [],
@@ -890,9 +907,9 @@ sub tables_hashref {
 
     'queue_depend' => {
       'columns' => [
-        'dependnum', 'serial', '', '',
-        'jobnum', 'int', '', '',
-        'depend_jobnum', 'int', '', '',
+        'dependnum', 'serial', '', '', '', '', 
+        'jobnum', 'int', '', '', '', '', 
+        'depend_jobnum', 'int', '', '', '', '', 
       ],
       'primary_key' => 'dependnum',
       'unique'      => [],
@@ -901,9 +918,9 @@ sub tables_hashref {
 
     'export_svc' => {
       'columns' => [
-        'exportsvcnum' => 'serial', '', '',
-        'exportnum'    => 'int', '', '',
-        'svcpart'      => 'int', '', '',
+        'exportsvcnum' => 'serial', '', '', '', '', 
+        'exportnum'    => 'int', '', '', '', '', 
+        'svcpart'      => 'int', '', '', '', '', 
       ],
       'primary_key' => 'exportsvcnum',
       'unique'      => [ [ 'exportnum', 'svcpart' ] ],
@@ -912,11 +929,10 @@ sub tables_hashref {
 
     'part_export' => {
       'columns' => [
-        'exportnum', 'serial', '', '',
-        #'svcpart',   'int', '', '',
-        'machine', 'varchar', '', $char_d,
-        'exporttype', 'varchar', '', $char_d,
-        'nodomain',     'char', 'NULL', 1,
+        'exportnum', 'serial', '', '', '', '', 
+        'machine', 'varchar', '', $char_d, '', '', 
+        'exporttype', 'varchar', '', $char_d, '', '', 
+        'nodomain',     'char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'exportnum',
       'unique'      => [],
@@ -925,10 +941,10 @@ sub tables_hashref {
 
     'part_export_option' => {
       'columns' => [
-        'optionnum', 'serial', '', '',
-        'exportnum', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
+        'optionnum', 'serial', '', '', '', '', 
+        'exportnum', 'int', '', '', '', '', 
+        'optionname', 'varchar', '', $char_d, '', '', 
+        'optionvalue', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -937,9 +953,9 @@ sub tables_hashref {
 
     'radius_usergroup' => {
       'columns' => [
-        'usergroupnum', 'serial', '', '',
-        'svcnum',       'int', '', '',
-        'groupname',    'varchar', '', $char_d,
+        'usergroupnum', 'serial', '', '', '', '', 
+        'svcnum',       'int', '', '', '', '', 
+        'groupname',    'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'usergroupnum',
       'unique'      => [],
@@ -948,10 +964,10 @@ sub tables_hashref {
 
     'msgcat' => {
       'columns' => [
-        'msgnum', 'serial', '', '',
-        'msgcode', 'varchar', '', $char_d,
-        'locale', 'varchar', '', 16,
-        'msg', 'text', '', '',
+        'msgnum', 'serial', '', '', '', '', 
+        'msgcode', 'varchar', '', $char_d, '', '', 
+        'locale', 'varchar', '', 16, '', '', 
+        'msg', 'text', '', '', '', '', 
       ],
       'primary_key' => 'msgnum',
       'unique'      => [ [ 'msgcode', 'locale' ] ],
@@ -960,23 +976,41 @@ sub tables_hashref {
 
     'cust_tax_exempt' => {
       'columns' => [
-        'exemptnum', 'serial', '', '',
-        'custnum',   'int', '', '',
-        'taxnum',    'int', '', '',
-        'year',      'int', '', '',
-        'month',     'int', '', '',
-        'amount',   @money_type,
+        'exemptnum', 'serial', '', '', '', '', 
+        'custnum',   'int', '', '', '', '', 
+        'taxnum',    'int', '', '', '', '', 
+        'year',      'int', '', '', '', '', 
+        'month',     'int', '', '', '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'exemptnum',
       'unique'      => [ [ 'custnum', 'taxnum', 'year', 'month' ] ],
       'index'       => [],
     },
 
+    'cust_tax_exempt_pkg' => {
+      'columns' => [
+        'exemptpkgnum',  'serial', '', '', '', '', 
+        #'custnum',      'int', '', '', '', ''
+        'billpkgnum',   'int', '', '', '', '', 
+        'taxnum',       'int', '', '', '', '', 
+        'year',         'int', '', '', '', '', 
+        'month',        'int', '', '', '', '', 
+        'amount',       @money_type, '', '', 
+      ],
+      'primary_key' => 'exemptpkgnum',
+      'unique' => [],
+      'index'  => [ [ 'taxnum', 'year', 'month' ],
+                    [ 'billpkgnum' ],
+                    [ 'taxnum' ]
+                  ],
+    },
+
     'router' => {
       'columns' => [
-        'routernum', 'serial', '', '',
-        'routername', 'varchar', '', $char_d,
-        'svcnum', 'int', 'NULL', '',
+        'routernum', 'serial', '', '', '', '', 
+        'routername', 'varchar', '', $char_d, '', '', 
+        'svcnum', 'int', 'NULL', '', '', '', 
       ],
       'primary_key' => 'routernum',
       'unique'      => [],
@@ -985,9 +1019,9 @@ sub tables_hashref {
 
     'part_svc_router' => {
       'columns' => [
-        'svcrouternum', 'serial', '', '',
-        'svcpart', 'int', '', '',
-	'routernum', 'int', '', '',
+        'svcrouternum', 'serial', '', '', '', '', 
+        'svcpart', 'int', '', '', '', '', 
+	'routernum', 'int', '', '', '', '', 
       ],
       'primary_key' => 'svcrouternum',
       'unique'      => [],
@@ -996,10 +1030,10 @@ sub tables_hashref {
 
     'addr_block' => {
       'columns' => [
-        'blocknum', 'serial', '', '',
-	'routernum', 'int', '', '',
-        'ip_gateway', 'varchar', '', 15,
-        'ip_netmask', 'int', '', '',
+        'blocknum', 'serial', '', '', '', '', 
+	'routernum', 'int', '', '', '', '', 
+        'ip_gateway', 'varchar', '', 15, '', '', 
+        'ip_netmask', 'int', '', '', '', '', 
       ],
       'primary_key' => 'blocknum',
       'unique'      => [ [ 'blocknum', 'routernum' ] ],
@@ -1008,11 +1042,11 @@ sub tables_hashref {
 
     'svc_broadband' => {
       'columns' => [
-        'svcnum', 'int', '', '',
-        'blocknum', 'int', '', '',
-        'speed_up', 'int', '', '',
-        'speed_down', 'int', '', '',
-        'ip_addr', 'varchar', '', 15,
+        'svcnum', 'int', '', '', '', '', 
+        'blocknum', 'int', '', '', '', '', 
+        'speed_up', 'int', '', '', '', '', 
+        'speed_down', 'int', '', '', '', '', 
+        'ip_addr', 'varchar', '', 15, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -1021,13 +1055,13 @@ sub tables_hashref {
 
     'part_virtual_field' => {
       'columns' => [
-        'vfieldpart', 'int', '', '',
-        'dbtable', 'varchar', '', 32,
-        'name', 'varchar', '', 32,
-        'check_block', 'text', 'NULL', '',
-        'length', 'int', 'NULL', '',
-        'list_source', 'text', 'NULL', '',
-        'label', 'varchar', 'NULL', 80,
+        'vfieldpart', 'int', '', '', '', '', 
+        'dbtable', 'varchar', '', 32, '', '', 
+        'name', 'varchar', '', 32, '', '', 
+        'check_block', 'text', 'NULL', '', '', '', 
+        'length', 'int', 'NULL', '', '', '', 
+        'list_source', 'text', 'NULL', '', '', '', 
+        'label', 'varchar', 'NULL', 80, '', '', 
       ],
       'primary_key' => 'vfieldpart',
       'unique' => [],
@@ -1036,10 +1070,10 @@ sub tables_hashref {
 
     'virtual_field' => {
       'columns' => [
-        'vfieldnum', 'serial', '', '',
-        'recnum', 'int', '', '',
-        'vfieldpart', 'int', '', '',
-        'value', 'varchar', '', 128,
+        'vfieldnum', 'serial', '', '', '', '', 
+        'recnum', 'int', '', '', '', '', 
+        'vfieldpart', 'int', '', '', '', '', 
+        'value', 'varchar', '', 128, '', '', 
       ],
       'primary_key' => 'vfieldnum',
       'unique' => [ [ 'vfieldpart', 'recnum' ] ],
@@ -1048,12 +1082,12 @@ sub tables_hashref {
 
     'acct_snarf' => {
       'columns' => [
-        'snarfnum',  'int', '', '',
-        'svcnum',    'int', '', '',
-        'machine',   'varchar', '', 255,
-        'protocol',  'varchar', '', $char_d,
-        'username',  'varchar', '', $char_d,
-        '_password', 'varchar', '', $char_d,
+        'snarfnum',  'int', '', '', '', '', 
+        'svcnum',    'int', '', '', '', '', 
+        'machine',   'varchar', '', 255, '', '', 
+        'protocol',  'varchar', '', $char_d, '', '', 
+        'username',  'varchar', '', $char_d, '', '', 
+        '_password', 'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'snarfnum',
       'unique' => [],
@@ -1062,9 +1096,9 @@ sub tables_hashref {
 
     'svc_external' => {
       'columns' => [
-        'svcnum', 'int', '', '',
-        'id',     'int', 'NULL', '',
-        'title',  'varchar', 'NULL', $char_d,
+        'svcnum', 'int', '', '', '', '', 
+        'id',     'int', 'NULL', '', '', '', 
+        'title',  'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
@@ -1073,11 +1107,11 @@ sub tables_hashref {
 
     'cust_pay_refund' => {
       'columns' => [
-        'payrefundnum', 'serial', '', '',
-        'paynum',  'int', '', '',
-        'refundnum',  'int', '', '',
-        '_date',    @date_type,
-        'amount',   @money_type,
+        'payrefundnum', 'serial', '', '', '', '', 
+        'paynum',  'int', '', '', '', '', 
+        'refundnum',  'int', '', '', '', '', 
+        '_date',    @date_type, '', '', 
+        'amount',   @money_type, '', '', 
       ],
       'primary_key' => 'payrefundnum',
       'unique' => [],
@@ -1086,10 +1120,10 @@ sub tables_hashref {
 
     'part_pkg_option' => {
       'columns' => [
-        'optionnum', 'serial', '', '',
-        'pkgpart', 'int', '', '',
-        'optionname', 'varchar', '', $char_d,
-        'optionvalue', 'text', 'NULL', '',
+        'optionnum', 'serial', '', '', '', '', 
+        'pkgpart', 'int', '', '', '', '', 
+        'optionname', 'varchar', '', $char_d, '', '', 
+        'optionvalue', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -1098,8 +1132,8 @@ sub tables_hashref {
 
     'rate' => {
       'columns' => [
-        'ratenum',  'serial', '', '',
-        'ratename', 'varchar', '', $char_d,
+        'ratenum',  'serial', '', '', '', '', 
+        'ratename', 'varchar', '', $char_d, '', '', 
       ],
       'primary_key' => 'ratenum',
       'unique'      => [],
@@ -1108,24 +1142,25 @@ sub tables_hashref {
 
     'rate_detail' => {
       'columns' => [
-        'ratedetailnum',   'serial', '', '',
-        'ratenum',         'int',     '', '',
-        'orig_regionnum',  'int', 'NULL', '',
-        'dest_regionnum',  'int',     '', '',
-        'min_included',    'int',     '', '',
-        'min_charge',      @money_type,
-        'sec_granularity', 'int',     '', '',
+        'ratedetailnum',   'serial', '', '', '', '', 
+        'ratenum',         'int',     '', '', '', '', 
+        'orig_regionnum',  'int', 'NULL', '', '', '', 
+        'dest_regionnum',  'int',     '', '', '', '', 
+        'min_included',    'int',     '', '', '', '', 
+        #'min_charge',      @money_type, '', '', 
+        'min_charge',      'decimal', '', '10,5', '', '', 
+        'sec_granularity', 'int',     '', '', '', '', 
         #time period (link to table of periods)?
       ],
       'primary_key' => 'ratedetailnum',
       'unique'      => [ [ 'ratenum', 'orig_regionnum', 'dest_regionnum' ] ],
-      'index'       => [],
+      'index'       => [ [ 'ratenum', 'dest_regionnum' ] ],
     },
 
     'rate_region' => {
       'columns' => [
-        'regionnum',   'serial',      '', '',
-        'regionname',  'varchar',     '', $char_d,
+        'regionnum',   'serial',      '', '', '', '', 
+        'regionname',  'varchar',     '', $char_d, '', '', 
       ],
       'primary_key' => 'regionnum',
       'unique'      => [],
@@ -1134,11 +1169,11 @@ sub tables_hashref {
 
     'rate_prefix' => {
       'columns' => [
-        'prefixnum',   'serial',    '', '',
-        'regionnum',   'int',       '', '',,
-        'countrycode', 'varchar',     '', 3,
-        'npa',         'varchar', 'NULL', 6,
-        'nxx',         'varchar', 'NULL', 3,
+        'prefixnum',   'serial',    '', '', '', '', 
+        'regionnum',   'int',       '', '',, '', '', 
+        'countrycode', 'varchar',     '', 3, '', '', 
+        'npa',         'varchar', 'NULL', 6, '', '', 
+        'nxx',         'varchar', 'NULL', 3, '', '', 
       ],
       'primary_key' => 'prefixnum',
       'unique'      => [],
@@ -1147,9 +1182,9 @@ sub tables_hashref {
 
     'reg_code' => {
       'columns' => [
-        'codenum',   'serial',    '', '',
-        'code',      'varchar',   '', $char_d,
-        'agentnum',  'int',       '', '',
+        'codenum',   'serial',    '', '', '', '', 
+        'code',      'varchar',   '', $char_d, '', '', 
+        'agentnum',  'int',       '', '', '', '', 
       ],
       'primary_key' => 'codenum',
       'unique'      => [ [ 'agentnum', 'code' ] ],
@@ -1158,9 +1193,9 @@ sub tables_hashref {
 
     'reg_code_pkg' => {
       'columns' => [
-        'codepkgnum', 'serial', '', '',
-        'codenum',   'int',    '', '',
-        'pkgpart',   'int',    '', '',
+        'codepkgnum', 'serial', '', '', '', '', 
+        'codenum',   'int',    '', '', '', '', 
+        'pkgpart',   'int',    '', '', '', '', 
       ],
       'primary_key' => 'codepkgnum',
       'unique'      => [ [ 'codenum', 'pkgpart' ] ],
@@ -1169,9 +1204,9 @@ sub tables_hashref {
 
     'clientapi_session' => {
       'columns' => [
-        'sessionnum',  'serial',  '', '',
-        'sessionid',  'varchar',  '', $char_d,
-        'namespace',  'varchar',  '', $char_d,
+        'sessionnum',  'serial',  '', '', '', '', 
+        'sessionid',  'varchar',  '', $char_d, '', '', 
+        'namespace',  'varchar',  '', $char_d, '', '', 
       ],
       'primary_key' => 'sessionnum',
       'unique'      => [ [ 'sessionid', 'namespace' ] ],
@@ -1180,10 +1215,10 @@ sub tables_hashref {
 
     'clientapi_session_field' => {
       'columns' => [
-        'fieldnum',    'serial',     '', '',
-        'sessionnum',     'int',     '', '',
-        'fieldname',  'varchar',     '', $char_d,
-        'fieldvalue',    'text', 'NULL', '',
+        'fieldnum',    'serial',     '', '', '', '', 
+        'sessionnum',     'int',     '', '', '', '', 
+        'fieldname',  'varchar',     '', $char_d, '', '', 
+        'fieldvalue',    'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'fieldnum',
       'unique'      => [ [ 'sessionnum', 'fieldname' ] ],
@@ -1192,12 +1227,12 @@ sub tables_hashref {
 
     'payment_gateway' => {
       'columns' => [
-        'gatewaynum',       'serial',   '',     '',
-        'gateway_module',   'varchar',  '',     $char_d,
-        'gateway_username', 'varchar',  'NULL', $char_d,
-        'gateway_password', 'varchar',  'NULL', $char_d,
-        'gateway_action',   'varchar',  'NULL', $char_d,
-        'disabled',   'char',  'NULL',   1,
+        'gatewaynum',       'serial',   '',     '', '', '', 
+        'gateway_module',   'varchar',  '',     $char_d, '', '', 
+        'gateway_username', 'varchar',  'NULL', $char_d, '', '', 
+        'gateway_password', 'varchar',  'NULL', $char_d, '', '', 
+        'gateway_action',   'varchar',  'NULL', $char_d, '', '', 
+        'disabled',   'char',  'NULL',   1, '', '', 
       ],
       'primary_key' => 'gatewaynum',
       'unique' => [],
@@ -1206,10 +1241,10 @@ sub tables_hashref {
 
     'payment_gateway_option' => {
       'columns' => [
-        'optionnum',   'serial',  '',     '',
-        'gatewaynum',  'int',     '',     '',
-        'optionname',  'varchar', '',     $char_d,
-        'optionvalue', 'text',    'NULL', '',
+        'optionnum',   'serial',  '',     '', '', '', 
+        'gatewaynum',  'int',     '',     '', '', '', 
+        'optionname',  'varchar', '',     $char_d, '', '', 
+        'optionvalue', 'text',    'NULL', '', '', '', 
       ],
       'primary_key' => 'optionnum',
       'unique'      => [],
@@ -1218,17 +1253,205 @@ sub tables_hashref {
 
     'agent_payment_gateway' => {
       'columns' => [
-        'agentgatewaynum', 'serial', '', '',
-        'agentnum',        'int', '', '',
-        'gatewaynum',      'int', '', '',
-        'cardtype',        'varchar', 'NULL', $char_d,
-        'taxclass',        'varchar', 'NULL', $char_d,
+        'agentgatewaynum', 'serial', '', '', '', '', 
+        'agentnum',        'int', '', '', '', '', 
+        'gatewaynum',      'int', '', '', '', '', 
+        'cardtype',        'varchar', 'NULL', $char_d, '', '', 
+        'taxclass',        'varchar', 'NULL', $char_d, '', '', 
       ],
       'primary_key' => 'agentgatewaynum',
       'unique'      => [],
       'index'       => [ [ 'agentnum', 'cardtype' ], ],
     },
 
+    'banned_pay' => {
+      'columns' => [
+        'bannum',  'serial',   '',     '', '', '', 
+        'payby',   'char',     '',       4, '', '', 
+        'payinfo', 'varchar',  '',     128, '', '', #say, a 512-big digest _hex encoded
+	#'paymask', 'varchar',  'NULL', $char_d, '', ''
+        '_date',   @date_type, '', '', 
+        'otaker',  'varchar',  '',     32, '', '', 
+        'reason',  'varchar',  'NULL', $char_d, '', '', 
+      ],
+      'primary_key' => 'bannum',
+      'unique'      => [ [ 'payby', 'payinfo' ] ],
+      'index'       => [],
+    },
+
+    'cancel_reason' => {
+      'columns' => [
+        'reasonnum', 'serial',  '',     '', '', '', 
+        'reason',    'varchar', '',     $char_d, '', '', 
+        'disabled',  'char',    'NULL', 1, '', '', 
+      ],
+      'primary_key' => 'reasonnum',
+      'unique' => [],
+      'index'  => [ [ 'disabled' ] ],
+    },
+
+    'pkg_class' => {
+      'columns' => [
+        'classnum',   'serial',  '', '', '', '', 
+        'classname',  'varchar', '', $char_d, '', '', 
+      ],
+      'primary_key' => 'classnum',
+      'unique' => [],
+      'index' => [],
+    },
+
+    'cdr' => {
+      'columns' => [
+        # qw( name type null length default local );
+
+        ###
+        #asterisk fields
+        ###
+
+        'acctid',   'bigserial',  '', '', '', '', 
+        'calldate', 'TIMESTAMP with time zone', '', '', \'now()', '',
+        'clid',        'varchar',  '', $char_d, \"''", '', 
+        'src',         'varchar',  '', $char_d, \"''", '', 
+        'dst',         'varchar',  '', $char_d, \"''", '', 
+        'dcontext',    'varchar',  '', $char_d, \"''", '', 
+        'channel',     'varchar',  '', $char_d, \"''", '', 
+        'dstchannel',  'varchar',  '', $char_d, \"''", '', 
+        'lastapp',     'varchar',  '', $char_d, \"''", '', 
+        'lastdata',    'varchar',  '', $char_d, \"''", '', 
+
+        #these don't seem to be logged by most of the SQL cdr_* modules
+        #except tds under sql-illegal names, so;
+        # ... don't rely on them for rating?
+        # and, what they hey, i went ahead and changed the names and data types
+        # to freeside-style dates...
+          #'start',  'timestamp', 'NULL',  '',    '', '',
+          #'answer', 'timestamp', 'NULL',  '',    '', '',
+          #'end',    'timestamp', 'NULL',  '',    '', '',
+        'startdate',  @date_type, '', '', 
+        'answerdate', @date_type, '', '', 
+        'enddate',    @date_type, '', '', 
+        #
+
+        'duration',    'int',      '',      '',     0, '',
+        'billsec',     'int',      '',      '',     0, '', 
+        'disposition', 'varchar',  '',      45, \"''", '',
+        'amaflags',    'int',      '',      '',     0, '',
+        'accountcode', 'varchar',  '',      20, \"''", '',
+        'uniqueid',    'varchar',  '',      32, \"''", '',
+        'userfield',   'varchar',  '',     255, \"''", '',
+
+        ###
+        # fields for unitel/RSLCOM/convergent that don't map well to asterisk
+        # defaults
+        ###
+
+        #cdr_type: Usage = 1, S&E = 7, OC&C = 8
+        'cdrtypenum',              'int', 'NULL',      '', '', '',
+
+        'charged_party',       'varchar', 'NULL', $char_d, '', '',
+
+        'upstream_currency',      'char', 'NULL',       3, '', '',
+        'upstream_price',      'decimal', 'NULL',  '10,2', '', '', 
+        'upstream_rateplanid',     'int', 'NULL',      '', '', '', #?
+
+        # how it was rated internally...
+        'ratedetailnum',           'int', 'NULL',      '', '', '',
+        'rated_price',         'decimal', 'NULL',  '10,2', '', '',
+
+        'distance',            'decimal', 'NULL',      '', '', '',
+        'islocal',                 'int', 'NULL',      '', '', '', # '',  '', 0, '' instead?
+
+        #cdr_calltype: the big list in appendix 2
+        'calltypenum',             'int', 'NULL',      '', '', '',
+
+        'description',         'varchar', 'NULL', $char_d, '', '',
+        'quantity',                'int', 'NULL',      '', '', '', 
+
+        #cdr_carrier: Telstra =1, Optus = 2, RSL COM = 3
+        'carrierid',               'int', 'NULL',      '', '', '',
+
+        'upstream_rateid',         'int', 'NULL',      '', '', '',
+        
+        ###
+        #and now for our own fields
+        ###
+
+        # a svcnum... right..?
+        'svcnum',             'int',   'NULL',     '',   '', '', 
+
+        #NULL, done (or something)
+        'freesidestatus', 'varchar',   'NULL',     32,   '', '', 
+
+      ],
+      'primary_key' => 'acctid',
+      'unique' => [],
+      'index' => [ [ 'calldate' ], [ 'dst' ], [ 'accountcode' ], [ 'freesidestatus' ] ],
+    },
+
+    'cdr_calltype' => {
+      'columns' => [
+        'calltypenum',   'serial',  '', '', '', '', 
+        'calltypename',  'varchar', '', $char_d, '', '', 
+      ],
+      'primary_key' => 'calltypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'cdr_type' => {
+      'columns' => [
+        'cdrtypenum'  => 'serial',  '', '', '', '',
+        'cdrtypename' => 'varchar', '', '', '', '',
+      ],
+      'primary_key' => 'cdrtypenum',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    'cdr_carrier' => {
+      'columns' => [
+        'carrierid'   => 'serial',  '', '', '', '',
+        'carriername' => 'varchar', '', '', '', '',
+      ],
+      'primary_key' => 'carrierid',
+      'unique'      => [],
+      'index'       => [],
+    },
+
+    #map upstream rateid to ours...
+    'cdr_upstream_rate' => {
+      'columns' => [
+        'upstreamratenum', 'serial',  '', '', '', '',
+        'upstream_rateid', 'varchar', '', $char_d, '', '', 
+        'ratedetailnum',   'int', 'NULL', '', '', '',
+      ],
+      'primary_key' => 'upstreamratenum', #XXX need a primary key
+      'unique' => [ [ 'upstream_rateid' ] ], #unless we add another field, yeah
+      'index'  => [],
+    },
+
+    'inventory_item' => {
+      'columns' => [
+        'itemnum',  'serial',      '',      '', '', '',
+        'classnum', 'int',         '',      '', '', '',
+        'item',     'varchar',     '', $char_d, '', '',
+        'svcnum',   'int',     'NULL',      '', '', '',
+      ],
+      'primary_key' => 'itemnum',
+      'unique' => [ [ 'classnum', 'item' ] ],
+      'index'  => [ [ 'classnum' ], [ 'svcnum' ] ],
+    },
+
+    'inventory_class' => {
+      'columns' => [
+        'classnum',  'serial',       '', '', '', '',
+        'classname', 'varchar', $char_d, '', '', '',
+      ],
+      'primary_key' => 'classnum',
+      'unique' => [],
+      'index'  => [],
+    },
+
   };
 
 }