X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=1aa2b69c4691263da480aa539df60924931953cd;hp=bae2ab7f8e3a83c523e42595e0145895895c4d6a;hb=652b2d9f68a558d03dbf441fd28ad17e847dff42;hpb=6178a15b24780f425a6bcad8a5e7679956558207 diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index bae2ab7f8..1aa2b69c4 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -117,6 +117,7 @@ sub dbdef_dist { #false laziness w/sub indices in DBIx::DBSchema::DBD (well, sorta) #and sub sql_create_table in DBIx::DBSchema::Table (slighty more?) my $unique = $tables_hashref->{$tablename}{'unique'}; + warn "missing index for $tablename\n" unless defined $tables_hashref->{$tablename}{'index'}; my @index = @{ $tables_hashref->{$tablename}{'index'} }; # kludge to avoid avoid "BLOB/TEXT column 'statustext' used in key @@ -193,34 +194,42 @@ sub dbdef_dist { my $tableobj = $dbdef->table($table) or die "unknown table $table"; - my %indices = $tableobj->indices; + my %h_indices = (); + + unless ( $table eq 'cust_event' ) { #others? + + my %indices = $tableobj->indices; - my %h_indices = map { - ( "h_$_" => - DBIx::DBSchema::Index->new({ - 'name' => 'h_'. $indices{$_}->name, - 'unique' => 0, - 'columns' => [ @{$indices{$_}->columns} ], - }) - ); - } - keys %indices; - - $h_indices{"h_${table}_srckey"} = DBIx::DBSchema::Index->new({ - 'name' => "h_${table}_srckey", - 'unique' => 0, - 'columns' => [ 'history_action', #right? - $tableobj->primary_key, - ], - }); - - $h_indices{"h_${table}_srckey2"} = DBIx::DBSchema::Index->new({ - 'name' => "h_${table}_srckey2", - 'unique' => 0, - 'columns' => [ 'history_date', - $tableobj->primary_key, - ], - }); + %h_indices = map { + ( "h_$_" => + DBIx::DBSchema::Index->new({ + 'name' => 'h_'. $indices{$_}->name, + 'unique' => 0, + 'columns' => [ @{$indices{$_}->columns} ], + }) + ); + } + keys %indices; + + $h_indices{"h_${table}_srckey"} = + DBIx::DBSchema::Index->new({ + 'name' => "h_${table}_srckey", + 'unique' => 0, + 'columns' => [ 'history_action', #right? + $tableobj->primary_key, + ], + }); + + $h_indices{"h_${table}_srckey2"} = + DBIx::DBSchema::Index->new({ + 'name' => "h_${table}_srckey2", + 'unique' => 0, + 'columns' => [ 'history_date', + $tableobj->primary_key, + ], + }); + + } my $h_tableobj = DBIx::DBSchema::Table->new( { 'name' => "h_$table", @@ -771,6 +780,8 @@ sub tables_hashref { 'credit_limit', @money_typen, '', '', 'archived', 'char', 'NULL', 1, '', '', 'email_csv_cdr', 'char', 'NULL', 1, '', '', + 'accountcode_cdr', 'char', 'NULL', 1, '', '', + 'billday', 'int', 'NULL', '', '', '', ], 'primary_key' => 'custnum', 'unique' => [ [ 'agentnum', 'agent_custid' ] ], @@ -1300,6 +1311,16 @@ sub tables_hashref { 'index' => [ ['batchnum'], ['invnum'], ['custnum'] ], }, + 'fcc477map' => { + 'columns' => [ + 'formkey', 'varchar', '', 255, '', '', + 'formvalue', 'text', 'NULL', '', '', '', + ], + 'primary_key' => 'formkey', + 'unique' => [], + 'index' => [], + }, + 'cust_pkg' => { 'columns' => [ 'pkgnum', 'serial', '', '', '', '', @@ -1327,14 +1348,15 @@ sub tables_hashref { 'no_auto', 'char', 'NULL', 1, '', '', 'quantity', 'int', 'NULL', '', '', '', 'agent_pkgid', 'int', 'NULL', '', '', '', + 'waive_setup', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'pkgnum', 'unique' => [], 'index' => [ ['custnum'], ['pkgpart'], [ 'pkgbatch' ], [ 'locationnum' ], [ 'usernum' ], [ 'agent_pkgid' ], - [ 'start_date' ], ['setup'], ['last_bill'], ['bill'], - ['susp'], ['adjourn'], ['expire'], ['cancel'], - ['change_date'], ['order_date'], + ['order_date'], [ 'start_date' ], ['setup'], ['bill'], + ['last_bill'], ['susp'], ['adjourn'], ['cancel'], + ['expire'], ['contract_end'], ['change_date'], ['no_auto'], ], }, @@ -1416,6 +1438,7 @@ sub tables_hashref { 'percent', 'decimal', '', '', '', '', 'months', 'decimal', 'NULL', '', '', '', 'disabled', 'char', 'NULL', 1, '', '', + 'setup', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'discountnum', 'unique' => [], @@ -1433,6 +1456,8 @@ sub tables_hashref { 'reason', 'varchar', '', $char_d, '', '', 'payby', 'char', '', 4, '', '', # CARD/BILL/COMP, should # be index into payby + 'recur_show_zero', 'char', 'NULL', 1, '', '', + 'setup_show_zero', 'char', 'NULL', 1, '', '', # table eventually 'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above 'paymask', 'varchar', 'NULL', $char_d, '', '', @@ -1507,12 +1532,13 @@ sub tables_hashref { 'credit_weight', 'real', 'NULL', '', '', '', 'agentnum', 'int', 'NULL', '', '', '', 'fcc_ds0s', 'int', 'NULL', '', '', '', - 'no_auto', 'char', 'NULL', 1, '', '', + 'no_auto', 'char', 'NULL', 1, '', '', + 'recur_show_zero', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'pkgpart', 'unique' => [], 'index' => [ [ 'promo_code' ], [ 'disabled' ], [ 'classnum' ], - [ 'agentnum' ], + [ 'agentnum' ], ['no_auto'], ], }, @@ -1615,6 +1641,7 @@ sub tables_hashref { 'pkgpart', 'int', '', '', '', '', 'svcpart', 'int', '', '', '', '', 'quantity', 'int', '', '', '', '', + 'setup_show_zero', 'char', 'NULL', 1, '', '', 'primary_svc','char', 'NULL', 1, '', '', 'hidden', 'char', 'NULL', 1, '', '', ], @@ -2232,8 +2259,8 @@ sub tables_hashref { 'svc_external' => { 'columns' => [ - 'svcnum', 'int', '', '', '', '', - 'id', 'int', 'NULL', '', '', '', + 'svcnum', 'int', '', '', '', '', + 'id', 'bigint', 'NULL', '', '', '', 'title', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'svcnum', @@ -2456,14 +2483,16 @@ sub tables_hashref { 'payby', 'char', '', 4, '', '', 'payinfo', 'varchar', '', 128, '', '', #say, a 512-big digest _hex encoded #'paymask', 'varchar', 'NULL', $char_d, '', '' - '_date', @date_type, '', '', - 'otaker', 'varchar', 'NULL', 32, '', '', - 'usernum', 'int', 'NULL', '', '', '', + '_date', @date_type, '', '', + 'end_date', @date_type, '', '', + 'otaker', 'varchar', 'NULL', 32, '', '', + 'usernum', 'int', 'NULL', '', '', '', + 'bantype', 'varchar', 'NULL', $char_d, '', '', 'reason', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'bannum', - 'unique' => [ [ 'payby', 'payinfo' ] ], - 'index' => [ [ 'usernum' ] ], + 'unique' => [], + 'index' => [ [ 'payby', 'payinfo' ], [ 'usernum' ], ], }, 'pkg_category' => { @@ -2485,6 +2514,7 @@ sub tables_hashref { 'classname', 'varchar', '', $char_d, '', '', 'categorynum', 'int', 'NULL', '', '', '', 'disabled', 'char', 'NULL', 1, '', '', + 'fcc_ds0s', 'int', 'NULL', '', '', '', ], 'primary_key' => 'classnum', 'unique' => [], @@ -2538,7 +2568,7 @@ sub tables_hashref { # fields for unitel/RSLCOM/convergent that don't map well to asterisk # defaults # though these are now used elsewhere: - # charged_party, upstream_price, rated_price, carrierid + # charged_party, upstream_price, rated_price, carrierid, cdrtypenum ### #cdr_type: Usage = 1, S&E = 7, OC&C = 8 @@ -2547,7 +2577,7 @@ sub tables_hashref { 'charged_party', 'varchar', 'NULL', $char_d, '', '', 'upstream_currency', 'char', 'NULL', 3, '', '', - 'upstream_price', 'decimal', 'NULL', '10,2', '', '', + 'upstream_price', 'decimal', 'NULL', '10,4', '', '', 'upstream_rateplanid', 'int', 'NULL', '', '', '', #? # how it was rated internally... @@ -2584,10 +2614,14 @@ sub tables_hashref { #an indexed place to put big numbers 'cdrid', 'bigint', 'NULL', '', '', '', + #for taqua accountcode rewriting, for starters + 'sessionnum', 'int', 'NULL', '', '', '', + 'subscriber', 'varchar', 'NULL', $char_d, '', '', + #old - 'cdrbatch', 'varchar', 'NULL', 255, '', '', + 'cdrbatch', 'varchar', 'NULL', 255, '', '', #new - 'cdrbatchnum', 'int', 'NULL', '', '', '', + 'cdrbatchnum', 'int', 'NULL', '', '', '', ], 'primary_key' => 'acctid', @@ -2595,6 +2629,7 @@ sub tables_hashref { 'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'dcontext' ], [ 'charged_party' ], [ 'accountcode' ], [ 'carrierid' ], [ 'cdrid' ], + [ 'sessionnum' ], [ 'subscriber' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], [ 'cdrbatchnum' ], ], @@ -2841,6 +2876,8 @@ sub tables_hashref { 'station', 'char', 'NULL', 4, '', '', 'name', 'varchar', 'NULL', $char_d, '', '', 'rate_center_abbrev', 'varchar', 'NULL', $char_d, '', '', + 'latanum', 'int', 'NULL', '', '', '', + 'msanum', 'int', 'NULL', '', '', '', 'ordernum', 'int', 'NULL', '', '', '', 'svcnum', 'int', 'NULL', '', '', '', 'availbatch', 'varchar', 'NULL', $char_d, '', '', @@ -2853,6 +2890,7 @@ sub tables_hashref { [ 'exportnum', 'countrycode', 'npa', 'nxx', 'station' ], # # [ 'svcnum' ], [ 'availbatch' ], + [ 'latanum' ], ], }, @@ -2860,12 +2898,33 @@ sub tables_hashref { 'columns' => [ 'latanum', 'int', '', '', '', '', 'description', 'varchar', '', $char_d, '', '', + 'have_usage', 'int', 'NULL', '', '', '', ], 'primary_key' => 'latanum', 'unique' => [], 'index' => [], }, + 'msa' => { + 'columns' => [ + 'msanum', 'int', '', '', '', '', + 'description', 'varchar', '', $char_d, '', '', + ], + 'primary_key' => 'msanum', + 'unique' => [], + 'index' => [], + }, + + 'rate_center' => { + 'columns' => [ + 'ratecenternum', 'serial', '', '', '', '', + 'description', 'varchar', '', $char_d, '', '', + ], + 'primary_key' => 'ratecenternum', + 'unique' => [], + 'index' => [], + }, + 'did_vendor' => { 'columns' => [ 'vendornum', 'serial', '', '', '', '', @@ -2876,16 +2935,29 @@ sub tables_hashref { 'index' => [], }, - 'did_order' => { + 'did_order_item' => { 'columns' => [ - 'ordernum', 'serial', '', '', '', '', - 'vendornum', 'int', '', '', '', '', - 'vendor_order_id', 'varchar', '', $char_d, '', '', - 'msa', 'varchar', 'NULL', $char_d, '', '', + 'orderitemnum', 'serial', '', '', '', '', + 'ordernum', 'int', '', '', '', '', + 'msanum', 'int', 'NULL', '', '', '', + 'npa', 'int', 'NULL', '', '', '', 'latanum', 'int', 'NULL', '', '', '', - 'rate_center', 'varchar', 'NULL', $char_d, '', '', + 'ratecenternum', 'int', 'NULL', '', '', '', 'state', 'char', 'NULL', 2, '', '', 'quantity', 'int', '', '', '', '', + 'custnum', 'int', 'NULL', '', '', '', + ], + 'primary_key' => 'orderitemnum', + 'unique' => [], + 'index' => [], + }, + + 'did_order' => { + 'columns' => [ + 'ordernum', 'serial', '', '', '', '', + 'vendornum', 'int', '', '', '', '', + 'vendor_order_id', 'varchar', 'NULL', $char_d, '', '', + 'custnum', 'int', 'NULL', '', '', '', 'submitted', 'int', '', '', '', '', 'confirmed', 'int', 'NULL', '', '', '', 'received', 'int', 'NULL', '', '', '', @@ -3044,6 +3116,24 @@ sub tables_hashref { 'index' => [ ['agentnum'], ] }, + 'cust_msg' => { + 'columns' => [ + 'custmsgnum', 'serial', '', '', '', '', + 'custnum', 'int', '', '', '', '', + 'msgnum', 'int', 'NULL', '', '', '', + '_date', @date_type, '', '', + 'env_from', 'varchar', 'NULL', 255, '', '', + 'env_to', 'varchar', 'NULL', 255, '', '', + 'header', 'blob', 'NULL', '', '', '', + 'body', 'blob', 'NULL', '', '', '', + 'error', 'varchar', 'NULL', 255, '', '', + 'status', 'varchar', '',$char_d, '', '', + ], + 'primary_key' => 'custmsgnum', + 'unique' => [ ], + 'index' => [ ['custnum'], ], + }, + 'svc_cert' => { 'columns' => [ 'svcnum', 'int', '', '', '', '', @@ -3065,33 +3155,6 @@ sub tables_hashref { 'index' => [], #recnum }, - 'nms_device' => { - 'columns' => [ - 'nms_devicenum', 'serial', '', '', '', '', - #'agentnum', 'int', 'NULL', '', '', '', - 'devicename', 'varchar', '', $char_d, '', '', - 'ip', 'varchar', '', 15, '', '', - 'protocol', 'varchar', '', $char_d, '', '', -# 'last', 'int', '', '', '', '', - ], - 'primary_key' => 'nms_devicenum', - 'unique' => [], - 'index' => [], - }, - - 'nms_deviceport' => { - 'columns' => [ - 'portnum', 'serial', '', '', '', '', - 'nms_devicenum', 'int', '', '', '', '', - 'deviceport', 'int', '', '', '', '', - #'ip', 'varchar', 'NULL', 15, '', '', - 'svcnum', 'int', 'NULL', '', '', '', - ], - 'primary_key' => 'portnum', - 'unique' => [ [ 'nms_devicenum', 'deviceport' ] ], - 'index' => [ [ 'svcnum' ] ], - }, - 'svc_port' => { 'columns' => [ 'svcnum', 'int', '', '', '', '', @@ -3101,6 +3164,19 @@ sub tables_hashref { 'index' => [], #recnum }, + 'areacode' => { + 'columns' => [ + 'areanum', 'serial', '', '', '', '', + 'code', 'char', '', 3, '', '', + 'country', 'char', 'NULL', 2, '', '', + 'state', 'char', 'NULL', 2, '', '', + 'description','varchar', 'NULL', 255, '', '', + ], + 'primary_key' => 'areanum', + 'unique' => [ [ 'code' ] ], + 'index' => [], + }, + # name type nullability length default local