opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8' into stable-2.9

Browse Source 
* stable-2.8:
  Keep old timestamps during data migration
This commit is contained in:
Shawn Pearce
2014-05-02 17:23:59 -07:00
parent 651a08a1d4 5feaa2757a
commit 1a09de2e82
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java
View File

@@ -138,7 +138,8 @@ public class Schema_77 extends SchemaVersion {
private void migratePatchSetApprovals(ReviewDb db, private void migratePatchSetApprovals(ReviewDb db,
LegacyLabelTypes labelTypes) throws SQLException { LegacyLabelTypes labelTypes) throws SQLException {
PreparedStatement stmt = ((JdbcSchema) db).getConnection().prepareStatement( PreparedStatement stmt = ((JdbcSchema) db).getConnection().prepareStatement(
"UPDATE patch_set_approvals SET category_id = ? WHERE category_id = ?"); "UPDATE patch_set_approvals SET category_id = ?, granted=granted"
+ " WHERE category_id = ?");
try { try {
for (LegacyLabelType type : labelTypes.getLegacyLabelTypes()) { for (LegacyLabelType type : labelTypes.getLegacyLabelTypes()) {
stmt.setString(1, type.getName()); stmt.setString(1, type.getName());