summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorekempin <ekempin@google.com>2016-10-28 16:03:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-10-28 16:03:00 +0000
commit02386311b6cd1551cc6cf27c0697d3c70cb70cac (patch)
treebbea6b5e5868842821ead56e5c40346d1a4d5b38
parenta3f6ef7152795c0cd44fbb8518e423884d4bb367 (diff)
parent4d07688b1e30ec1fad1def21fd5eac788ea19438 (diff)
Merge "Fix Schema_127 for mysql on case-sensitive FS" into stable-2.13
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java
index b9e4bfa19f..783cce6603 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java
@@ -45,18 +45,18 @@ public class Schema_127 extends SchemaVersion {
H2AccountPatchReviewStore.createTableIfNotExists(url);
try (Connection con = DriverManager.getConnection(url);
PreparedStatement stmt =
- con.prepareStatement("INSERT INTO ACCOUNT_PATCH_REVIEWS "
- + "(ACCOUNT_ID, CHANGE_ID, PATCH_SET_ID, FILE_NAME) VALUES "
+ con.prepareStatement("INSERT INTO account_patch_reviews "
+ + "(account_id, change_id, patch_set_id, file_name) VALUES "
+ "(?, ?, ?, ?)")) {
int batchCount = 0;
try (Statement s = newStatement(db);
- ResultSet rs = s.executeQuery("SELECT * from ACCOUNT_PATCH_REVIEWS")) {
+ ResultSet rs = s.executeQuery("SELECT * from account_patch_reviews")) {
while (rs.next()) {
- stmt.setInt(1, rs.getInt("ACCOUNT_ID"));
- stmt.setInt(2, rs.getInt("CHANGE_ID"));
- stmt.setInt(3, rs.getInt("PATCH_SET_ID"));
- stmt.setString(4, rs.getString("FILE_NAME"));
+ stmt.setInt(1, rs.getInt("account_id"));
+ stmt.setInt(2, rs.getInt("change_id"));
+ stmt.setInt(3, rs.getInt("patch_set_id"));
+ stmt.setString(4, rs.getString("file_name"));
stmt.addBatch();
batchCount++;
if (batchCount >= MAX_BATCH_SIZE) {