paginate updatesqlcache properly and fix missing table alias

[debbugs.git] / bin / debbugs-installsql

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index 71beb8d2741a20cd8c06ef16fbccc16483274d66..3b29618b244993cb95a7c7922ba18dc1513ade26 100755 (executable)
--- a/bin/debbugs-installsql
+++ b/bin/debbugs-installsql
@@ -84,9 +84,10 @@ GetOptions(\%options,
            'service|s=s',
            'sysconfdir|c=s',
            'install',
+           'install_version_storage|install-version-storage',
            'upgrade',
            'current_version|current-version',
-           'developer_prepare|developer-prepare',
+#           'developer_prepare|developer-prepare',
            'overwrite_deployment|overwrite-deployment',
            'deployment_dir|deployment-dir=s',
           'debug|d+','help|h|?','man|m');
@@ -98,7 +99,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).
@@ -133,15 +134,14 @@ if ($options{current_version}) {
     print "The current database version is: ".$dh->database_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    if ($options{developer_prepare}) {
-        $dh->prepare_install;
-        $dh->prepare_deploy;
-    } else {
-        $dh->install;
-    }
+    $dh->prepare_install;
+    $dh->install;
 } elsif ($options{upgrade}) {
-    $dh->prepare_upgrade;
+    $dh->prepare_deploy;
     $dh->upgrade;
+} elsif ($options{install_version_storage}) {
+    $dh->prepare_version_storage_install;
+    $dh->install_version_storage;
 }