X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=3a4e4f8e37a5378ceae623f2f5aa87f1133e7b22;hp=285ff7a0e16b3efc864db6958d7930210b7fd511;hb=7422aa77086326ba1e6032150ce5704d1003ea6f;hpb=feef0e4c2b4bd6b776b25f5a1bd6fdbf63fd08b2

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 285ff7a0e..3a4e4f8e3 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -1,86 +1,45 @@
 #!/usr/bin/perl -w
 
 use strict;
+use vars qw($opt_d $opt_q $opt_v);
 use vars qw($DEBUG $DRY_RUN);
-use Term::ReadKey;
-use DBIx::DBSchema 0.27;
+use Getopt::Std;
+use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
+use FS::CurrentUser;
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
+die "Not running uid freeside!" unless checkeuid();
 
-$DEBUG = 1;
-$DRY_RUN = 0;
+getopts("dq");
 
+$DEBUG = !$opt_q;
+#$DEBUG = $opt_v;
 
-die "Not running uid freeside!" unless checkeuid();
+$DRY_RUN = $opt_d;
 
 my $user = shift or die &usage;
+$FS::CurrentUser::upgrade_hack = 1;
 my $dbh = adminsuidsetup($user);
 
 #needs to match FS::Schema...
-my $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc;
+my $dbdef_file = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
 
 dbdef_create($dbh, $dbdef_file);
-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";
-      }
-    }
+delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
+reload_dbdef($dbdef_file);
 
-  }
+$DBIx::DBSchema::DEBUG = $DEBUG;
+$DBIx::DBSchema::Table::DEBUG = $DEBUG;
 
+if ( $DRY_RUN ) {
+  print join(";\n", dbdef->sql_update_schema( dbdef_dist, $dbh ) ). ";\n";
+  exit;
+} else {
+  dbdef->update_schema( dbdef_dist, $dbh );
 }
 
-# should eventually drop tables not in dbdef_dist too i guess...
-
 $dbh->commit or die $dbh->errstr;
 
 dbdef_create($dbh, $dbdef_file);
@@ -89,32 +48,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;
@@ -122,8 +55,31 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -q | -v ] user\n"; 
 }
 
-1;
+=head1 NAME
+
+freeside-upgrade - Upgrades database schema for new freeside verisons.
+
+=head1 SYNOPSIS
+
+  freeside-adduser [ -d ] [ -q | -v ]
+
+=head1 DESCRIPTION
+
+Reads your existing database schema and updates it to match the current schema,
+adding any columns or tables necessary.
+
+  [ -d ]: Dry run; output SQL statements (to STDOUT) only, but do not execute
+          them.
+
+  [ -q ]: Run quietly.  This may become the default at some point.
+
+  [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
+          current default.
+
+=head1 SEE ALSO
+
+=cut