aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2017-05-30 17:39:54 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2017-05-30 17:40:21 +0200
commit3a814ce83039f6bbf1dc01640c2a264cd62eb0eb (patch)
treeabc83d41c1e8266791f8380d0a9c046177945031 /server
parent154437c4a5bd50b4ad0fffc790050b29f2c74c75 (diff)
downloadsonarqube-3a814ce83039f6bbf1dc01640c2a264cd62eb0eb.tar.gz
sonarqube-3a814ce83039f6bbf1dc01640c2a264cd62eb0eb.zip
SONAR-8902 fix creation of table organization_members on Oracle
Diffstat (limited to 'server')
-rw-r--r--server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java3
-rw-r--r--server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/CreateOrganizationMembersTable.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java
index c8f20309ea1..be650c124d8 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java
@@ -108,6 +108,9 @@ public class VarcharColumnDef extends AbstractColumnDef {
* Unit is ignored for the columns created before SonarQube 6.3 (except for issues.message which
* has been fixed in migration 1151 of SonarQube 5.6. See SONAR-7493).
*
+ * In most cases this method should not be called with parameter {@code true} after
+ * version 6.3.
+ *
* @param b whether unit of length is hardcoded to CHAR.
*/
public Builder setIgnoreOracleUnit(boolean b) {
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/CreateOrganizationMembersTable.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/CreateOrganizationMembersTable.java
index 087677439c7..69f6a76f7f4 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/CreateOrganizationMembersTable.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/CreateOrganizationMembersTable.java
@@ -41,7 +41,7 @@ public class CreateOrganizationMembersTable extends DdlChange {
public void execute(Context context) throws SQLException {
context.execute(
new CreateTableBuilder(getDialect(), TABLE_NAME)
- .addPkColumn(newVarcharColumnDefBuilder().setColumnName("organization_uuid").setLimit(UUID_SIZE).setIsNullable(false).setIgnoreOracleUnit(true).build())
+ .addPkColumn(newVarcharColumnDefBuilder().setColumnName("organization_uuid").setLimit(UUID_SIZE).setIsNullable(false).build())
.addPkColumn(newIntegerColumnDefBuilder().setColumnName("user_id").setIsNullable(false).build())
.build());
}