X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fdebbugs-installsql;h=d2aa7a9960164fc38ef234f0165e3fcfc6f11913;hb=refs%2Fheads%2Fdon%2Fdatabase_upgrade;hp=317b2723ce152f607963546259dae92d182361ed;hpb=47c4dc034a82c3fb0ddfe620503fa2d8bf898b23;p=debbugs.git

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index 317b272..d2aa7a9 100755
--- 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,8 @@ 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/). This directory
+contains an upgrade subdirectory and scripts which perform the upgrade
 
 =item B<--debug, -d>
 
@@ -68,27 +69,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=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|force_overwrite|force-overwrite',
            'deployment_dir|deployment-dir=s',
 	   'debug|d+','help|h|?','man|m');
 
@@ -119,31 +126,50 @@ 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
-    die "Unable to connect to database";
 
+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->db_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    $dh->prepare_install if $options{developer_prepare};
-    $dh->install unless $options{developer_prepare};
+    $s->sql_file_in_txn($options{deployment_dir}.'/debbugs_schema.sql');
 } elsif ($options{upgrade}) {
-    $dh->prepare_deploy if $options{developer_prepare};
-    $dh->prepare_upgrade() if $options{developer_prepare};
-    $dh->upgrade unless $options{developer_prepare};
+    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}) {
-    $dh->prepare_version_storage_install if $options{developer_prepare};
-    $dh->install_version_storage unless $options{developer_prepare};
+    if ($s->db_version > 1) {
+	print STDERR "Version storage is already installed, current version is > 1\n";
+	exit 1;
+    }
+    # TODO Check if db_version already exists, and error out
+    $s->sql_file_in_txn($options{deployment_dir}.'/version_storage.sql');
 }