From 472a125d9ab758cc94294ed51a9b16c941d658d2 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 10 Sep 2013 01:31:58 -0700 Subject: svc_cable service have a single serial / MAC / model, not one-to-many devices like svc_phone and svc_dsl, RT#22009 --- FS/FS/Schema.pm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 2856a1436..442994a21 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -4159,26 +4159,25 @@ sub tables_hashref { 'svc_cable' => { 'columns' => [ - 'svcnum', 'int', '', '', '', '', - #nothing so far... there should be _something_ uniquely identifying - # each subscriber besides the device info...? + 'svcnum', 'int', '', '', '', '', + 'modelnum', 'int', 'NULL', '', '', '', + 'serialnum', 'varchar', 'NULL', $char_d, '', '', + 'mac_addr', 'varchar', 'NULL', 12, '', '', ], 'primary_key' => 'svcnum', 'unique' => [], 'index' => [], }, - 'cable_device' => { + 'cable_model' => { 'columns' => [ - 'devicenum', 'serial', '', '', '', '', - 'devicepart', 'int', '', '', '', '', - 'svcnum', 'int', '', '', '', '', - 'mac_addr', 'varchar', 'NULL', 12, '', '', - 'serial', 'varchar', 'NULL', $char_d, '', '', + 'modelnum', 'serial', '', '', '', '', + 'model_name', 'varchar', '', $char_d, '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], - 'primary_key' => 'devicenum', - 'unique' => [ [ 'mac_addr' ], ], - 'index' => [ [ 'devicepart' ], [ 'svcnum' ], ], + 'primary_key' => 'modelnum', + 'unique' => [ [ 'model_name' ], ], + 'index' => [], }, %{ tables_hashref_torrus() }, -- cgit v1.2.1