From: Eric Wong <e@80x24.org>
Date: Wed, 20 Jan 2021 05:04:45 +0000 (+0900)
Subject: overidx: eidx_prep: fix leftover dbh reference
X-Git-Tag: v1.7.0~1339
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=31e39c446d8b9534f0b91ffd8e517955aed65d82;p=public-inbox.git

overidx: eidx_prep: fix leftover dbh reference

Leaving $dbh in another field was causing over.sqlite3 to
remain open after ->dbh_close.  Fix up some minor style
issues while we're at it.
---

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 0a4eb39e..e606dcf5 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -537,7 +537,7 @@ sub eidx_prep ($) {
 	my ($self) = @_;
 	$self->{-eidx_prep} //= do {
 		my $dbh = $self->dbh;
-		$dbh->do(<<"");
+		$dbh->do(<<'');
 INSERT OR IGNORE INTO counter (key) VALUES ('eidx_docid')
 
 		$dbh->do(<<'');
@@ -574,11 +574,9 @@ CREATE TABLE IF NOT EXISTS eidx_meta (
 		# Currently used for "-extindex --reindex" for Xapian
 		# data, but may be used in more places down the line.
 		$dbh->do(<<'');
-CREATE TABLE IF NOT EXISTS eidxq (
-	docid INTEGER PRIMARY KEY NOT NULL
-)
+CREATE TABLE IF NOT EXISTS eidxq (docid INTEGER PRIMARY KEY NOT NULL)
 
-		$dbh;
+		1;
 	};
 }