X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=9d4a054b01a6c7c5b9a9d5dd4225c464f1d6b956;hb=ca63c29a40e2c7ad13558eb204fbb6764bf7a351;hp=e0fef91268f1db3947278a620d77223a4a90f9c1;hpb=8a507f43bfa5c5232b5babfbbf82ac5de5702add;p=freeside.git diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index e0fef9126..9d4a054b0 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -3,11 +3,10 @@ package FS::Schema; use vars qw(@ISA @EXPORT_OK $DEBUG $setup_hack %dbdef_cache); use subs qw(reload_dbdef); use Exporter; -use DBIx::DBSchema 0.30; +use DBIx::DBSchema 0.33; use DBIx::DBSchema::Table; use DBIx::DBSchema::Column 0.06; -use DBIx::DBSchema::ColGroup::Unique; -use DBIx::DBSchema::ColGroup::Index; +use DBIx::DBSchema::Index; use FS::UID qw(datasrc); @ISA = qw(Exporter); @@ -81,30 +80,58 @@ sub dbdef_dist { my $tables_hashref = tables_hashref(); + #turn it into objects my $dbdef = new DBIx::DBSchema map { + + my $tablename = $_; + my $indexnum = 1; + my @columns; - while (@{$tables_hashref->{$_}{'columns'}}) { + while (@{$tables_hashref->{$tablename}{'columns'}}) { #my($name, $type, $null, $length, $default, $local) = my @coldef = - splice @{$tables_hashref->{$_}{'columns'}}, 0, 6; + splice @{$tables_hashref->{$tablename}{'columns'}}, 0, 6; my %hash = map { $_ => shift @coldef } qw( name type null length default local ); unless ( defined $hash{'default'} ) { - warn "$_:\n". + warn "$tablename:\n". join('', map "$_ => $hash{$_}\n", keys %hash) ;# $stop = ; } push @columns, new DBIx::DBSchema::Column ( \%hash ); } - DBIx::DBSchema::Table->new( - $_, - $tables_hashref->{$_}{'primary_key'}, - DBIx::DBSchema::ColGroup::Unique->new($tables_hashref->{$_}{'unique'}), - DBIx::DBSchema::ColGroup::Index->new($tables_hashref->{$_}{'index'}), - @columns, - ); + + #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'}; + my $index = $tables_hashref->{$tablename}{'index'}; + my @indices = (); + push @indices, map { + DBIx::DBSchema::Index->new({ + 'name' => $tablename. $indexnum++, + 'unique' => 1, + 'columns' => $_, + }); + } + @$unique; + push @indices, map { + DBIx::DBSchema::Index->new({ + 'name' => $tablename. $indexnum++, + 'unique' => 0, + 'columns' => $_, + }); + } + @$index; + + DBIx::DBSchema::Table->new({ + 'name' => $tablename, + 'primary_key' => $tables_hashref->{$tablename}{'primary_key'}, + 'columns' => \@columns, + 'indices' => \@indices, + }); + } keys %$tables_hashref; if ( $DEBUG ) { @@ -112,14 +139,6 @@ sub dbdef_dist { warn "[debug]$me $_\n" foreach $dbdef->tables; } - my $cust_main = $dbdef->table('cust_main'); - #unless ($ship) { #remove ship_ from cust_main - # $cust_main->delcolumn($_) foreach ( grep /^ship_/, $cust_main->columns ); - #} else { #add indices - push @{$cust_main->index->lol_ref}, - map { [ "ship_$_" ] } qw( last company daytime night fax ); - #} - #add radius attributes to svc_acct # #my($svc_acct)=$dbdef->table('svc_acct'); @@ -151,72 +170,76 @@ sub dbdef_dist { ) { my $tableobj = $dbdef->table($table) or die "unknown table $table"; - - die "unique->lol_ref undefined for $table" - unless defined $tableobj->unique->lol_ref; - die "index->lol_ref undefined for $table" - unless defined $tableobj->index->lol_ref; - + + my %indices = $tableobj->indices; + + my %h_indices = map { + ( "h_$_" => + DBIx::DBSchema::Index->new({ + 'name' => 'h_'. $indices{$_}->name, + 'unique' => 0, + 'columns' => [ @{$indices{$_}->columns} ], + }) + ); + } + keys %indices; + my $h_tableobj = DBIx::DBSchema::Table->new( { - name => "h_$table", - primary_key => 'historynum', - unique => DBIx::DBSchema::ColGroup::Unique->new( [] ), - 'index' => DBIx::DBSchema::ColGroup::Index->new( [ - @{$tableobj->unique->lol_ref}, - @{$tableobj->index->lol_ref} - ] ), - columns => [ - DBIx::DBSchema::Column->new( { - 'name' => 'historynum', - 'type' => 'serial', - 'null' => 'NOT NULL', - 'length' => '', - 'default' => '', - 'local' => '', - } ), - DBIx::DBSchema::Column->new( { - 'name' => 'history_date', - 'type' => 'int', - 'null' => 'NULL', - 'length' => '', - 'default' => '', - 'local' => '', - } ), - DBIx::DBSchema::Column->new( { - 'name' => 'history_user', - 'type' => 'varchar', - 'null' => 'NOT NULL', - 'length' => '80', - 'default' => '', - 'local' => '', - } ), - DBIx::DBSchema::Column->new( { - 'name' => 'history_action', - 'type' => 'varchar', - 'null' => 'NOT NULL', - 'length' => '80', - 'default' => '', - 'local' => '', - } ), - map { - my $column = $tableobj->column($_); - - #clone so as to not disturb the original - $column = DBIx::DBSchema::Column->new( { - map { $_ => $column->$_() } - qw( name type null length default local ) - } ); - - if ( $column->type eq 'serial' ) { - $column->type('int'); - $column->null('NULL'); - } - #$column->default('') - # if $column->default =~ /^nextval\(/i; - #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i; - #$column->local($local); - $column; - } $tableobj->columns + 'name' => "h_$table", + 'primary_key' => 'historynum', + 'indices' => \%h_indices, + 'columns' => [ + DBIx::DBSchema::Column->new( { + 'name' => 'historynum', + 'type' => 'serial', + 'null' => 'NOT NULL', + 'length' => '', + 'default' => '', + 'local' => '', + } ), + DBIx::DBSchema::Column->new( { + 'name' => 'history_date', + 'type' => 'int', + 'null' => 'NULL', + 'length' => '', + 'default' => '', + 'local' => '', + } ), + DBIx::DBSchema::Column->new( { + 'name' => 'history_user', + 'type' => 'varchar', + 'null' => 'NOT NULL', + 'length' => '80', + 'default' => '', + 'local' => '', + } ), + DBIx::DBSchema::Column->new( { + 'name' => 'history_action', + 'type' => 'varchar', + 'null' => 'NOT NULL', + 'length' => '80', + 'default' => '', + 'local' => '', + } ), + map { + my $column = $tableobj->column($_); + + #clone so as to not disturb the original + $column = DBIx::DBSchema::Column->new( { + map { $_ => $column->$_() } + qw( name type null length default local ) + } ); + + if ( $column->type eq 'serial' ) { + $column->type('int'); + $column->null('NULL'); + } + #$column->default('') + # if $column->default =~ /^nextval\(/i; + #( my $local = $column->local ) =~ s/AUTO_INCREMENT//i; + #$column->local($local); + $column; + } $tableobj->columns ], } ); $dbdef->addtable($h_tableobj); @@ -408,6 +431,8 @@ sub tables_hashref { # 'middle', 'varchar', 'NULL', $char_d, '', '', 'first', 'varchar', '', $char_d, '', '', 'ss', 'varchar', 'NULL', 11, '', '', + 'stateid', 'varchar', 'NULL', $char_d, '', '', + 'stateid_state', 'varchar', 'NULL', $char_d, '', '', 'birthdate' ,@date_type, '', '', 'signupdate',@date_type, '', '', 'company', 'varchar', 'NULL', $char_d, '', '', @@ -445,6 +470,8 @@ sub tables_hashref { 'paystart_year', 'int', 'NULL', '', '', '', 'payissue', 'varchar', 'NULL', 2, '', '', 'payname', 'varchar', 'NULL', $char_d, '', '', + 'paystate', 'varchar', 'NULL', $char_d, '', '', + 'paytype', 'varchar', 'NULL', $char_d, '', '', 'payip', 'varchar', 'NULL', 15, '', '', 'tax', 'char', 'NULL', 1, '', '', 'otaker', 'varchar', '', 32, '', '', @@ -452,6 +479,7 @@ sub tables_hashref { 'referral_custnum', 'int', 'NULL', '', '', '', 'comments', 'text', 'NULL', '', '', '', 'spool_cdr','char', 'NULL', 1, '', '', + 'invoice_terms', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'custnum', 'unique' => [ [ 'agentnum', 'agent_custid' ] ], @@ -460,8 +488,8 @@ sub tables_hashref { [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ], [ 'county' ], [ 'state' ], [ 'country' ], [ 'zip' ], [ 'ship_last' ], [ 'ship_company' ], + [ 'ship_daytime' ], [ 'ship_night' ], [ 'ship_fax' ], [ 'payby' ], [ 'paydate' ], - ], }, @@ -522,11 +550,13 @@ sub tables_hashref { # eventually 'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above 'paymask', 'varchar', 'NULL', $char_d, '', '', + 'paydate', 'varchar', 'NULL', 10, '', '', 'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes. + 'payunique', 'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage 'closed', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'paynum', - 'unique' => [], + 'unique' => [ [ 'payunique' ] ], 'index' => [ [ 'custnum' ], [ 'paybatch' ], [ 'payby' ], [ '_date' ] ], }, @@ -645,6 +675,7 @@ sub tables_hashref { 'bill', @date_type, '', '', 'last_bill', @date_type, '', '', 'susp', @date_type, '', '', + 'adjourn', @date_type, '', '', 'cancel', @date_type, '', '', 'expire', @date_type, '', '', 'manual_flag', 'char', 'NULL', 1, '', '', @@ -720,6 +751,7 @@ sub tables_hashref { 'svcnum', 'serial', '', '', '', '', 'pkgnum', 'int', 'NULL', '', '', '', 'svcpart', 'int', '', '', '', '', + 'overlimit', @date_type, '', '', ], 'primary_key' => 'svcnum', 'unique' => [], @@ -1001,18 +1033,18 @@ sub tables_hashref { 'index' => [ [ 'last' ] ], }, - 'session' => { - 'columns' => [ - 'sessionnum', 'serial', '', '', '', '', - 'portnum', 'int', '', '', '', '', - 'svcnum', 'int', '', '', '', '', - 'login', @date_type, '', '', - 'logout', @date_type, '', '', - ], - 'primary_key' => 'sessionnum', - 'unique' => [], - 'index' => [ [ 'portnum' ] ], - }, +# 'session' => { +# 'columns' => [ +# 'sessionnum', 'serial', '', '', '', '', +# 'portnum', 'int', '', '', '', '', +# 'svcnum', 'int', '', '', '', '', +# 'login', @date_type, '', '', +# 'logout', @date_type, '', '', +# ], +# 'primary_key' => 'sessionnum', +# 'unique' => [], +# 'index' => [ [ 'portnum' ] ], +# }, 'queue' => { 'columns' => [