From b8e4ca0d3999d51c6970bd084d889abebcaae2cf Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Tue, 8 Jul 2014 17:06:52 -0700 Subject: [PATCH] avoid foreign key errors when reconciling NENA2 batches, #14049 --- FS/FS/Schema.pm | 6 +----- FS/FS/export_batch_item.pm | 1 - FS/FS/part_export/nena2.pm | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 1b76a23e9..1c9c4a200 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -6610,7 +6610,7 @@ sub tables_hashref { 'exportnum', 'int', '', '', '', '', '_date', 'int', '', '', '', '', 'status', 'varchar', 'NULL', 32, '', '', - 'statustext', 'varchar', 'NULL', $char_d, '', '', + 'statustext', 'text', 'NULL', '', '', '', ], 'primary_key' => 'batchnum', 'unique' => [], @@ -6640,10 +6640,6 @@ sub tables_hashref { table => 'export_batch', references => [ 'batchnum' ] }, - { columns => [ 'svcnum' ], - table => 'cust_svc', - references => [ 'svcnum' ] - }, ], }, diff --git a/FS/FS/export_batch_item.pm b/FS/FS/export_batch_item.pm index accb3f1e2..e442748b5 100644 --- a/FS/FS/export_batch_item.pm +++ b/FS/FS/export_batch_item.pm @@ -104,7 +104,6 @@ sub check { || $self->ut_number('batchnum') || $self->ut_foreign_key('batchnum', 'export_batch', 'batchnum') || $self->ut_number('svcnum') - || $self->ut_foreign_key('svcnum', 'cust_svc', 'svcnum') || $self->ut_enum('action', [ qw(insert delete replace suspend unsuspend relocate) ] ) diff --git a/FS/FS/part_export/nena2.pm b/FS/FS/part_export/nena2.pm index 71d753aa1..ad67ba2a0 100644 --- a/FS/FS/part_export/nena2.pm +++ b/FS/FS/part_export/nena2.pm @@ -355,7 +355,6 @@ sub process { # ignore items that have no data to add to the batch next if $item->action eq 'suspend' or $item->action eq 'unsuspend'; - my $svcnum = $item->svcnum; my $data = $item->data; %hash = %{ $item_format->parse($data) }; my $phonenum = $hash{npa} . $hash{calling_number}; -- 2.11.0