Fixed integration test

Author: svats0001

r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/Capability.java

@@ -181,22 +181,11 @@ public final class Capability {
         TRANSACTIONS | SECURE_SALT | MULTI_STATEMENTS | MULTI_RESULTS | PS_MULTI_RESULTS |
         PLUGIN_AUTH | CONNECT_ATTRS | VAR_INT_SIZED_AUTH | SESSION_TRACK | DEPRECATE_EOF | ZSTD_COMPRESS;
 
-    private static final long ALL_SUPPORTED_MARIADB = FOUND_ROWS | LONG_FLAG | CONNECT_WITH_DB |
-        NO_SCHEMA | COMPRESS | LOCAL_FILES | IGNORE_SPACE | PROTOCOL_41 | INTERACTIVE | SSL |
-        TRANSACTIONS | SECURE_SALT | MULTI_STATEMENTS | MULTI_RESULTS | PS_MULTI_RESULTS | PLUGIN_AUTH |
-        CONNECT_ATTRS | VAR_INT_SIZED_AUTH | SESSION_TRACK | DEPRECATE_EOF | ZSTD_COMPRESS |
-        MARIADB_CLIENT_EXTENDED_TYPE_INFO;
-
     /**
      * The default capabilities for a MySQL connection. It contains all client supported capabilities.
      */
     public static final Capability DEFAULT = new Capability(ALL_SUPPORTED);
 
-    /**
-     * The default capabilities for a MariaDB connection. It contains all client supported capabilities.
-     */
-    public static final Capability DEFAULT_MARIADB = new Capability(ALL_SUPPORTED_MARIADB);
-
     private final long bitmap;
 
     /**

r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/message/server/DefinitionMetadataMessage.java

@@ -183,13 +183,8 @@ private static DefinitionMetadataMessage decode41(ByteBuf buf, ConnectionContext
 
         String extendTypeInfo = null;
         if (context.getCapability().isMariaDb() &&  context.getCapability().isExtendedTypeInfo()) {
-            buf.markReaderIndex();
-            short extendedTypeInfoDataType = buf.readUnsignedByte();
-            if (extendedTypeInfoDataType == 0 || extendedTypeInfoDataType == 1) {
-                extendTypeInfo = readVarIntSizedString(buf, charset);
-            } else {
-                buf.resetReaderIndex();
-            }
+            buf.readUnsignedByte();
+            extendTypeInfo = readVarIntSizedString(buf, charset);
         }
 
         // Skip constant 0x0c encoded by var integer

r2dbc-mysql/src/test/java/io/asyncer/r2dbc/mysql/MariaDbIntegrationTestSupport.java

@@ -152,7 +152,7 @@ void returningGetRowUpdated() {
     @Test
     @EnabledIf("envIsMariaDb10_5_1")
     void returningExtendedTypeInfoJson() {
-        complete(conn -> changeCapability(conn).createStatement("CREATE TEMPORARY TABLE test(" +
+        complete(conn -> conn.createStatement("CREATE TEMPORARY TABLE test(" +
             "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, value JSON NOT NULL)")
             .execute()
             .flatMap(IntegrationTestSupport::extractRowsUpdated)
@@ -162,7 +162,7 @@ void returningExtendedTypeInfoJson() {
                 .execute())
             .flatMap(result -> result.map(DataEntity::readExtendedTypeInfoResult))
             .collectList()
-            .doOnNext(list -> assertThat(list.get(0)).isEqualTo(true))
+            .doOnNext(list -> assertIfExtendedTypeInfoEnabled(conn, list))
             );
     }
 
@@ -196,10 +196,13 @@ private static Mono<Void> assertWithoutCreatedAt(MySqlConnection conn, Mono<List
             .then();
     }
 
-    private static MySqlConnection changeCapability(MySqlConnection conn) {
-        ConnectionContext ctxt = ((MySqlSimpleConnection) conn).context();
-        ctxt.initHandshake(ctxt.getConnectionId(), ctxt.getServerVersion(), Capability.DEFAULT_MARIADB);
-        return conn;
+    private static void assertIfExtendedTypeInfoEnabled(MySqlConnection conn, List<Boolean> list) {
+        boolean enabled = ((MySqlSimpleConnection)conn).context().getCapability().isExtendedTypeInfo();
+        if (enabled) {
+            assertThat(list.get(0)).isEqualTo(true);
+        } else {
+            assertThat(list.get(0)).isEqualTo(false);
+        }
     }
 
     private static final class DataEntity {