mssql.bytesPerChar

Author: quipsy-karg

liquibase-cli/src/test/groovy/liquibase/integration/commandline/LiquibaseCommandLineTest.groovy

@@ -353,6 +353,13 @@ Global Options
                                environment variable:
                                'LIQUIBASE_MONITOR_PERFORMANCE')
 
+      --mssql-bytes-per-char=PARAM
+                             Number of bytes needed to store one character
+                               (depends on database's character encoding)
+                             DEFAULT: 1
+                             (defaults file: 'mssql.bytesPerChar', environment
+                               variable: 'MSSQL_BYTES_PER_CHAR')
+
       --on-missing-include-changelog=PARAM
                              If set to WARN, then liquibase will not throw
                                exception on missing changelog file, instead

liquibase-standard/src/main/java/liquibase/database/core/MSSQLDatabase.java

@@ -6,6 +6,8 @@
 import liquibase.change.AbstractSQLChange;
 import liquibase.change.Change;
 import liquibase.changelog.DatabaseChangeLog;
+import liquibase.configuration.AutoloadedConfigurations;
+import liquibase.configuration.ConfigurationDefinition;
 import liquibase.database.AbstractJdbcDatabase;
 import liquibase.database.DatabaseConnection;
 import liquibase.database.OfflineConnection;
@@ -50,6 +52,8 @@ private MSSQL_SERVER_VERSIONS() {
         }
     }
 
+    public static final Pattern CHAR_PATTERN = Pattern.compile("^(\\d+)\\s*(?i)CHAR$");
+
     private final HashMap<String, Integer> defaultDataTypeParameters = new HashMap<>();
 
     protected static final int MSSQL_DEFAULT_TCP_PORT = 1433;
@@ -709,4 +713,22 @@ private static List<String> createReservedWordsCollection() {
     public boolean supportsDatabaseChangeLogHistory() {
         return true;
     }
+
+    /**
+     * Calculates the number of bytes needed to hold the given number of characters.
+     *
+     * @param charCount The number of characters to hold.
+     * @return The number of bytes needed to hold the given number of characters.
+     */
+    public int byteSize(final int charCount) {
+        return charCount * SpecificConfiguration.BYTES_PER_CHAR.getCurrentValue();
+    }
+
+    public static class SpecificConfiguration implements AutoloadedConfigurations {
+        public static final ConfigurationDefinition<Integer> BYTES_PER_CHAR = new ConfigurationDefinition.Builder("mssql")
+                .define("bytesPerChar", Integer.class)
+                .setDefaultValue(1)
+                .setDescription("Number of bytes needed to store one character (depends on database's character encoding)")
+                .build();
+    }
 }

liquibase-standard/src/main/java/liquibase/datatype/core/CharType.java

@@ -18,16 +18,24 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.regex.Matcher;
 
 @DataTypeInfo(name="char", aliases = {"java.sql.Types.CHAR", "bpchar", "character"}, minParameters = 0, maxParameters = 1, priority = LiquibaseDataType.PRIORITY_DEFAULT)
 public class CharType extends LiquibaseDataType {
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
         if (database instanceof MSSQLDatabase) {
+            final MSSQLDatabase mssqlDatabase = (MSSQLDatabase) database;
             Object[] parameters = getParameters();
             if (parameters.length > 0) {
-                // MSSQL only supports (n) syntax but not (n CHAR) syntax, so we need to remove CHAR.
-                final String param1 = parameters[0].toString().replaceFirst("(?<=\\d+)\\s*(?i)CHAR$", "");
+                // MSSQL only supports (n) syntax but not (n CHAR) syntax, so we need to remove CHAR and apply bytes-per-char factor
+                String param1 = parameters[0].toString();
+                final Matcher matcher = MSSQLDatabase.CHAR_PATTERN.matcher(param1);
+                if (matcher.find()) {
+                    final int characterCount = Integer.parseInt(matcher.group(1));
+                    final int byteCount = mssqlDatabase.byteSize(characterCount);
+                    param1 = String.valueOf(byteCount);
+                }
                 parameters[0] =  param1;
                 if (!param1.matches("\\d+") || (new BigInteger(param1).compareTo(BigInteger.valueOf(8000)) > 0)) {
 

liquibase-standard/src/main/java/liquibase/datatype/core/VarcharType.java

@@ -9,6 +9,7 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.regex.Matcher;
 
 @DataTypeInfo(name="varchar", aliases = {"java.sql.Types.VARCHAR", "java.lang.String", "varchar2", "character varying"}, minParameters = 0, maxParameters = 1, priority = LiquibaseDataType.PRIORITY_DEFAULT)
 public class VarcharType extends CharType {
@@ -25,10 +26,17 @@ public DatabaseDataType toDatabaseDataType(Database database) {
         }
 
         if (database instanceof MSSQLDatabase) {
+            final MSSQLDatabase mssqlDatabase = (MSSQLDatabase) database;
             Object[] parameters = getParameters();
             if (parameters.length > 0) {
-                // MSSQL only supports (n) syntax but not (n CHAR) syntax, so we need to remove CHAR.
-                final String param1 = parameters[0].toString().replaceFirst("(?<=\\d+)\\s*(?i)CHAR$", "");
+                // MSSQL only supports (n) syntax but not (n CHAR) syntax, so we need to remove CHAR and apply bytes-per-char factor
+                String param1 = parameters[0].toString();
+                final Matcher matcher = MSSQLDatabase.CHAR_PATTERN.matcher(param1);
+                if (matcher.find()) {
+                    final int characterCount = Integer.parseInt(matcher.group(1));
+                    final int byteCount = mssqlDatabase.byteSize(characterCount);
+                    param1 = String.valueOf(byteCount);
+                }
                 parameters[0] =  param1;
                 if (!param1.matches("\\d+") || (new BigInteger(param1).compareTo(BigInteger.valueOf(8000L)) > 0)) {
 

liquibase-standard/src/main/resources/META-INF/services/liquibase.configuration.AutoloadedConfigurations

@@ -4,4 +4,5 @@ liquibase.logging.core.DefaultLoggerConfiguration
 liquibase.sql.SqlConfiguration
 liquibase.parser.ChangeLogParserConfiguration
 liquibase.analytics.configuration.AnalyticsArgs
-liquibase.license.LicenseTrackingArgs
+liquibase.license.LicenseTrackingArgs
+liquibase.database.core.MSSQLDatabase$SpecificConfiguration