Merge remote-tracking branch 'origin/master' into jg/newdo

Author: joaquimg

src/MOI_wrapper.jl

@@ -496,6 +496,19 @@ function MOI.supports(
     return MOI.supports(model.optimizer, attr, tp)
 end
 
+function MOI.supports(
+    model::Optimizer,
+    attr::MOI.ConstraintName,
+    ::Type{MOI.ConstraintIndex{F,S}},
+) where {T,F<:MOI.ScalarQuadraticFunction{T},S}
+    G = MOI.ScalarAffineFunction{T}
+    # We can't tell at type-time whether the constraints will be quadratic or
+    # lowered to affine, so we return the conservative choice for supports of
+    # needing to support names for both quadratic and affine constraints.
+    return MOI.supports(model.optimizer, attr, MOI.ConstraintIndex{F,S}) &&
+           MOI.supports(model.optimizer, attr, MOI.ConstraintIndex{G,S})
+end
+
 function MOI.set(
     model::Optimizer,
     attr::MOI.ConstraintName,

test/moi_tests.jl

@@ -1998,6 +1998,29 @@ function test_no_quadratic_terms()
     return
 end
 
+MOI.Utilities.@model(
+    Model185,
+    (),
+    (MOI.EqualTo,),
+    (),
+    (),
+    (),
+    (MOI.ScalarAffineFunction,),
+    (),
+    ()
+);
+
+function test_issue_185()
+    inner = Model185{Float64}()
+    mock = MOI.Utilities.MockOptimizer(inner; supports_names = false)
+    model = POI.Optimizer(MOI.Bridges.full_bridge_optimizer(mock, Float64))
+    for F in (MOI.ScalarAffineFunction, MOI.ScalarQuadraticFunction)
+        C = MOI.ConstraintIndex{F{Float64},MOI.EqualTo{Float64}}
+        @test !MOI.supports(model, MOI.ConstraintName(), C)
+    end
+    return
+end
+
 function test_psd_cone_with_parameter()
     #=
     variables: x