From 1492f504316eb506e72f7a84ecd23207bb07e226 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 21 Jan 2019 17:54:53 +0100
Subject: pullimap, interimap: don't autocreate statefile or database in
 long-lived mode.

---
 interimap | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'interimap')

diff --git a/interimap b/interimap
index 0fb6c1c..7ac6b05 100755
--- a/interimap
+++ b/interimap
@@ -27,6 +27,7 @@ my $NAME = 'interimap';
 use Getopt::Long qw/:config posix_default no_ignore_case gnu_compat
                             bundling auto_version/;
 use DBI ();
+use DBD::SQLite::Constants ':file_open';
 use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/;
 use List::Util 'first';
 
@@ -121,18 +122,24 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
 #############################################################################
 # Open the database and create tables
 
-$DBH = DBI::->connect("dbi:SQLite:dbname=$DBFILE", undef, undef, {
-    AutoCommit => 0,
-    RaiseError => 1,
-    sqlite_see_if_its_a_number => 1, # see if the bind values are numbers or not
-    sqlite_use_immediate_transaction => 1,
-});
-$DBH->sqlite_busy_timeout(250);
-$DBH->do('PRAGMA locking_mode = EXCLUSIVE');
-$DBH->do('PRAGMA foreign_keys = ON');
-
 
 {
+    my $dbi_data_source = "dbi:SQLite:dbname=".$DBFILE;
+    my %dbi_attrs = (
+        AutoCommit => 0,
+        RaiseError => 1,
+        sqlite_see_if_its_a_number => 1, # see if the bind values are numbers or not
+        sqlite_use_immediate_transaction => 1,
+        sqlite_open_flags => SQLITE_OPEN_READWRITE
+    );
+    # don't auto-create in long-lived mode
+    $dbi_attrs{sqlite_open_flags} |= SQLITE_OPEN_CREATE unless defined $CONFIG{watch};
+
+    $DBH = DBI::->connect($dbi_data_source, undef, undef, \%dbi_attrs);
+    $DBH->sqlite_busy_timeout(250);
+    $DBH->do('PRAGMA locking_mode = EXCLUSIVE');
+    $DBH->do('PRAGMA foreign_keys = ON');
+
     my @schema = (
         mailboxes => [
             q{idx        INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT},
-- 
cgit v1.2.3