debbugs-installsql no longer uses DeployHandler (too complicated)

[debbugs.git] / bin / debbugs-installsql

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index 8d8437ace3c219da8200a410b6618dd7fdd59991..1156f178362e6cc40a58c16889ade459d68a302d 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,16 +68,22 @@ 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 Debbugs::DB::Util qw(prepare_execute);
-use aliased 'DBIx::Class::DeploymentHandler' => 'DH';
 
 my %options = (debug           => 0,
               help            => 0,
               man             => 0,
                overwrite_deployment => 0,
+              drop            => 0,
                service         => 'debbugs',
-               deployment_dir  => '/usr/share/debbugs/sqldeployment',
+               deployment_dir  => '/usr/share/debbugs/sql',
               );
 
 GetOptions(\%options,
@@ -88,7 +94,6 @@ GetOptions(\%options,
            'install_version_storage|install-version-storage',
            'upgrade',
            'current_version|current-version',
-           'overwrite_deployment|overwrite-deployment|force_overwrite|force-overwrite',
            'deployment_dir|deployment-dir=s',
           'debug|d+','help|h|?','man|m');
 
@@ -126,44 +131,29 @@ if (not exists $options{dsn} or
 }
 
 
-my $schema = Debbugs::DB->connect($options{dsn}) 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',
-                 sql_translator_args => {producer_args=> {postgres_version => 9}},
-                 });
-
 if ($options{current_version}) {
-    print "The current database version is: ".$dh->database_version."\n";
+    print "The current database version is: ".$s->database_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    $dh->prepare_install;
-    $dh->install;
-    ## this is lame, but because the current release of DeploymentHandler does
-    ## not support WHERE or quoted indexes properly (fixed in git), we create
-    ## these indexes manually here.
-    $schema->storage->
-       dbh_do(sub{my ($s,$dbh) = @_;
-                  prepare_execute($dbh,<<SQL);
-CREATE UNIQUE INDEX bug_status_cache_bug_col_suite_col_arch_idx ON
- bug_status_cache(bug,COALESCE(suite,0),COALESCE(arch,0));
-CREATE UNIQUE INDEX bug_status_cache_bug_suite_idx ON
- bug_status_cache(bug,suite) WHERE arch is NULL;
-CREATE UNIQUE INDEX bug_status_cache_bug_idx ON
- bug_status_cache(bug) WHERE arch is NULL AND suite IS NULL;
-SQL
-                  });
+    $s->sql_file_in_txn($options{deployment_dir}.'/debbugs_schema.sql');
 } elsif ($options{upgrade}) {
-    $dh->prepare_deploy;
-    $dh->prepare_upgrade;
-    $dh->upgrade;
+    my @upgrades = $s->upgrades_to_run($options{deployment_dir});
+    for my $u_f (@upgrades) {
+       eval {
+           $s->sql_file_in_txn($u_f->file);
+       };
+       if ($@) {
+           print STDERR "Upgrade from $s->database_version to $u_f->version failed: $@";
+           exit 1;
+       }
+    }
 } elsif ($options{install_version_storage}) {
-    $dh->prepare_version_storage_install;
-    $dh->install_version_storage;
+    # TODO Check if db_version already exists, and error out
+    $s->sql_file_in_txn($options{deployment_dir}.'/version_storage.sql');
 }