wip - fix failures

Author: martint

client/trino-jdbc/src/main/java/io/trino/jdbc/AbstractTrinoResultSet.java

@@ -704,7 +704,7 @@ private static Object convertFromClientRepresentation(ClientTypeSignature column
                 for (int i = 0; i < fields.size(); i++) {
                     io.trino.client.RowField field = fields.get(i);
                     ClientTypeSignatureParameter clientTypeSignatureParameter = typeArguments.get(i);
-                    verify(clientTypeSignatureParameter.getKind() == ClientTypeSignatureParameter.ParameterKind.NAMED_TYPE || clientTypeSignatureParameter.getKind() == ClientTypeSignatureParameter.ParameterKind.TYPE, "Not a NAMED_TYPE or TYPE: %s", clientTypeSignatureParameter);
+                    verify(clientTypeSignatureParameter.getKind() == ClientTypeSignatureParameter.ParameterKind.NAMED_TYPE, "Not a NAMED_TYPE or TYPE: %s", clientTypeSignatureParameter);
                     verify(field.getName().equals(clientTypeSignatureParameter.getName()), "Name mismatch: %s, %s", field, clientTypeSignatureParameter);
                     Object converted = convertFromClientRepresentation(clientTypeSignatureParameter.getTypeSignature(), field.getValue());
                     builder.addField(field.getName(), converted);

core/trino-main/src/main/java/io/trino/server/protocol/ProtocolUtil.java

@@ -144,15 +144,15 @@ private static ClientTypeSignature toClientTypeSignature(TypeSignature signature
         }
 
         return new ClientTypeSignature(signature.getBase(), signature.getParameters().stream()
-                .map(parameter -> toClientTypeSignatureParameter(parameter, supportsParametricDateTime))
+                .map(parameter -> toClientTypeSignatureParameter(signature.getBase(), parameter, supportsParametricDateTime))
                 .collect(toImmutableList()));
     }
 
-    private static ClientTypeSignatureParameter toClientTypeSignatureParameter(TypeParameter parameter, boolean supportsParametricDateTime)
+    private static ClientTypeSignatureParameter toClientTypeSignatureParameter(String base, TypeParameter parameter, boolean supportsParametricDateTime)
     {
         return switch (parameter) {
             case TypeParameter.Type(Optional<String> name, TypeSignature type) -> {
-                if (name.isPresent()) {
+                if (base.equalsIgnoreCase(ROW)) { // for backward compatibility with old clients,which expect NAMED_TYPE for row fields
                     yield ClientTypeSignatureParameter.ofNamedType(new NamedClientTypeSignature(
                             name.map(RowFieldName::new),
                             toClientTypeSignature(type, supportsParametricDateTime)));