X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fdebbugs-installsql;h=1ecccb48534799372ef9b5de4241ef2c0f9d7031;hb=2d9131f94947661f5981ad0220d61e04739d7506;hp=892aef4b10107eeebab39b0e192440f7fa9dada9;hpb=8c89e96d5937722b08cf4f5f024603bc30fbeffc;p=debbugs.git

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index 892aef4..1ecccb4 100755
--- a/bin/debbugs-installsql
+++ b/bin/debbugs-installsql
@@ -45,6 +45,11 @@ environmental variable (which this option overrides).
 
 Deployment directory (defaults to /usr/share/debbugs/sqldeployment)
 
+=item B<--drop>
+
+Drop tables before trying to create them. (Useful for --install, primarily).
+Defaults to not drop tables for safety.
+
 =item B<--debug, -d>
 
 Debug verbosity. (Default 0)
@@ -68,6 +73,13 @@ 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.'/../';
+
 use Debbugs::DB;
 use Debbugs::DB::Util qw(prepare_execute);
 use aliased 'DBIx::Class::DeploymentHandler' => 'DH';
@@ -75,20 +87,21 @@ use aliased 'DBIx::Class::DeploymentHandler' => 'DH';
 my %options = (debug           => 0,
 	       help            => 0,
 	       man             => 0,
-               developer_prepare => 0,
                overwrite_deployment => 0,
+	       drop            => 0,
                service         => 'debbugs',
                deployment_dir  => '/usr/share/debbugs/sqldeployment',
               );
 
 GetOptions(\%options,
            'service|s=s',
+	   'dsn=s',
            'sysconfdir|c=s',
            'install',
            'install_version_storage|install-version-storage',
            'upgrade',
+	   'drop',
            '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');
@@ -120,8 +133,14 @@ 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 $schema = Debbugs::DB->connect($options{dsn}) or
     die "Unable to connect to database";
 
 
@@ -129,15 +148,17 @@ 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}},
+		  sql_translator_args => {producer_args => {postgres_version => 8.1},
+					  add_drop_table => $options{drop},
+					 },
                  });
 
 if ($options{current_version}) {
     print "The current database version is: ".$dh->database_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    $dh->prepare_install if $options{developer_prepare};
-    $dh->install unless $options{developer_prepare};
+    $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.
@@ -153,12 +174,12 @@ CREATE UNIQUE INDEX bug_status_cache_bug_idx ON
 SQL
 		   });
 } elsif ($options{upgrade}) {
-    $dh->prepare_deploy if $options{developer_prepare};
-    $dh->prepare_upgrade() if $options{developer_prepare};
-    $dh->upgrade unless $options{developer_prepare};
+    $dh->prepare_deploy;
+    $dh->prepare_upgrade;
+    $dh->upgrade;
 } elsif ($options{install_version_storage}) {
-    $dh->prepare_version_storage_install if $options{developer_prepare};
-    $dh->install_version_storage unless $options{developer_prepare};
+    $dh->prepare_version_storage_install;
+    $dh->install_version_storage;
 }