Truncate long transaction and savepoint names.

Signed-off-by: Nayan Hajratwala <nayan@chikli.com> [resolves #264][#265]
r2dbc · Mar 28, 2023 · f40d131 · f40d131
1 parent c7c91d8
commit f40d131
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 8 deletions.
diff --git a/src/main/java/io/r2dbc/mssql/MssqlConnection.java b/src/main/java/io/r2dbc/mssql/MssqlConnection.java
@@ -110,15 +110,14 @@ public Mono<Void> beginTransaction(TransactionDefinition transactionDefinition)
 
             builder.append("BEGIN TRANSACTION");
             if (name != null) {
-                String nameToUse = sanitize(name);
+                String nameToUse = sanitize(name, 32);
                 Assert.isTrue(IDENTIFIER_PATTERN.matcher(nameToUse).matches(), "Transaction names must contain only characters and numbers and must not exceed 32 characters");
                 builder.append(" ").append(nameToUse);
 
                 if (mark != null) {
-                    String markToUse = sanitize(mark);
+                    String markToUse = sanitize(mark, 128);
                     Assert.isTrue(IDENTIFIER128_PATTERN.matcher(markToUse.substring(0, Math.min(128, markToUse.length()))).matches(), "Transaction names must contain only characters and numbers and" +
-                        " must not " +
-                        "exceed 128 characters");
+                        " must not exceed 128 characters");
                     builder.append(' ').append("WITH MARK '").append(markToUse).append("'");
                 }
             }
@@ -208,7 +207,7 @@ public Mono<Void> createSavepoint(String name) {
 
         Assert.requireNonNull(name, "Savepoint name must not be null");
 
-        String nameToUse = sanitize(name);
+        String nameToUse = sanitize(name, 32);
         Assert.isTrue(IDENTIFIER_PATTERN.matcher(nameToUse).matches(), "Save point names must contain only characters and numbers and must not exceed 32 characters");
 
         return useTransactionStatus(tx -> {
@@ -279,7 +278,7 @@ public Mono<Void> rollbackTransaction() {
     public Mono<Void> rollbackTransactionToSavepoint(String name) {
 
         Assert.requireNonNull(name, "Savepoint name must not be null");
-        String nameToUse = sanitize(name);
+        String nameToUse = sanitize(name, 32);
         Assert.isTrue(IDENTIFIER_PATTERN.matcher(nameToUse).matches(), "Save point names must contain only characters and numbers and must not exceed 32 characters");
 
         return useTransactionStatus(tx -> {
@@ -413,8 +412,16 @@ private static String renderSetIsolationLevel(IsolationLevel isolationLevel) {
         return "SET TRANSACTION ISOLATION LEVEL " + isolationLevel.asSql();
     }
 
-    private static String sanitize(String identifier) {
-        return identifier.replace('-', '_').replace('.', '_');
+    static String sanitize(final String identifier, final int maxLength) {
+        String sanitized = identifier
+            .replace('-', '_')
+            .replace('.', '_')
+            .substring(Math.max(0, identifier.length() - maxLength));
+
+        if (!Character.isLetterOrDigit(sanitized.charAt(0))) {
+            sanitized = sanitized.substring(1);
+        }
+        return sanitized;
     }
 
     private Mono<Void> exchange(String sql) {

diff --git a/src/test/java/io/r2dbc/mssql/MssqlConnectionUnitTests.java b/src/test/java/io/r2dbc/mssql/MssqlConnectionUnitTests.java
@@ -26,6 +26,7 @@
 import io.r2dbc.mssql.message.token.SqlBatch;
 import io.r2dbc.spi.IsolationLevel;
 import io.r2dbc.spi.ValidationDepth;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -357,6 +358,30 @@ void remoteValidationShouldFail() {
 
     }
 
+    @Nested
+    class SanitizeTests {
+        @Test
+        void shorterThanMax() {
+            assertThat(MssqlConnection.sanitize("12345", 10)).isEqualTo("12345");
+        }
+
+        @Test
+        void exactlyMax() {
+            assertThat(MssqlConnection.sanitize("1234567", 7)).isEqualTo("1234567");
+        }
+
+        @Test
+        void greaterThanMax() {
+            assertThat(MssqlConnection.sanitize("1234567", 3)).isEqualTo("567");
+        }
+
+        @Test
+        void dropStartingPunctuation() {
+            assertThat(MssqlConnection.sanitize("1_23_4", 5)).isEqualTo("23_4");
+        }
+
+    }
+
     private static Stream<IsolationLevel> isolationLevels() {
         return Stream.of(MssqlIsolationLevel.SERIALIZABLE, MssqlIsolationLevel.READ_COMMITTED,
             MssqlIsolationLevel.READ_UNCOMMITTED, MssqlIsolationLevel.REPEATABLE_READ,