2 files changed, 9 insertions, 89 deletions

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 419384c..25d883f 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -3,14 +3,11 @@
 use strict;
 use vars qw($DEBUG $DRY_RUN);
 use Term::ReadKey;
-use DBIx::DBSchema 0.27;
+use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
-
 $DEBUG = 1;
-$DRY_RUN = 0;
-
 
 die "Not running uid freeside!" unless checkeuid();
 
@@ -25,63 +22,9 @@ dbdef_create($dbh, $dbdef_file);
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
 reload_dbdef($dbdef_file);
 
-
-foreach my $table ( dbdef_dist->tables ) {
-
-  if ( dbdef->table($table) ) {
-
-    warn "$table exists\n" if $DEBUG > 1;
-
-    foreach my $column ( dbdef_dist->table($table)->columns ) {
-      if ( dbdef->table($table)->column($column) )  {
-        warn "  $table.$column exists\n" if $DEBUG > 2;
-      } else {
-
-        if ( $DEBUG ) {
-          print STDERR "column $table.$column does not exist.  create?";
-          next unless yesno();
-        }
-
-        foreach my $statement (
-          dbdef_dist->table($table)->column($column)->sql_add_column( $dbh )
-        ) {
-          warn "$statement\n" if $DEBUG || $DRY_RUN;
-          unless ( $DRY_RUN ) {
-            $dbh->do( $statement)
-              or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-          }
-        }
-
-      }
-
-    }
-
-    #should eventually check & create missing indices
-
-    #should eventually drop columns not in dbdef_dist...
-
-  } else {
-
-    if ( $DEBUG ) {
-      print STDERR "table $table does not exist.  create?";
-      next unless yesno();
-    }
-
-    foreach my $statement (
-      dbdef_dist->table($table)->sql_create_table( $dbh )
-    ) {
-      warn "$statement\n" if $DEBUG || $DRY_RUN;
-      unless ( $DRY_RUN ) {
-        $dbh->do( $statement)
-          or die "CREATE error: ". $dbh->errstr. "\nexecuting: $statement";
-      }
-    }
-
-  }
-
-}
-
-# should eventually drop tables not in dbdef_dist too i guess...
+$DBIx::DBSchema::DEBUG = $DEBUG;
+$DBIx::DBSchema::Table::DEBUG = $DEBUG;
+dbdef->update_schema( dbdef_dist, $dbh );
 
 $dbh->commit or die $dbh->errstr;
 
@@ -91,32 +34,6 @@ $dbh->disconnect or die $dbh->errstr;
 
 ###
 
-my $all = 0;
-sub yesno {
-  print STDERR ' [yes/no/all] ';
-  if ( $all ) {
-    warn "yes\n";
-    return 1;
-  } else {
-    while ( 1 ) {
-      ReadMode 4;
-      my $x = lc(ReadKey);
-      ReadMode 0;
-      if ( $x eq 'n' ) {
-        warn "no\n"; 
-        return 0;
-      } elsif ( $x eq 'y' ) {
-        warn "yes\n"; 
-        return 1;
-      } elsif ( $x eq 'a' ) {
-        warn "yes\n"; 
-        $all = 1;
-        return 1;
-      }
-    }
-  }
-}
-
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
   my( $dbh, $file ) = @_;
   my $dbdef = new_native DBIx::DBSchema $dbh;
@@ -128,4 +45,3 @@ sub usage {
 }
 
 1;
-
diff --git a/README.1.7.0 b/README.1.7.0
index 834972a..62d6232 100644
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -1,5 +1,5 @@
 
-install DBIx::DBSchema 0.29 (or later)
+install DBIx::DBSchema 0.31 (or later)
 
 make install-perl-modules
 run "freeside-upgrade username" to uprade your database schema
@@ -12,6 +12,10 @@ to the new cust_tax_exempt_pkg table.  An example script to get you started is
 in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your
 specific data.
 
+Optional for better zip code report performance:
+CREATE INDEX cust_main16 on cust_main ( zip );
+CREATE INDEX cust_main17 on cust_main ( ship_zip );
+
 ------
 
 make install-docs