From 484bf3cae18b749c2d17cf70bbfb357ffcf1ae0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Pedersen?= <iceelch@googlemail.com>
Date: Mon, 11 Jul 2016 17:29:21 +0200
Subject: [PATCH] Unwrap db in ssh.commands.QueryShell

If NoteDb reads are enabled then the gsql ssh commands fails with

fatal: internal server error

due to DisabledChangesReviewDbWrapper (see Issue 4247).

As not all tables are migrated yet, it makes sense to still allow
low-level access to the db.

Bug: Issue 4247
Change-Id: Icebe51f470010d913f387bb98f7319616dd89aba
---
 .../main/java/com/google/gerrit/sshd/commands/QueryShell.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
index 4c930c8071..25e49b200a 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java
@@ -19,6 +19,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.gerrit.common.TimeUtil;
 import com.google.gerrit.common.Version;
 import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.reviewdb.server.ReviewDbUtil;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gwtorm.jdbc.JdbcSchema;
@@ -78,7 +79,7 @@ public class QueryShell {
 
   public void run() {
     try {
-      db = dbFactory.open();
+      db = ReviewDbUtil.unwrapDb(dbFactory.open());
       try {
         connection = ((JdbcSchema) db).getConnection();
         connection.setAutoCommit(true);