Add simplistic database upgrade mechanism

[debbugs.git] / bin / debbugs-installsql

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index 4e19dbe507b21e94db4824848ad1eccae9f5ff1f..ed407eba65b34e2bf66541ba72f8ef5b8751041e 100755 (executable)
--- a/bin/debbugs-installsql
+++ b/bin/debbugs-installsql
@@ -14,7 +14,7 @@ use Pod::Usage;
 
 =head1 NAME
 
-debbugs-installsql - installs the SQL database using DBIx::Class::DeploymentHandler
+debbugs-installsql - installs and upgrades Debbugs Databases
 
 =head1 SYNOPSIS
 
@@ -43,7 +43,7 @@ environmental variable (which this option overrides).
 
 =item B<--deployment-dir>
 
-Deployment directory (defaults to /usr/share/debbugs/sqldeployment)
+Deployment directory (defaults to /usr/share/debbugs/sql/upgrade)
 
 =item B<--debug, -d>
 
@@ -68,26 +68,33 @@ debbugs-installsql
 
 use vars qw($DEBUG);
 
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, or someone has given a
+# non-absolute INC, don't do that.
+use FindBin;
+use if (-d $FindBin::Bin.'/../.git/' && $INC[0] =~ m#^/#),
+    lib => $FindBin::Bin.'/../lib/';
+
 use Debbugs::DB;
-use aliased 'DBIx::Class::DeploymentHandler' => 'DH';
+use JSON;
 
 my %options = (debug           => 0,
               help            => 0,
               man             => 0,
-               developer_prepare => 0,
                overwrite_deployment => 0,
+              drop            => 0,
                service         => 'debbugs',
-               deployment_dir  => '/usr/share/debbugs/sqldeployment',
+               deployment_dir  => '/usr/share/debbugs/sql',
               );
 
 GetOptions(\%options,
-           'service|s',
-           'sysconfdir|c',
+           'service|s=s',
+          'dsn=s',
+           'sysconfdir|c=s',
            'install',
+           'install_version_storage|install-version-storage',
            'upgrade',
            'current_version|current-version',
-           'developer_prepare|developer-prepare',
-           'overwrite_deployment|overwrite-deployment',
            'deployment_dir|deployment-dir=s',
           'debug|d+','help|h|?','man|m');
 
@@ -98,7 +105,7 @@ $DEBUG = $options{debug};
 
 my @USAGE_ERRORS;
 
-my @exclusive_options = qw(install upgrade current_version);
+my @exclusive_options = qw(install upgrade current_version install_version_storage);
 if (1 < grep {exists $options{$_}} @exclusive_options) {
       push @USAGE_ERRORS,"You must only give one of the ".
           join(', ',map {s/_/-/g; "--".$_} @exclusive_options).
@@ -118,33 +125,46 @@ if (exists $options{sysconfdir}) {
     }
 }
 
+if (not exists $options{dsn} or
+    not defined $options{dsn} or
+    not length $options{dsn}) {
+    $options{dsn} = 'dbi:Pg:service='.$options{service};
+}
+
 
-my $schema = Debbugs::DB->connect('dbi:Pg:service='.$options{service}) or
+my $s = Debbugs::DB->connect($options{dsn}) or
     die "Unable to connect to database";
 
 
-my $dh = DH->new({schema => $schema,
-                  force_overwrite => $options{overwrite_deployment},
-                  script_directory => $options{deployment_dir},
-                  databases => 'PostgreSQL'
-                 });
-
 if ($options{current_version}) {
-    print "The current database version is: ".$dh->database_version."\n";
+    print "The current database version is: ".$s->db_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    if ($options{developer_prepare}) {
-        $dh->prepare_install;
-    } else {
-        $dh->install;
-    }
+    $s->sql_file_in_txn($options{deployment_dir}.'/debbugs_schema.sql');
 } elsif ($options{upgrade}) {
-    if ($options{developer_prepare}) {
-        $dh->prepare_deploy;
-        $dh->prepare_upgrade;
-    } else {
-        $dh->upgrade;
+    my @upgrades = $s->upgrades_to_run($options{deployment_dir}.'/upgrade');
+    for my $u_f (@upgrades) {
+       eval {
+           package fake;
+           require $u_f->{file};
+           $s->txn_do(sub {fake::upgrade($s);
+                           $s->resultset('DbVersion')->
+                               create({version => $u_f->{to},
+                                       metadata => JSON::encode_json({from => $u_f->{from}+0,
+                                                                      to => $u_f->{to}+0,
+                                                                      file => $u_f->{file},
+                                                                     }),
+                                      });
+                       });
+       };
+       if ($@) {
+           print STDERR "Upgrade from $s->database_version to $u_f->{to} failed: $@";
+           exit 1;
+       }
     }
+} elsif ($options{install_version_storage}) {
+    # TODO Check if db_version already exists, and error out
+    $s->sql_file_in_txn($options{deployment_dir}.'/version_storage.sql');
 }