From bda1b3f43f3f7fe95c6ad221a2ae94bb47b8b9c7 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 13 Aug 2001 00:19:02 +0000 Subject: [PATCH] depriciate svc_acct_sm, add unique index for username+domsvc on svc_acct, remove silly $Log$ --- bin/fs-setup | 174 +++++------------------------------------------------------ 1 file changed, 14 insertions(+), 160 deletions(-) diff --git a/bin/fs-setup b/bin/fs-setup index a3e067bec..ec8b75089 100755 --- a/bin/fs-setup +++ b/bin/fs-setup @@ -1,152 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: fs-setup,v 1.41 2001-08-12 19:41:25 jeff Exp $ -# -# ivan@sisd.com 97-nov-8,9 -# -# agent_type and type_pkgs added. -# (index need to be declared, & primary keys shoudln't have mysql syntax) -# ivan@sisd.com 97-nov-13 -# -# pulled modified version back out of register.cgi ivan@sisd.com 98-feb-21 -# -# removed extraneous sample data ivan@sisd.com 98-mar-23 -# -# gained the big hash from dbdef.pm, dbdef.pm usage rewrite ivan@sisd.com -# 98-apr-19 - 98-may-11 plus -# -# finished up ivan@sisd.com 98-jun-1 -# -# part_svc fields are all forced NULL, not the opposite -# hmm: also are forced varchar($char_d) as fixed '0' for things like -# uid is Not Good. will this break anything else? -# ivan@sisd.com 98-jun-29 -# -# ss is 11 chars ivan@sisd.com 98-jul-20 -# -# setup of arbitrary radius fields ivan@sisd.com 98-aug-9 -# -# ouch, removed index on company name that wasn't supposed to be there -# ivan@sisd.com 98-sep-4 -# -# fix radius attributes ivan@sisd.com 98-sep-27 -# -# $Log: fs-setup,v $ -# Revision 1.41 2001-08-12 19:41:25 jeff -# merging vpopmail support branch -# -# Revision 1.40 2001/08/11 05:53:42 ivan -# add comments field -# -# Revision 1.39 2001/07/30 07:42:39 ivan -# need an DBIx::DBSchema with delcolumn -# -# Revision 1.38 2001/07/30 07:36:04 ivan -# templates!!! -# -# Revision 1.37 2001/06/03 14:16:11 ivan -# allow empty refund reasons -# -# Revision 1.36 2001/04/15 12:56:31 ivan -# s/dbdef/DBIx::DBSchema/ -# -# Revision 1.35 2001/04/15 09:36:43 ivan -# http://www.sisd.com/freeside/list-archive/msg01450.html -# -# Revision 1.34 2001/04/09 23:05:16 ivan -# Transactions Part I!!! -# -# Revision 1.33 2001/02/03 14:03:50 ivan -# time-based prepaid cards, session monitor. woop! -# -# Revision 1.32 2000/12/04 00:13:02 ivan -# fix nas.last type -# -# Revision 1.31 2000/12/01 18:34:53 ivan -# another tyop -# -# Revision 1.30 2000/12/01 18:33:32 ivan -# tyop -# -# Revision 1.29 2000/11/07 15:00:37 ivan -# session monitor -# -# Revision 1.28 2000/10/30 10:47:26 ivan -# nas.last can't be defined NULL if indexed -# -# Revision 1.26 2000/07/06 08:57:27 ivan -# support for radius check attributes (except importing). poorly documented. -# -# Revision 1.25 2000/06/29 12:00:49 ivan -# support for pre-encrypted md5 passwords. -# -# Revision 1.24 2000/03/02 07:44:07 ivan -# typo forgot closing ' -# -# Revision 1.23 2000/02/03 05:16:52 ivan -# beginning of DNS and Apache support -# -# Revision 1.22 2000/01/31 05:22:23 ivan -# prepaid "internet cards" -# -# Revision 1.21 2000/01/30 06:03:26 ivan -# postgres 6.5 finally supports decimal(10,2) -# -# Revision 1.20 2000/01/28 22:53:33 ivan -# track full phone number -# -# Revision 1.19 1999/07/29 08:50:35 ivan -# wrong type for cust_pay_batch.exp -# -# Revision 1.18 1999/04/15 22:46:30 ivan -# TT isn't a state! -# -# Revision 1.17 1999/04/14 07:58:39 ivan -# export getsecrets from FS::UID instead of calling it explicitly -# -# Revision 1.16 1999/02/28 19:44:16 ivan -# constructors s/create/new/ pointed out by "Bao C. Ha" -# -# Revision 1.15 1999/02/27 21:06:21 ivan -# cust_main.paydate should be varchar(10), not @date_type ; problem reported -# by Ben Leibig -# -# Revision 1.14 1999/02/07 09:59:14 ivan -# more mod_perl fixes, and bugfixes Peter Wemm sent via email -# -# Revision 1.13 1999/02/04 06:09:23 ivan -# add AU provences -# -# Revision 1.12 1999/02/03 10:42:27 ivan -# *** empty log message *** -# -# Revision 1.11 1999/01/17 03:11:52 ivan -# remove preliminary completehost changes -# -# Revision 1.10 1998/12/16 06:05:38 ivan -# add table cust_main_invoice -# -# Revision 1.9 1998/12/15 04:36:29 ivan -# s/croak/die/; #oops -# -# Revision 1.8 1998/12/15 04:33:27 ivan -# dies if it isn't running as the freeside user -# -# Revision 1.7 1998/11/18 09:01:31 ivan -# i18n! i18n! -# -# Revision 1.6 1998/11/15 13:18:02 ivan -# remove debugging -# -# Revision 1.5 1998/11/15 09:43:03 ivan -# update for new config file syntax, new adminsuidsetup -# -# Revision 1.4 1998/10/22 15:51:23 ivan -# also varchar with no length specified - postgresql fix broke mysql. -# -# Revision 1.3 1998/10/22 15:46:28 ivan -# now smallint is illegal, so remove that too. -# +# $Id: fs-setup,v 1.42 2001-08-13 00:19:02 ivan Exp $ #to delay loading dbdef until we're ready BEGIN { $FS::Record::setup_hack = 1; } @@ -274,7 +128,7 @@ my($part_svc)=$dbdef->table('part_svc'); #because of svc_acct_pop #foreach (grep /^svc_/, $dbdef->tables) { #foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) { -foreach (qw(svc_acct svc_acct_sm svc_domain svc_forward svc_www)) { +foreach (qw(svc_acct svc_domain svc_forward svc_www)) { my($table)=$dbdef->table($_); my($col); foreach $col ( $table->columns ) { @@ -713,21 +567,21 @@ sub tables_hash_hack { 'domsvc', 'int', '', '', ], 'primary_key' => 'svcnum', - 'unique' => [ [] ], + 'unique' => [ [ 'username', 'domsvc' ] ], 'index' => [ ['username'], ['domsvc'] ], }, - 'svc_acct_sm' => { - 'columns' => [ - 'svcnum', 'int', '', '', - 'domsvc', 'int', '', '', - 'domuid', 'int', '', '', - 'domuser', 'varchar', '', $char_d, - ], - 'primary_key' => 'svcnum', - 'unique' => [ [] ], - 'index' => [ ['domsvc'], ['domuid'] ], - }, +# 'svc_acct_sm' => { +# 'columns' => [ +# 'svcnum', 'int', '', '', +# 'domsvc', 'int', '', '', +# 'domuid', 'int', '', '', +# 'domuser', 'varchar', '', $char_d, +# ], +# 'primary_key' => 'svcnum', +# 'unique' => [ [] ], +# 'index' => [ ['domsvc'], ['domuid'] ], +# }, #'svc_charge' => { # 'columns' => [ -- 2.11.0