X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=61b793bb41e19b2142dac62d04b3fbb45230c3b4;hb=HEAD;hp=2dcbb6ff6f81583753520242e19613722666956a;hpb=dcd475e399e8cd59b9beb2e95d7f933bf1d6dfc1;p=freeside.git diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 2dcbb6ff6..61b793bb4 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -5247,13 +5247,14 @@ sub tables_hashref { 'rate' => { 'columns' => [ - 'ratenum', 'serial', '', '', '', '', - 'ratename', 'varchar', '',$char_d, '', '', - 'agentnum', 'int', 'NULL', '', '', '', - 'default_detailnum', 'int', 'NULL', '', '', '', + 'ratenum', 'serial', '', '', '', '', + 'ratename', 'varchar', '', $char_d, '', '', + 'agentnum', 'int', 'NULL', '', '', '', + 'default_detailnum', 'int', 'NULL', '', '', '', + 'agent_rateid', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'ratenum', - 'unique' => [], + 'unique' => [ ['agentnum','agent_rateid'], ], 'index' => [], 'foreign_keys' => [ { columns => [ 'agentnum' ], @@ -5316,10 +5317,11 @@ sub tables_hashref { 'regionnum', 'serial', '', '', '', '', 'regionname', 'varchar', '', $char_d, '', '', 'exact_match', 'char', 'NULL', 1, '', '', + 'agent_regionid', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'regionnum', 'unique' => [], - 'index' => [], + 'index' => [ ['agent_regionid'] ], }, 'rate_prefix' => { @@ -5734,6 +5736,9 @@ sub tables_hashref { # FK to cust_bill_pkg_detail; having a value here absolutely means # that the CDR appears on an invoice 'detailnum', 'bigint', 'NULL', '', '', '', + + #for mediation/deduplication + 'sipcallid', 'varchar', 'NULL', 255, '', '', ], 'primary_key' => 'acctid', 'unique' => [], @@ -5747,7 +5752,7 @@ sub tables_hashref { [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatchnum' ], [ 'src_ip_addr' ], [ 'dst_ip_addr' ], [ 'dst_term' ], - [ 'detailnum' ], + [ 'detailnum' ], [ 'sipcallid' ], ], #no FKs on cdr table... choosing not to throw errors no matter what's # thrown in here. better to have the data. @@ -5926,6 +5931,7 @@ sub tables_hashref { 'username', 'varchar', '', $char_d, '', '', '_password', 'varchar', 'NULL', $char_d, '', '', '_password_encoding', 'varchar', 'NULL', $char_d, '', '', + 'totp_secret32', 'char', 'NULL', 32, '', '', 'last', 'varchar', 'NULL', $char_d, '', '', 'first', 'varchar', 'NULL', $char_d, '', '', 'user_custnum', 'int', 'NULL', '', '', '', @@ -7448,6 +7454,7 @@ sub tables_hashref { 'is_business', 'char', 'NULL', 1, '', '', 'active_date', @date_type, '', '', 'expire_date', @date_type, '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'zonenum', 'unique' => [],