From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 5 Dec 2017 09:08:42 +0000 (+0100)
Subject: SONAR-10116 Fix insert of LOB in batch statements of migrations
X-Git-Tag: 7.0-RC1~199
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee34917caa43092fa45b51481035febb926f6738;p=sonarqube.git

SONAR-10116 Fix insert of LOB in batch statements of migrations
---

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
index ebb62540d0b..9b6cffcde15 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/step/BaseSqlStatement.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.platform.db.migration.step;
 
-import java.io.ByteArrayInputStream;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -82,7 +81,7 @@ class BaseSqlStatement<CHILD extends SqlStatement> implements SqlStatement<CHILD
     if (value == null) {
       pstmt.setNull(columnIndex, Types.BINARY);
     } else {
-      pstmt.setBinaryStream(columnIndex, new ByteArrayInputStream(value));
+      pstmt.setBytes(columnIndex, value);
     }
     return (CHILD) this;
   }
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/PopulateLiveMeasures.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/PopulateLiveMeasures.java
index 1d226fca4f1..a7945be15d1 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/PopulateLiveMeasures.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v70/PopulateLiveMeasures.java
@@ -60,7 +60,7 @@ public class PopulateLiveMeasures extends DataChange {
       update.setString(3, row.getString(2));
       update.setInt(4, row.getInt(3));
       update.setDouble(5, row.getNullableDouble(4));
-      update.setString(6, row.getString(5));
+      update.setString(6, row.getNullableString(5));
       update.setDouble(7, row.getNullableDouble(6));
       update.setBytes(8, row.getNullableBytes(7));
       update.setLong(9, now);